diff --git a/common/src/main/java/com/publicissapient/kpidashboard/common/service/HierarchyLevelServiceImpl.java b/common/src/main/java/com/publicissapient/kpidashboard/common/service/HierarchyLevelServiceImpl.java index dc4488ba57..0eeaf967cd 100644 --- a/common/src/main/java/com/publicissapient/kpidashboard/common/service/HierarchyLevelServiceImpl.java +++ b/common/src/main/java/com/publicissapient/kpidashboard/common/service/HierarchyLevelServiceImpl.java @@ -33,9 +33,13 @@ public List getTopHierarchyLevels() { public List getFullHierarchyLevels(boolean isKanban) { List hierarchyLevels = new ArrayList<>(); List topHierarchyLevels = getTopHierarchyLevels(); + log.info("GS List of hierarchy {}", topHierarchyLevels); HierarchyLevel projectHierarchyLevel = getProjectHierarchyLevel(); + log.info("GS List of projectHierarchyLevel {}", projectHierarchyLevel); HierarchyLevel sprintHierarchyLevel = getSprintHierarchyLevel(); + log.info("GS List of sprintHierarchyLevel {}", sprintHierarchyLevel); HierarchyLevel releaseHierarchyLevel = getReleaseHierarchyLevel(); + log.info("GS List of releaseHierarchyLevel {}", releaseHierarchyLevel); hierarchyLevels.addAll(topHierarchyLevels); hierarchyLevels.add(projectHierarchyLevel); if (!isKanban) { @@ -44,6 +48,7 @@ public List getFullHierarchyLevels(boolean isKanban) { hierarchyLevels.add(releaseHierarchyLevel); List additionalFilterCategories = filterCategoryLevelService .getAdditionalFilterCategories(); + log.info("GS additionalFilterCategories {}", additionalFilterCategories); if (CollectionUtils.isNotEmpty(additionalFilterCategories)) { for (AdditionalFilterCategory additionalFilterCategory : additionalFilterCategories) { @@ -58,7 +63,7 @@ public List getFullHierarchyLevels(boolean isKanban) { hierarchyLevels.add(bottomHierarchyLevel); } } - + log.info("GS additionalFilterCategories {}", hierarchyLevels); return hierarchyLevels; } @@ -83,11 +88,14 @@ private HierarchyLevel createProjectHierarchyLevel(List topHiera hierarchyLevel.setHierarchyLevelId(CommonConstant.HIERARCHY_LEVEL_ID_PROJECT); hierarchyLevel.setHierarchyLevelName(CommonConstant.HIERARCHY_LEVEL_NAME_PROJECT); if (CollectionUtils.isNotEmpty(topHierarchies)) { + log.info("GS topHierarchies", topHierarchies); HierarchyLevel parent = topHierarchies.get(topHierarchies.size() - 1); hierarchyLevel.setLevel(parent.getLevel() + 1); } else { + log.info("GS topHierarchies", topHierarchies); hierarchyLevel.setLevel(1); } + log.info("GS hierarchyLevel", hierarchyLevel); return hierarchyLevel; } @@ -98,11 +106,14 @@ private HierarchyLevel createSprintHierarchyLevel(List topHierar hierarchyLevel.setHierarchyLevelId(CommonConstant.HIERARCHY_LEVEL_ID_SPRINT); hierarchyLevel.setHierarchyLevelName(CommonConstant.HIERARCHY_LEVEL_NAME_SPRINT); if (CollectionUtils.isNotEmpty(topHierarchies)) { + log.info("GS topHierarchies {}", topHierarchies); HierarchyLevel parent = getProjectHierarchyLevel(); hierarchyLevel.setLevel(parent.getLevel() + 1); } else { + log.info("GS topHierarchies {}", topHierarchies); hierarchyLevel.setLevel(2); } + log.info("GS hierarchyLevel", hierarchyLevel); return hierarchyLevel; } diff --git a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/abac/UserAuthorizedProjectsService.java b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/abac/UserAuthorizedProjectsService.java index 4c22763576..b86e994734 100644 --- a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/abac/UserAuthorizedProjectsService.java +++ b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/abac/UserAuthorizedProjectsService.java @@ -168,6 +168,7 @@ public List filterProjects(List filt public String[] getProjectKey(List filteredAccountDataList, KpiRequest kpiRequest) { Set projects = getProjectNodesForRequest(filteredAccountDataList); + log.info("GS getProjectKey {}", projects); List ids = Arrays.asList(kpiRequest.getIds()); List keys = Stream.concat(projects.stream(), ids.stream()).collect(Collectors.toList()); if(kpiRequest.getSelectedMap().get(Constant.DATE) != null) diff --git a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/common/service/impl/CacheServiceImpl.java b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/common/service/impl/CacheServiceImpl.java index 1bc17e7951..66b5fb0c5f 100644 --- a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/common/service/impl/CacheServiceImpl.java +++ b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/common/service/impl/CacheServiceImpl.java @@ -138,6 +138,7 @@ public Object cacheProjectToolConfigMapData() { @Override public void setIntoApplicationCache(String key, String value) { Cache cache = cacheManager.getCache(CommonUtils.getCacheName(Constant.KPI_REQUEST_TRACKER_ID_KEY)); + log.info("GS1 cache {}", cache); if (null != cache) { cache.put(key, value); } diff --git a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/AccountHierarchyServiceImpl.java b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/AccountHierarchyServiceImpl.java index 5a717a3d67..a1353761e0 100644 --- a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/AccountHierarchyServiceImpl.java +++ b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/AccountHierarchyServiceImpl.java @@ -29,6 +29,7 @@ import java.util.function.Function; import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.SerializationUtils; import org.apache.commons.lang3.StringUtils; @@ -57,6 +58,7 @@ * @author pkum34 */ @Service +@Slf4j public class AccountHierarchyServiceImpl implements AccountHierarchyService, Set> { @@ -93,6 +95,7 @@ public Set getFilteredList(AccountFilterRequest request) { hierarchyDataAll = filterHelperService .getAccountHierarchyDataForRequest(new HashSet<>(request.getSprintIncluded()), hierarchyDataAll); Set basicProjectConfigIds = tokenAuthenticationService.getUserProjects(); + log.info("GS List of sprintHierarchyLevel {}", basicProjectConfigIds); if (!authorizedProjectsService.ifSuperAdminUser() && CollectionUtils.isNotEmpty(hierarchyDataAll)) { hierarchyDataAll = hierarchyDataAll.stream() .filter(data -> basicProjectConfigIds.contains(data.getBasicProjectConfigId().toHexString())) @@ -139,11 +142,13 @@ private AccountFilteredData getAccountFilteredResponse(AccountHierarchy acc, int public List createHierarchyData() { List filterDataList = accountHierarchyRepository.findAll(); + log.info("GS filterDataList {}", filterDataList); Map> parentWiseMap = filterDataList.stream() .filter(fd -> fd.getParentId() != null).collect(Collectors.groupingBy(AccountHierarchy::getParentId)); List listHierarchyData = new ArrayList<>(); String firstLevel = filterHelperService.getFirstHierarachyLevel(); + log.info("GS firstLevel {}", firstLevel); Map hierarchyLevelIdMap = filterHelperService.getHierarchyIdLevelMap(false); @@ -153,6 +158,7 @@ public List createHierarchyData() { List sprintIds = filterDataList.stream() .filter(x -> CommonConstant.HIERARCHY_LEVEL_ID_SPRINT.equalsIgnoreCase(x.getLabelName())) .map(AccountHierarchy::getNodeId).collect(Collectors.toList()); + log.info("GS sprintIds {}", sprintIds); Map sprintDetailsMap = fetchSprintDetailsOf(sprintIds); parentWiseSprintMap = filterDataList.stream() @@ -188,7 +194,7 @@ public List createHierarchyData() { hierarchyLevelIdMap, limitedDisplayMap, sprintDetailsMap); }); } - + log.info("GS List of listHierarchyData {}", listHierarchyData); return listHierarchyData; } @@ -360,6 +366,7 @@ private void setValuesInAccountHierarchyData(AccountHierarchy hierarchy, Account if (sprintDetails != null) { hierarchy.setSprintState(sprintDetails.getState()); } + log.info("GS setValuesInAccountHierarchyData "); Node node = new Node(0, hierarchy.getNodeId(), hierarchy.getNodeName(), hierarchy.getParentId(), hierarchy.getLabelName(), hierarchy); node.setLevel(hierarchyLevelIdMap.getOrDefault(hierarchy.getLabelName(), 0)); diff --git a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/FilterHelperService.java b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/FilterHelperService.java index 6813b9baab..52bcfd0d00 100644 --- a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/FilterHelperService.java +++ b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/filter/service/FilterHelperService.java @@ -118,9 +118,7 @@ private List filter(List dataList, S /** * filter data based on sprint state - * - * @param sprintStateRequestList - * sprintStateList + * * @param hierarchyDataAll * hierarchyDataAll * @return List @@ -292,11 +290,6 @@ private Map, AccountHierarchy> getExistingAccountHierarchy( /** * clean filter data - * - * @param basicProjectConfigId - * id - * @param isKanban - * kanban or scrum */ public void cleanFilterData(ProjectBasicConfigDTO basicConfig) { ObjectId basicProjectConfigId = basicConfig.getId(); @@ -581,8 +574,10 @@ private List findAccountHierarchiesAboveProvidedForDelet public Map getHierarchyLevelMap(boolean isKanban) { if (isKanban) { + log.info("GS For Kanban"); return cacheService.getFullKanbanHierarchyLevelMap(); } else { + log.info("GS For Scrum"); return cacheService.getFullHierarchyLevelMap(); } } @@ -590,18 +585,23 @@ public Map getHierarchyLevelMap(boolean isKanban) { public String getHierarachyLevelId(int level, String label, boolean isKanban) { String hierarchyId = CommonConstant.HIERARCHY_LEVEL_ID_PROJECT; Map map = getHierarchyLevelMap(isKanban); + log.info("GS Hierarachy LevelId method"); if (MapUtils.isNotEmpty(map)) { if (StringUtils.isNotEmpty(label)) { + log.info("GS label"); hierarchyId = map.values().stream().filter(hlevel -> (hlevel.getLevel() == level) && (StringUtils.isNotEmpty(label) && hlevel.getHierarchyLevelId().equalsIgnoreCase(label))) .map(HierarchyLevel::getHierarchyLevelId).findFirst() .orElse(CommonConstant.HIERARCHY_LEVEL_ID_PROJECT); + log.info("hierarchyId {}", hierarchyId); } else { hierarchyId = map.values().stream().filter(hlevel -> (hlevel.getLevel() == level)) .map(HierarchyLevel::getHierarchyLevelId).findFirst() .orElse(CommonConstant.HIERARCHY_LEVEL_ID_PROJECT); + log.info("hierarchyId {}", hierarchyId); } } + log.info("hierarchyId {}", hierarchyId); return hierarchyId; } diff --git a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/rest/JiraController.java b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/rest/JiraController.java index 36ef7062f9..5a47bec269 100644 --- a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/rest/JiraController.java +++ b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/rest/JiraController.java @@ -103,7 +103,7 @@ public ResponseEntity> getJiraAggregatedMetrics(@NotNull @Reque List responseList = jiraService.process(kpiRequest); MDC.put("TotalJiraRequestTime", String.valueOf(System.currentTimeMillis() - jiraRequestStartTime)); - + log.info("GS1 Response List {}", responseList); log.info(""); MDC.clear(); if (responseList.isEmpty()) { diff --git a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/service/JiraServiceR.java b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/service/JiraServiceR.java index b69e7413ce..83a45898cc 100644 --- a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/service/JiraServiceR.java +++ b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/service/JiraServiceR.java @@ -141,12 +141,15 @@ public List process(KpiRequest kpiRequest) throws EntityNotFoundExce log.info("Processing KPI calculation for data {}", kpiRequest.getKpiList()); List origRequestedKpis = kpiRequest.getKpiList().stream().map(KpiElement::new) .collect(Collectors.toList()); + log.info("GS List of OrigRequestedKPIs"); List responseList = new ArrayList<>(); String[] projectKeyCache = null; try { Integer groupId = kpiRequest.getKpiList().get(0).getGroupId(); + log.info("GS groupId {}", groupId); String groupName = filterHelperService.getHierarachyLevelId(kpiRequest.getLevel(), kpiRequest.getLabel(), false); + log.info("GS groupName {}", groupName); if (null != groupName) { kpiRequest.setLabel(groupName.toUpperCase()); } else { @@ -222,10 +225,12 @@ private void updateJiraIssueList(KpiRequest kpiRequest, List origReq fetchSprintDetails(kpiRequest.getSelectedMap().get(CommonConstant.SPRINT)); String basicConfigId = filteredAccountDataList.get(0).getBasicProjectConfigId().toString(); List sprintIssuesList = createIssuesList(basicConfigId); + log.info("GS sprintIssuesList {}", sprintIssuesList); fetchJiraIssues(kpiRequest, basicConfigId, sprintIssuesList); fetchJiraIssuesCustomHistory(basicConfigId); } else if (origRequestedKpis.get(0).getKpiCategory().equalsIgnoreCase(CommonConstant.RELEASE)) { releaseList = getReleaseList(treeAggregatorDetail); + log.info("GS sprintIssuesList {}", releaseList); fetchJiraIssues(filteredAccountDataList.get(0).getBasicProjectConfigId().toString(), releaseList, CommonConstant.RELEASE); fetchJiraIssuesCustomHistory(filteredAccountDataList.get(0).getBasicProjectConfigId().toString(), @@ -309,6 +314,7 @@ private void setIntoApplicationCache(KpiRequest kpiRequest, List res String[] projects) { Integer sprintLevel = filterHelperService.getHierarchyIdLevelMap(false) .get(CommonConstant.HIERARCHY_LEVEL_ID_SPRINT); + log.info("GS getProjectKey {}", sprintLevel); if (!kpiRequest.getRequestTrackerId().toLowerCase().contains(KPISource.EXCEL.name().toLowerCase()) && sprintLevel >= kpiRequest.getLevel() && isLeadTimeDuration(kpiRequest.getKpiList())) { @@ -347,6 +353,7 @@ public void fetchJiraIssues(KpiRequest kpiRequest, String basicConfigId, List(sprintIssuesList), uniqueProjectMap); + log.info("GS jiraIssueList {}", jiraIssueList); } public void fetchJiraIssues(String basicProjectConfigId, List sprintIssuesList, String board) { @@ -403,6 +410,7 @@ public Set getSubTaskDefects() { public void fetchJiraIssuesCustomHistory(String basicProjectConfigId) { List issueList = jiraIssueList.stream().map(JiraIssue::getNumber).collect(Collectors.toList()); + log.info("GS sprintIssuesList {}", issueList); jiraIssueCustomHistoryList = jiraIssueCustomHistoryRepository .findByStoryIDInAndBasicProjectConfigIdIn(issueList, Collections.singletonList(basicProjectConfigId));