Skip to content

Commit 3a4e582

Browse files
kaykumarkaykumar
authored
Merge pull request #394 from tmobile/release/2.0
Release/2.0
2 parents 9a9617d + 3b96ad5 commit 3a4e582

File tree

254 files changed

+15808
-2673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+15808
-2673
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![GitHub contributors](https://img.shields.io/github/contributors/tmobile/pacbot.svg)](https://github.com/tmobile/pacbot/graphs/contributors)
55
[![Gitter](https://github.com/tmobile/pacbot/blob/master/wiki/images/chat.svg)](https://gitter.im/TMO-OSS/PacBot)
66

7-
7+
88
<img src="./wiki/images/banner_magenta.png">
99

1010
# Introduction

‎api/pacman-api-admin/src/main/java/com/tmobile/pacman/api/admin/repository/TargetTypesRepository.java

+3
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,8 @@ public interface TargetTypesRepository extends JpaRepository<TargetTypes, String
6464

6565
@Query("SELECT target.targetName AS id, target.targetName AS text FROM TargetTypes target GROUP BY target.targetName")
6666
public List<TargetTypesProjection> getAllTargetTypes();
67+
68+
@Query("SELECT dataSourceName FROM TargetTypes WHERE targetName = (:targetType) ")
69+
public String findDataSourceByTargetType(@Param("targetType") String targetType);
6770

6871
}

‎api/pacman-api-admin/src/main/java/com/tmobile/pacman/api/admin/repository/service/AssetGroupServiceImpl.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private UpdateAssetGroupDetails buildAssetGroupDetails(final AssetGroupDetails e
304304
targetTypesIndex.put(targetTypeDetails.getTargetType(), idx[0]);
305305
targetTypes.setAdded(true);
306306
targetTypes.setTargetName(targetTypeDetails.getTargetType());
307-
targetTypes.setAllAttributesName(commonService.getFieldNames(existingAssetGroupDetails.getDataSource() + "_" + targetTypeDetails.getTargetType(), targetTypeDetails.getTargetType()));
307+
targetTypes.setAllAttributesName(commonService.getFieldNames(targetTypesRepository.findDataSourceByTargetType(targetTypeDetails.getTargetType()) + "_" + targetTypeDetails.getTargetType(), targetTypeDetails.getTargetType()));
308308
if(targetTypeDetails.getAttributeName().equalsIgnoreCase("all") && targetTypeDetails.getAttributeValue().equalsIgnoreCase("all")) {
309309
targetTypes.setIncludeAll(true);
310310
targetTypes.setAttributes(Lists.newArrayList());
@@ -335,7 +335,7 @@ private UpdateAssetGroupDetails buildAssetGroupDetails(final AssetGroupDetails e
335335
TargetTypesDetails targetTypeAttribute = new TargetTypesDetails();
336336
targetTypeAttribute.setAttributes(Lists.newArrayList());
337337
targetTypeAttribute.setTargetName(targetName.trim());
338-
targetTypeAttribute.setAllAttributesName(commonService.getFieldNames(existingAssetGroupDetails.getDataSource() + "_" + targetName, targetName));
338+
targetTypeAttribute.setAllAttributesName(commonService.getFieldNames(targetTypesRepository.findDataSourceByTargetType(targetName) + "_" + targetName, targetName));
339339
targetTypeAttribute.setIncludeAll(false);
340340
attributes.add(targetTypeAttribute);
341341
}
@@ -353,8 +353,9 @@ private boolean deleteAssetGroupAlias(final AssetGroupDetails assetGroupDetails)
353353

354354
if(!targetTypes.isEmpty()) {
355355
targetTypes.forEach(targetType -> {
356+
String targetName = targetType.getTargetType().toLowerCase().trim().replaceAll(" ", "-");
356357
Map<String, Object> addObj = Maps.newHashMap();
357-
addObj.put("index", assetGroupDetails.getDataSource().toLowerCase().trim().replaceAll(" ", "-")+"_"+targetType.getTargetType().toLowerCase().trim().replaceAll(" ", "-"));
358+
addObj.put("index", targetTypesRepository.findDataSourceByTargetType(targetName).toLowerCase().trim().replaceAll(" ", "-")+"_"+targetName);
358359
addObj.put("alias", aliasName);
359360
Map<String, Object> add = Maps.newHashMap();
360361
add.put("remove", addObj);
@@ -384,7 +385,8 @@ private Map<String, Object> createAliasForAssetGroup(final CreateUpdateAssetGrou
384385
final String aliasName = assetGroupDetailsJson.getGroupName().toLowerCase().trim().replaceAll(" ", "-");
385386
for (int targetIndex = 0; targetIndex < targetTypes.size(); targetIndex++) {
386387
Map<String, Object> addObj = Maps.newHashMap();
387-
addObj.put("index", assetGroupDetailsJson.getDataSourceName().toLowerCase().trim().replaceAll(" ", "-") + "_" + targetTypes.get(targetIndex).getTargetName().toLowerCase().trim().replaceAll(" ", "-"));
388+
String targetType = targetTypes.get(targetIndex).getTargetName().toLowerCase().trim().replaceAll(" ", "-");
389+
addObj.put("index", targetTypesRepository.findDataSourceByTargetType(targetType).toLowerCase().trim().replaceAll(" ", "-") + "_" + targetType);
388390
addObj.put("alias", aliasName);
389391
List<AttributeDetails> attributes = Lists.newArrayList();
390392
if (!targetTypes.get(targetIndex).isIncludeAll()) {

‎api/pacman-api-admin/src/main/java/com/tmobile/pacman/api/admin/repository/service/DatasourceService.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
******************************************************************************/
1616
package com.tmobile.pacman.api.admin.repository.service;
1717

18-
import java.util.Collection;
18+
import java.util.List;
19+
20+
import com.tmobile.pacman.api.admin.repository.model.Datasource;
1921

2022
/**
2123
* DataSource Service Functionalities
@@ -28,5 +30,5 @@ public interface DatasourceService {
2830
* @author Nidhish
2931
* @return All dataSource details list
3032
*/
31-
public Collection<Object[]> getAllDatasourceDetails();
33+
public List<Datasource> getAllDatasourceDetails();
3234
}

‎api/pacman-api-admin/src/main/java/com/tmobile/pacman/api/admin/repository/service/DatasourceServiceImpl.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
******************************************************************************/
1616
package com.tmobile.pacman.api.admin.repository.service;
1717

18-
import java.util.Collection;
18+
import java.util.List;
1919

2020
import org.springframework.beans.factory.annotation.Autowired;
2121
import org.springframework.stereotype.Service;
2222

2323
import com.tmobile.pacman.api.admin.repository.DatasourceRepository;
24+
import com.tmobile.pacman.api.admin.repository.model.Datasource;
2425
import com.tmobile.pacman.api.commons.Constants;
2526

2627
/**
@@ -33,7 +34,7 @@ public class DatasourceServiceImpl implements DatasourceService, Constants {
3334
private DatasourceRepository datasourceRepository;
3435

3536
@Override
36-
public Collection<Object[]> getAllDatasourceDetails() {
37-
return datasourceRepository.getAllDatasourceDetails();
37+
public List<Datasource> getAllDatasourceDetails() {
38+
return datasourceRepository.findAll();
3839
}
3940
}

‎api/pacman-api-admin/src/test/java/com/tmobile/pacman/api/admin/controller/DatasourceControllerTest.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
2626

2727
import java.util.ArrayList;
28-
import java.util.Collection;
2928

3029
import org.junit.Before;
3130
import org.junit.Test;
@@ -60,13 +59,10 @@ public void init() {
6059

6160
@Test
6261
public void getAllDatasourceDetailsTest() throws Exception {
63-
Collection<Object[]> allDatasources = new ArrayList<Object[]>();
64-
Object[] datasources = { "aws", "azure" };
65-
allDatasources.add(datasources);
66-
when(datasourceService.getAllDatasourceDetails()).thenReturn(allDatasources);
62+
when(datasourceService.getAllDatasourceDetails()).thenReturn(new ArrayList<>());
6763
mockMvc.perform(get("/datasource/list")).andExpect(status().isOk())
6864
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
69-
.andExpect(jsonPath("$.data", hasSize(1)));
65+
.andExpect(jsonPath("$.data", hasSize(0)));
7066
}
7167

7268
@Test

‎api/pacman-api-admin/src/test/java/com/tmobile/pacman/api/admin/repository/service/DatasourceServiceImplTest.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.mockito.Mockito.when;
2121

2222
import java.util.ArrayList;
23-
import java.util.Collection;
2423

2524
import org.junit.Test;
2625
import org.junit.runner.RunWith;
@@ -41,10 +40,7 @@ public class DatasourceServiceImplTest {
4140

4241
@Test
4342
public void getAllDatasourceDetailsTest() throws Exception {
44-
Collection<Object[]> allDatasources = new ArrayList<Object[]>();
45-
Object[] datasources = { "aws", "azure" };
46-
allDatasources.add(datasources);
47-
when(datasourceService.getAllDatasourceDetails()).thenReturn(allDatasources);
48-
assertThat(datasourceRepository.getAllDatasourceDetails().size(), is(1));
43+
when(datasourceRepository.findAll()).thenReturn(new ArrayList<>());
44+
assertThat(datasourceService.getAllDatasourceDetails().size(), is(0));
4945
}
5046
}

‎api/pacman-api-asset/src/main/java/com/tmobile/pacman/api/asset/AssetConstants.java

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ private AssetConstants() {
100100
public static final String FILTER_CATEGORY = "category";
101101
public static final String FILTER_GENERAL = "general";
102102
public static final String FILTER_RECOMMENDATION_ID = "recommendationId";
103+
public static final String ASSET_TYPE = "assettype";
104+
public static final String TOTAL_ASSETS = "totalassets";
103105

104106
}
105107

‎api/pacman-api-asset/src/main/java/com/tmobile/pacman/api/asset/controller/AssetController.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ public class AssetController {
6969
*/
7070
@GetMapping(value = "/v1/list/targettype")
7171
public ResponseEntity<Object> getListOfTargetTypes(@RequestParam(name = "ag", required = true) String assetGroup,
72-
@RequestParam(name = "domain", required = false) String domain) {
72+
@RequestParam(name = "domain", required = false) String domain,
73+
@RequestParam(name = "provider", required = false) String provider) {
7374
Map<String, Object> targetTypesResponse = new HashMap<>();
74-
List<Map<String, Object>> targetTypes = assetService.getTargetTypesForAssetGroup(assetGroup, domain);
75+
List<Map<String, Object>> targetTypes = assetService.getTargetTypesForAssetGroup(assetGroup, domain, provider);
7576
if (targetTypes.isEmpty()) {
7677
return ResponseUtils.buildFailureResponse(new Exception(
7778
"No target types found for the asset group . Please check the asset group configuration"));

‎api/pacman-api-asset/src/main/java/com/tmobile/pacman/api/asset/controller/AssetCountController.java

+11-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
import java.util.HashMap;
1919
import java.util.LinkedHashMap;
2020
import java.util.List;
21+
import java.util.LongSummaryStatistics;
2122
import java.util.Map;
23+
import java.util.stream.Collectors;
2224

2325
import org.springframework.beans.factory.annotation.Autowired;
2426
import org.springframework.http.ResponseEntity;
@@ -30,6 +32,7 @@
3032

3133
import com.tmobile.pacman.api.asset.AssetConstants;
3234
import com.tmobile.pacman.api.asset.service.AssetService;
35+
import com.tmobile.pacman.api.commons.Constants;
3336
import com.tmobile.pacman.api.commons.utils.ResponseUtils;
3437

3538
/**
@@ -58,20 +61,20 @@ public class AssetCountController {
5861
@GetMapping(value = "/v1/count")
5962
public ResponseEntity<Object> geAssetCount(@RequestParam(name = "ag", required = true) String assetGroup,
6063
@RequestParam(name = "type", required = false) String type,
61-
@RequestParam(name = "domain", required = false) String domain) {
64+
@RequestParam(name = "domain", required = false) String domain,
65+
@RequestParam(name = "application", required = false) String application,
66+
@RequestParam(name = "provider", required = false) String provider) {
6267
if (type == null) {
6368
type = "all";
6469
}
65-
List<Map<String, Object>> countMap = assetService.getAssetCountByAssetGroup(assetGroup, type, domain);
66-
70+
List<Map<String, Object>> countMap = assetService.getAssetCountAndEnvDistributionByAssetGroup(assetGroup, type, domain, application, provider);
71+
LongSummaryStatistics totalCount = countMap.stream().collect(Collectors.summarizingLong(map -> (Long) map.get(Constants.COUNT)));
6772
Map<String, Object> response = new HashMap<>();
6873
response.put("ag", assetGroup);
6974
response.put(AssetConstants.ASSET_COUNT, countMap);
70-
if (!countMap.isEmpty()) {
71-
return ResponseUtils.buildSucessResponse(response);
72-
} else {
73-
return ResponseUtils.buildFailureResponse(new Exception("No data found"));
74-
}
75+
response.put(AssetConstants.ASSET_TYPE, totalCount.getCount());
76+
response.put(AssetConstants.TOTAL_ASSETS, totalCount.getSum());
77+
return ResponseUtils.buildSucessResponse(response);
7578
}
7679

7780
/**

‎api/pacman-api-asset/src/main/java/com/tmobile/pacman/api/asset/controller/AssetListController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ public ResponseEntity<Object> getEditableFieldsByTargetType(
446446
return ResponseUtils.buildFailureResponse(new Exception("Asset group/TargetType is Mandatory"));
447447
}
448448
boolean isTargetTypePresent = false;
449-
for (Map<String, Object> targetType : assetService.getTargetTypesForAssetGroup(assetGroup, null)) {
449+
for (Map<String, Object> targetType : assetService.getTargetTypesForAssetGroup(assetGroup, null, null)) {
450450
if (targetType.get("type").toString().equals(resourceType)) {
451451
isTargetTypePresent = true;
452452
break;

‎api/pacman-api-asset/src/main/java/com/tmobile/pacman/api/asset/controller/Util.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void setassetService(AssetService assetService) {
5959
*/
6060
public static boolean isValidTargetType(String ag, String type) {
6161
try {
62-
List<Map<String, Object>> targetTypes = assetService.getTargetTypesForAssetGroup(ag, null);
62+
List<Map<String, Object>> targetTypes = assetService.getTargetTypesForAssetGroup(ag, null, null);
6363
return targetTypes.stream().filter(obj -> type.equals(obj.get("type"))).count() > 0 ? true : false;
6464
} catch (Exception e) {
6565
LOGGER.error("Error in isValidTargetType ",e);

‎api/pacman-api-asset/src/main/java/com/tmobile/pacman/api/asset/repository/AssetRepository.java

+39-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public interface AssetRepository {
3838
*
3939
* @param aseetGroupName name of the asset group
4040
* @param type target type
41-
* @param domain the domain of asset group
41+
* @param application the application of asset group
4242
*
4343
* @return list of type and its asset count.
4444
*/
45-
public Map<String, Long> getAssetCountByAssetGroup(String aseetGroupName, String type);
45+
public Map<String, Long> getAssetCountByAssetGroup(String aseetGroupName, String type, String application);
4646

4747
/**
4848
* Fetches all the target types for the particular asset group. If asset
@@ -53,7 +53,7 @@ public interface AssetRepository {
5353
*
5454
* @return list of target types.
5555
*/
56-
public List<Map<String, Object>> getTargetTypesByAssetGroup(String aseetGroupName, String domain);
56+
public List<Map<String, Object>> getTargetTypesByAssetGroup(String aseetGroupName, String domain, String provider);
5757

5858
/**
5959
* Fetches all the applications for the particular asset group.
@@ -93,7 +93,7 @@ public interface AssetRepository {
9393
*
9494
* @return list of target type details.
9595
*/
96-
public List<Map<String, Object>> getAllTargetTypes();
96+
public List<Map<String, Object>> getAllTargetTypes(String datasource);
9797

9898
/**
9999
* Fetches all the asset groups and its name, display name, description,
@@ -515,6 +515,40 @@ public List<Map<String, Object>> getAssetLists(String assetGroup, Map<String, St
515515
* @return list of applications.
516516
* @throws DataException when there is an error while fetching data from ES
517517
*/
518-
public Map<String, Long> getApplicationAssetCountByAssetGroup(String assetGroupName, String domain) throws DataException;
518+
public Map<String, Long> getApplicationAssetCountByAssetGroup(String assetGroupName, String domain, String provider) throws DataException;
519+
520+
/**
521+
* Fetches all the datasource and its targetName for the list of targetNames
522+
*
523+
* @return list of target type details.s
524+
*/
525+
public List<Map<String, Object>> getDataSourceForTargetTypes(List<String> targetTypes);
526+
527+
public Map<String, Object> getApplicationAssetCountByAssetGroupWithProvider(String assetGroupName, String domain,
528+
String provider) throws DataException;
529+
530+
/**
531+
* Fetches the total count of assets and distribution based on environment for the particular asset group. If no
532+
* type is passed, all the assets of valid target type for the asset group
533+
* is considered.
534+
*
535+
* @param aseetGroupName name of the asset group
536+
* @param type target type
537+
* @param domain the domain of asset group
538+
* @param application the application of asset group
539+
*
540+
* @return list of type and its asset count.
541+
*/
542+
public Map<String, Object> getAssetCountAndEnvDistributionByAssetGroup(String aseetGroupName, String type,
543+
String application);
544+
545+
/**
546+
* Fetches provider list for an asset group
547+
*
548+
* @param Asset Group
549+
* @return list of providers.
550+
* @throws DataException
551+
*/
552+
public List<String> getProvidersForAssetGroup(String assetGroup) throws DataException;
519553

520554
}

0 commit comments

Comments
 (0)