From 8e194f0708e920959899c717910ae50a6c865bbf Mon Sep 17 00:00:00 2001 From: Priyanka Jain Date: Mon, 10 Feb 2025 13:55:48 +0530 Subject: [PATCH] caching issue fix --- .../kpidashboard/common/constant/CommonConstant.java | 1 + .../kpidashboard/apis/config/WebSecurityConfig.java | 4 ++-- .../argocd/processor/ArgoCDProcessorJobExecutor.java | 4 ++-- .../azure/processor/AzureProcessorJobExecutor.java | 3 +-- .../processor/AzurePipelineProcessorJobExecutor.java | 8 ++++---- .../bamboo/processor/BambooProcessorJobExecuter.java | 4 ++-- .../processor/GitHubActionProcessorJobExecutor.java | 4 ++-- .../jenkins/processor/JenkinsProcessorJobExecutor.java | 4 ++-- .../kpidashboard/jira/cache/CacheClearingMechanism.java | 2 +- .../jira/listener/JiraIssueSprintJobListener.java | 2 +- .../kpidashboard/jira/listener/JobListenerScrum.java | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/common/src/main/java/com/publicissapient/kpidashboard/common/constant/CommonConstant.java b/common/src/main/java/com/publicissapient/kpidashboard/common/constant/CommonConstant.java index 97aeefbf2e..7577418b8b 100644 --- a/common/src/main/java/com/publicissapient/kpidashboard/common/constant/CommonConstant.java +++ b/common/src/main/java/com/publicissapient/kpidashboard/common/constant/CommonConstant.java @@ -40,6 +40,7 @@ public final class CommonConstant { public static final String CACHE_BOARD_META_DATA_MAP = "boardMetaDataMap"; public static final String CACHE_PROJECT_CONFIG_MAP = "projectConfigMap"; public static final String CACHE_PROJECT_TOOL_CONFIG_MAP = "projectToolConfigMap"; + public static final String CACHE_PROJECT_KPI_DATA = "project_kpi_data_cache"; public static final String PARAM1 = "param1"; public static final String PARAM2 = "param2"; diff --git a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/config/WebSecurityConfig.java b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/config/WebSecurityConfig.java index f9a5c8e14d..5aec01d200 100644 --- a/customapi/src/main/java/com/publicissapient/kpidashboard/apis/config/WebSecurityConfig.java +++ b/customapi/src/main/java/com/publicissapient/kpidashboard/apis/config/WebSecurityConfig.java @@ -132,8 +132,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers("/forgotPassword").permitAll() .requestMatchers("/validateEmailToken**").permitAll() .requestMatchers("/resetPassword").permitAll() - .requestMatchers("/cache/clearAllCache").permitAll().requestMatchers(HttpMethod.GET, "/cache/clearCache/**") - .permitAll().requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() + .requestMatchers("/cache/**").permitAll() + .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() .requestMatchers(HttpMethod.GET, "/analytics/switch").permitAll().anyRequest().authenticated()) .addFilterBefore(standardLoginRequestFilter(authenticationManager), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) diff --git a/processors/argocd/src/main/java/com/publicissapient/kpidashboard/argocd/processor/ArgoCDProcessorJobExecutor.java b/processors/argocd/src/main/java/com/publicissapient/kpidashboard/argocd/processor/ArgoCDProcessorJobExecutor.java index ca1c508182..dfb654d946 100644 --- a/processors/argocd/src/main/java/com/publicissapient/kpidashboard/argocd/processor/ArgoCDProcessorJobExecutor.java +++ b/processors/argocd/src/main/java/com/publicissapient/kpidashboard/argocd/processor/ArgoCDProcessorJobExecutor.java @@ -219,8 +219,8 @@ public boolean execute(ArgoCDProcessor processor) { } } if (count1.get() > 0) { - cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, CommonConstant.JENKINS, - proBasicConfig.getId().toString()); + cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, proBasicConfig.getId().toString(), + CommonConstant.JENKINS); } } MDC.put(TOTAL_UPDATED_COUNT, String.valueOf(count.get())); diff --git a/processors/azure-boards/src/main/java/com/publicissapient/kpidashboard/azure/processor/AzureProcessorJobExecutor.java b/processors/azure-boards/src/main/java/com/publicissapient/kpidashboard/azure/processor/AzureProcessorJobExecutor.java index e57ac3ffb7..4cef060113 100644 --- a/processors/azure-boards/src/main/java/com/publicissapient/kpidashboard/azure/processor/AzureProcessorJobExecutor.java +++ b/processors/azure-boards/src/main/java/com/publicissapient/kpidashboard/azure/processor/AzureProcessorJobExecutor.java @@ -151,8 +151,7 @@ private boolean fetchIssueDetail(boolean executionStatus, List 0) { azureRestClientFactory.cacheRestClient(CommonConstant.CACHE_CLEAR_ENDPOINT, diff --git a/processors/azure-pipeline/src/main/java/com/publicissapient/kpidashboard/azurepipeline/processor/AzurePipelineProcessorJobExecutor.java b/processors/azure-pipeline/src/main/java/com/publicissapient/kpidashboard/azurepipeline/processor/AzurePipelineProcessorJobExecutor.java index 70cfa1811f..3fc7212e7a 100644 --- a/processors/azure-pipeline/src/main/java/com/publicissapient/kpidashboard/azurepipeline/processor/AzurePipelineProcessorJobExecutor.java +++ b/processors/azure-pipeline/src/main/java/com/publicissapient/kpidashboard/azurepipeline/processor/AzurePipelineProcessorJobExecutor.java @@ -200,8 +200,8 @@ public boolean execute(AzurePipelineProcessor processor) { count1 = buildJobs(processor, startTime, count1, azurePipelineServer, lastStartTimeOfJobs, proBasicConfig); } else { - count1 += deployJobs(processor, startTime, deploymentJobs, activeDeployJobs, azurePipelineServer, - lastStartTimeOfJobs, proBasicConfig); + count1 += deployJobs(processor, startTime, deploymentJobs, activeDeployJobs, + azurePipelineServer, lastStartTimeOfJobs, proBasicConfig); } count += count1; log.info("Finished : {}", startTime); @@ -220,8 +220,8 @@ public boolean execute(AzurePipelineProcessor processor) { } } if (count1 > 0) { - cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, CommonConstant.JENKINS, - proBasicConfig.getId().toString()); + cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, proBasicConfig.getId().toString(), + CommonConstant.JENKINS); } } MDC.put(TOTAL_UPDATED_COUNT, String.valueOf(count)); diff --git a/processors/bamboo/src/main/java/com/publicissapient/kpidashboard/bamboo/processor/BambooProcessorJobExecuter.java b/processors/bamboo/src/main/java/com/publicissapient/kpidashboard/bamboo/processor/BambooProcessorJobExecuter.java index a0a8d65ea1..cd2d35d992 100644 --- a/processors/bamboo/src/main/java/com/publicissapient/kpidashboard/bamboo/processor/BambooProcessorJobExecuter.java +++ b/processors/bamboo/src/main/java/com/publicissapient/kpidashboard/bamboo/processor/BambooProcessorJobExecuter.java @@ -311,8 +311,8 @@ private void processEachBambooJobOnJobType(List bambooJ } } if (count > 0 || !activeDeployJobs.isEmpty()) { - cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, CommonConstant.JENKINS, - proBasicConfig.getId().toString()); + cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, proBasicConfig.getId().toString(), + CommonConstant.JENKINS); } } diff --git a/processors/github-action/src/main/java/com/publicissapient/kpidashboard/githubaction/processor/GitHubActionProcessorJobExecutor.java b/processors/github-action/src/main/java/com/publicissapient/kpidashboard/githubaction/processor/GitHubActionProcessorJobExecutor.java index a8e25a8a2c..b8c4bfa2d1 100644 --- a/processors/github-action/src/main/java/com/publicissapient/kpidashboard/githubaction/processor/GitHubActionProcessorJobExecutor.java +++ b/processors/github-action/src/main/java/com/publicissapient/kpidashboard/githubaction/processor/GitHubActionProcessorJobExecutor.java @@ -180,8 +180,8 @@ public boolean execute(GitHubActionProcessor processor) { } } if (count1 > 0) { - cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, CommonConstant.JENKINS, - proBasicConfig.getId().toString()); + cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, proBasicConfig.getId().toString(), + CommonConstant.JENKINS); } } diff --git a/processors/jenkins/src/main/java/com/publicissapient/kpidashboard/jenkins/processor/JenkinsProcessorJobExecutor.java b/processors/jenkins/src/main/java/com/publicissapient/kpidashboard/jenkins/processor/JenkinsProcessorJobExecutor.java index 88e43884f2..8e161b7a9f 100644 --- a/processors/jenkins/src/main/java/com/publicissapient/kpidashboard/jenkins/processor/JenkinsProcessorJobExecutor.java +++ b/processors/jenkins/src/main/java/com/publicissapient/kpidashboard/jenkins/processor/JenkinsProcessorJobExecutor.java @@ -201,8 +201,8 @@ public boolean execute(JenkinsProcessor processor) { } } if (count1 > 0) { - cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, CommonConstant.JENKINS, - proBasicConfig.getId().toString()); + cacheRestClient(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, proBasicConfig.getId().toString(), + CommonConstant.JENKINS); } } diff --git a/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/cache/CacheClearingMechanism.java b/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/cache/CacheClearingMechanism.java index f93874b185..2b52d05357 100644 --- a/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/cache/CacheClearingMechanism.java +++ b/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/cache/CacheClearingMechanism.java @@ -51,6 +51,6 @@ private void clearCache() { jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.CACHE_ACCOUNT_HIERARCHY); jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.JIRA_KPI_CACHE); - jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_SOURCE_ENDPOINT, CommonConstant.JIRA_KPI, ""); + jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.CACHE_PROJECT_KPI_DATA); } } diff --git a/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JiraIssueSprintJobListener.java b/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JiraIssueSprintJobListener.java index 1d9b694527..350886a07c 100644 --- a/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JiraIssueSprintJobListener.java +++ b/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JiraIssueSprintJobListener.java @@ -79,7 +79,7 @@ public void afterJob(JobExecution jobExecution) { processorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.JIRA_KPI_CACHE); processorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.CACHE_PROJECT_TOOL_CONFIG); - processorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_SOURCE_ENDPOINT, CommonConstant.JIRA_KPI, ""); + processorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.CACHE_PROJECT_KPI_DATA); } else { sprintTrace.setErrorInFetch(true); diff --git a/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JobListenerScrum.java b/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JobListenerScrum.java index 9eecbc0c0c..82739ae34b 100644 --- a/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JobListenerScrum.java +++ b/processors/jira/src/main/java/com/publicissapient/kpidashboard/jira/listener/JobListenerScrum.java @@ -141,8 +141,8 @@ public void afterJob(JobExecution jobExecution) { jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.CACHE_PROJECT_TOOL_CONFIG); jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_ENDPOINT, CommonConstant.JIRA_KPI_CACHE); - jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, - CommonConstant.JIRA_KPI, projectId); + jiraProcessorCacheEvictor.evictCache(CommonConstant.CACHE_CLEAR_PROJECT_SOURCE_ENDPOINT, projectId, + CommonConstant.JIRA_KPI); try { if (jobExecution.getStatus() == BatchStatus.FAILED) { log.error("job failed : {} for the project : {}", jobExecution.getJobInstance().getJobName(),