Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DTS-43919: QA_DefectFix_12.2 #1891

Merged
merged 1 commit into from
Feb 7, 2025
Merged

DTS-43919: QA_DefectFix_12.2 #1891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...va/com/publicissapient/kpidashboard/apis/common/service/impl/KpiDataCacheServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@

package com.publicissapient.kpidashboard.apis.common.service.impl;

import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import com.publicissapient.kpidashboard.apis.common.service.KpiDataCacheService;
import com.publicissapient.kpidashboard.apis.enums.KPICode;
import com.publicissapient.kpidashboard.apis.enums.KPISource;
import com.publicissapient.kpidashboard.apis.model.KpiRequest;
import com.publicissapient.kpidashboard.common.model.application.Build;
import org.bson.types.ObjectId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
Expand All @@ -35,7 +34,12 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;

import com.publicissapient.kpidashboard.apis.common.service.KpiDataCacheService;
import com.publicissapient.kpidashboard.apis.constant.Constant;
import com.publicissapient.kpidashboard.apis.enums.KPICode;
import com.publicissapient.kpidashboard.apis.enums.KPISource;
import com.publicissapient.kpidashboard.apis.model.KpiRequest;
import com.publicissapient.kpidashboard.common.model.application.Build;

import lombok.extern.slf4j.Slf4j;

Expand Down
14 changes: 6 additions & 8 deletions ...ssapient/kpidashboard/apis/projectconfig/basic/service/ProjectBasicConfigServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.Set;
import java.util.stream.Collectors;

import com.publicissapient.kpidashboard.apis.common.service.KpiDataCacheService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
Expand All @@ -51,6 +50,7 @@
import com.publicissapient.kpidashboard.apis.cleanup.ToolDataCleanUpService;
import com.publicissapient.kpidashboard.apis.cleanup.ToolDataCleanUpServiceFactory;
import com.publicissapient.kpidashboard.apis.common.service.CacheService;
import com.publicissapient.kpidashboard.apis.common.service.KpiDataCacheService;
import com.publicissapient.kpidashboard.apis.constant.Constant;
import com.publicissapient.kpidashboard.apis.enums.Filters;
import com.publicissapient.kpidashboard.apis.errors.ProjectNotFoundException;
Expand Down Expand Up @@ -356,8 +356,7 @@ public ServiceResponse updateBasicConfig(String basicConfigId, ProjectBasicConfi
basicConfig.setUpdatedBy(authenticationService.getLoggedInUser());
ProjectBasicConfig updatedBasicConfig = basicConfigRepository.save(basicConfig);
performFilterOperation(basicConfigDtoCreation(updatedBasicConfig, mapper), true);
//clear kpi data cache for the project for all KPIs
kpiDataCacheService.clearCacheForProject(basicConfigId);
// clear kpi data cache for the project for all KPIs
response = new ServiceResponse(true, "Updated Successfully.", updatedBasicConfig);
} else {
response = new ServiceResponse(false, "Try with different project name.", null);
Expand Down Expand Up @@ -403,6 +402,7 @@ private void clearCache(final ProjectBasicConfigDTO basicConfig) {
}
cacheService.clearCache(CommonConstant.CACHE_PROJECT_CONFIG_MAP);
cacheService.clearCache(CommonConstant.CACHE_PROJECT_BASIC_TREE);
cacheService.clearCache(Constant.CACHE_PROJECT_KPI_DATA);
if (basicConfig.getClonedFrom() != null) {
cacheService.clearCache(CommonConstant.CACHE_FIELD_MAPPING_MAP);
cacheService.clearCache(CommonConstant.CACHE_PROJECT_TOOL_CONFIG);
Expand Down Expand Up @@ -563,9 +563,8 @@ private void deleteToolsAndCleanData(ProjectBasicConfig projectBasicConfig) {
List<String> scmToolList = Arrays.asList(ProcessorConstants.BITBUCKET, ProcessorConstants.GITLAB,
ProcessorConstants.GITHUB, ProcessorConstants.AZUREREPO);
List<ProjectToolConfig> tools = toolRepository.findByBasicProjectConfigId(projectBasicConfig.getId());
Boolean isRepoTool = tools.stream()
.anyMatch(toolConfig -> scmToolList.contains(toolConfig.getToolName())
&& projectBasicConfig.isDeveloperKpiEnabled());
Boolean isRepoTool = tools.stream().anyMatch(toolConfig -> scmToolList.contains(toolConfig.getToolName())
&& projectBasicConfig.isDeveloperKpiEnabled());
deleteRepoToolProject(projectBasicConfig, isRepoTool);
CollectionUtils.emptyIfNull(tools).forEach(tool -> {

Expand Down Expand Up @@ -827,8 +826,7 @@ public Map<ObjectId, List<SprintDetails>> getTop5SprintDetailsGroupedByProject(
sprintStatusList.add(SprintDetails.SPRINT_STATE_CLOSED);
sprintStatusList.add(SprintDetails.SPRINT_STATE_CLOSED.toLowerCase());
List<SprintDetails> sprintDetailsList = sprintRepository
.findByBasicProjectConfigIdInAndStateInOrderByStartDateASC(basicProjectConfigIds,
sprintStatusList);
.findByBasicProjectConfigIdInAndStateInOrderByStartDateASC(basicProjectConfigIds, sprintStatusList);

// Sort by beginDate in descending order

Expand Down
2 changes: 1 addition & 1 deletion ...sapient/kpidashboard/apis/projectconfig/fieldmapping/service/FieldMappingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ public FieldMapping addFieldMapping(String projectToolConfigId, FieldMapping fie

FieldMapping mapping = fieldMappingRepository.save(fieldMapping);
clearCache();
kpiDataCacheService.clearCacheForProject(basicProjectConfigId.toString());
return mapping;
}

Expand Down Expand Up @@ -381,6 +380,7 @@ private void clearCache() {
cacheService.clearCache(CommonConstant.SONAR_KPI_CACHE);
cacheService.clearCache(CommonConstant.TESTING_KPI_CACHE);
cacheService.clearCache(CommonConstant.JENKINS_KPI_CACHE);
cacheService.clearCache(Constant.CACHE_PROJECT_KPI_DATA);
}

/**
Expand Down
Loading