Feature/dts 50661 recommendation batch sn

ai-data-processor/pom.xml

@@ -144,6 +144,11 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.knowhow.retro</groupId>
+            <artifactId>ai-gateway-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
         <!--Logging dependencies-->
         <dependency>

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/AiDataProcessorApplication.java

@@ -9,8 +9,9 @@
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
-@ComponentScan(basePackages = {"com.publicissapient", "com.knowhow.retro.notifications"})
-@EnableMongoRepositories(basePackages = {"com.publicissapient.**.repository"})
+@ComponentScan(basePackages = { "com.publicissapient", "com.knowhow.retro.notifications",
+		"com.knowhow.retro.aigatewayclient" })
+@EnableMongoRepositories(basePackages = { "com.publicissapient.**.repository" })
 @EnableBatchProcessing
 @EnableAsync
 @EnableScheduling

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/listener/AIUsageStatisticsJobCompletionListener.java

@@ -16,9 +16,9 @@
 
 package com.publicissapient.kpidashboard.job.aiusagestatisticscollector.listener;
 
-import com.publicissapient.kpidashboard.common.model.ProcessorExecutionTraceLog;
+import com.publicissapient.kpidashboard.common.model.tracelog.JobExecutionTraceLog;
 import com.publicissapient.kpidashboard.common.model.application.ErrorDetail;
-import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogServiceImpl;
+import com.publicissapient.kpidashboard.common.service.JobExecutionTraceLogService;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.service.AccountBatchService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -37,7 +37,7 @@
 @AllArgsConstructor
 public class AIUsageStatisticsJobCompletionListener implements JobExecutionListener {
     private final AccountBatchService accountBatchService;
-    private final ProcessorExecutionTraceLogServiceImpl processorExecutionTraceLogServiceImpl;
+    private final JobExecutionTraceLogService jobExecutionTraceLogService;
 
     @Override
     public void afterJob(@NonNull JobExecution jobExecution) {
@@ -50,20 +50,20 @@ private void storeJobExecutionStatus(JobExecution jobExecution) {
         String jobName = jobParameters.getString("jobName");
         ObjectId executionId = (ObjectId) Objects.requireNonNull(jobParameters.getParameter("executionId")).getValue();
 
-        Optional<ProcessorExecutionTraceLog> processorExecutionTraceLogOptional = this.processorExecutionTraceLogServiceImpl
+        Optional<JobExecutionTraceLog> executionTraceLogOptional = this.jobExecutionTraceLogService
                 .findById(executionId);
-        if (processorExecutionTraceLogOptional.isPresent()) {
-            ProcessorExecutionTraceLog executionTraceLog = processorExecutionTraceLogOptional.get();
+        if (executionTraceLogOptional.isPresent()) {
+            JobExecutionTraceLog executionTraceLog = executionTraceLogOptional.get();
             executionTraceLog.setExecutionOngoing(false);
-            executionTraceLog.setExecutionEndedAt(Instant.now().toEpochMilli());
+            executionTraceLog.setExecutionEndedAt(Instant.now());
             executionTraceLog.setExecutionSuccess(jobExecution.getStatus() == BatchStatus.COMPLETED);
             executionTraceLog
                     .setErrorDetailList(jobExecution.getAllFailureExceptions().stream().map(failureException -> {
                         ErrorDetail errorDetail = new ErrorDetail();
                         errorDetail.setError(failureException.getMessage());
                         return errorDetail;
                     }).toList());
-            this.processorExecutionTraceLogServiceImpl.saveAiDataProcessorExecutions(executionTraceLog);
+            this.jobExecutionTraceLogService.updateJobExecution(executionTraceLog);
         } else {
             log.error("Could not store job execution ending status for job with name {} and execution id {}. Job "
                     + "execution could not be found", jobName, executionId);

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/processor/AccountItemProcessor.java

@@ -21,6 +21,7 @@
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.dto.PagedAIUsagePerOrgLevel;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.model.AIUsageStatistics;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.service.AIUsageStatisticsService;
+import com.publicissapient.kpidashboard.job.constant.JobConstants;
 
 import jakarta.annotation.Nonnull;
 import lombok.AllArgsConstructor;
@@ -33,7 +34,7 @@ public class AccountItemProcessor implements ItemProcessor<PagedAIUsagePerOrgLev
 
     @Override
     public AIUsageStatistics process(@Nonnull PagedAIUsagePerOrgLevel item) {
-        log.debug("[ai-usage-statistics-collector job] Fetching AI usage statistics for level name: {}", item.levelName());
+        log.debug("{} Fetching AI usage statistics for level name: {}", JobConstants.LOG_PREFIX_AI_USAGE_STATISTICS, item.levelName());
         return aiUsageStatisticsService.fetchAIUsageStatistics(item.levelName());
     }
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/reader/AccountItemReader.java

@@ -20,6 +20,7 @@
 
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.dto.PagedAIUsagePerOrgLevel;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.service.AccountBatchService;
+import com.publicissapient.kpidashboard.job.constant.JobConstants;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +34,7 @@ public class AccountItemReader implements ItemReader<PagedAIUsagePerOrgLevel> {
     @Override
     public PagedAIUsagePerOrgLevel read() {
         PagedAIUsagePerOrgLevel aiUsageStatistics = accountBatchService.getNextAccountPage();
-        log.info("[ai-usage-statistics-collector job] Reader fetched level name: {}", aiUsageStatistics.levelName());
+        log.info("{} Reader fetched level name: {}", JobConstants.LOG_PREFIX_AI_USAGE_STATISTICS, aiUsageStatistics.levelName());
         return aiUsageStatistics;
     }
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/strategy/AIUsageStatisticsJobStrategy.java

@@ -30,7 +30,8 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogServiceImpl;
+import com.publicissapient.kpidashboard.common.service.JobExecutionTraceLogService;
+import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogService;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.config.AIUsageStatisticsCollectorJobConfig;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.dto.PagedAIUsagePerOrgLevel;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.listener.AIUsageStatisticsJobCompletionListener;
@@ -61,7 +62,7 @@ public class AIUsageStatisticsJobStrategy implements JobStrategy {
 
     private final AccountBatchService accountBatchService;
     private final AIUsageStatisticsService aiUsageStatisticsService;
-    private final ProcessorExecutionTraceLogServiceImpl processorExecutionTraceLogServiceImpl;
+    private final JobExecutionTraceLogService jobExecutionTraceLogService;
 
     @Override
     public String getJobName() {
@@ -72,7 +73,7 @@ public String getJobName() {
     public Job getJob() {
         Step startStep = chunkProcessAIUsageStatisticsForAccounts();
         AIUsageStatisticsJobCompletionListener jobListener = new AIUsageStatisticsJobCompletionListener(
-                this.accountBatchService, this.processorExecutionTraceLogServiceImpl);
+                this.accountBatchService, this.jobExecutionTraceLogService);
         return new JobBuilder(aiUsageStatisticsCollectorJobConfig.getName(), jobRepository)
                 .start(startStep)
                 .listener(jobListener)

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/writer/AccountItemWriter.java

@@ -23,6 +23,7 @@
 
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.model.AIUsageStatistics;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.service.AIUsageStatisticsService;
+import com.publicissapient.kpidashboard.job.constant.JobConstants;
 
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
@@ -35,7 +36,7 @@ public class AccountItemWriter implements ItemWriter<AIUsageStatistics> {
 
     @Override
     public void write(@NonNull Chunk<? extends AIUsageStatistics> chunk) {
-        log.info("[ai-usage-statistics-collector job] Received chunk items for inserting into database with size: {}", chunk.size());
+        log.info("{} Received chunk items for inserting into database with size: {}", JobConstants.LOG_PREFIX_AI_USAGE_STATISTICS, chunk.size());
         aiUsageStatisticsService.saveAll((List.copyOf(chunk.getItems())));
     }
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/constant/JobConstants.java

@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2024 Sapient Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and limitations under the
+ *  License.
+ */
+
+package com.publicissapient.kpidashboard.job.constant;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * Constants used across AI Data Processor jobs.
+ */
+@UtilityClass
+public final class JobConstants {
+
+	public static final String JOB_PRODUCTIVITY_CALCULATION = "productivity-calculation";
+	public static final String JOB_KPI_MATURITY_CALCULATION = "kpi-maturity-calculation";
+	public static final String JOB_AI_USAGE_STATISTICS_COLLECTOR = "ai-usage-statistics-collector";
+	public static final String JOB_RECOMMENDATION_CALCULATION = "recommendation-calculation";
+
+	public static final String LOG_PREFIX_RECOMMENDATION = "[recommendation-calculation job]";
+	public static final String LOG_PREFIX_PRODUCTIVITY = "[productivity-calculation job]";
+	public static final String LOG_PREFIX_KPI_MATURITY = "[kpi-maturity-calculation job]";
+	public static final String LOG_PREFIX_AI_USAGE_STATISTICS = "[ai-usage-statistics-collector job]";
+
+}

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/listener/KpiMaturityCalculationJobExecutionListener.java

@@ -27,9 +27,9 @@
 import org.springframework.batch.core.JobParameters;
 import org.springframework.lang.NonNull;
 
-import com.publicissapient.kpidashboard.common.model.ProcessorExecutionTraceLog;
+import com.publicissapient.kpidashboard.common.model.tracelog.JobExecutionTraceLog;
 import com.publicissapient.kpidashboard.common.model.application.ErrorDetail;
-import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogServiceImpl;
+import com.publicissapient.kpidashboard.common.service.JobExecutionTraceLogService;
 import com.publicissapient.kpidashboard.job.productivitycalculation.service.ProjectBatchService;
 
 import lombok.RequiredArgsConstructor;
@@ -39,7 +39,7 @@
 @RequiredArgsConstructor
 public class KpiMaturityCalculationJobExecutionListener implements JobExecutionListener {
     private final ProjectBatchService projectBatchService;
-    private final ProcessorExecutionTraceLogServiceImpl processorExecutionTraceLogServiceImpl;
+    private final JobExecutionTraceLogService jobExecutionTraceLogService;
 
     @Override
     public void afterJob(@NonNull JobExecution jobExecution) {
@@ -52,20 +52,20 @@ private void storeJobExecutionStatus(JobExecution jobExecution) {
         String jobName = jobParameters.getString("jobName");
         ObjectId executionId = (ObjectId) Objects.requireNonNull(jobParameters.getParameter("executionId")).getValue();
 
-        Optional<ProcessorExecutionTraceLog> processorExecutionTraceLogOptional = this.processorExecutionTraceLogServiceImpl
+        Optional<JobExecutionTraceLog> executionTraceLogOptional = this.jobExecutionTraceLogService
                 .findById(executionId);
-        if (processorExecutionTraceLogOptional.isPresent()) {
-            ProcessorExecutionTraceLog executionTraceLog = processorExecutionTraceLogOptional.get();
+        if (executionTraceLogOptional.isPresent()) {
+            JobExecutionTraceLog executionTraceLog = executionTraceLogOptional.get();
             executionTraceLog.setExecutionOngoing(false);
-            executionTraceLog.setExecutionEndedAt(Instant.now().toEpochMilli());
+            executionTraceLog.setExecutionEndedAt(Instant.now());
             executionTraceLog.setExecutionSuccess(jobExecution.getStatus() == BatchStatus.COMPLETED);
             executionTraceLog
                     .setErrorDetailList(jobExecution.getAllFailureExceptions().stream().map(failureException -> {
                         ErrorDetail errorDetail = new ErrorDetail();
                         errorDetail.setError(failureException.getMessage());
                         return errorDetail;
                     }).toList());
-            this.processorExecutionTraceLogServiceImpl.saveAiDataProcessorExecutions(executionTraceLog);
+            this.jobExecutionTraceLogService.updateJobExecution(executionTraceLog);
         } else {
             log.error("Could not store job execution ending status for job with name {} and execution id {}. Job "
                     + "execution could not be found", jobName, executionId);

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/processor/ProjectItemProcessor.java

@@ -19,6 +19,7 @@
 import org.springframework.batch.item.ItemProcessor;
 
 import com.publicissapient.kpidashboard.common.model.kpimaturity.organization.KpiMaturity;
+import com.publicissapient.kpidashboard.job.constant.JobConstants;
 import com.publicissapient.kpidashboard.job.kpimaturitycalculation.service.KpiMaturityCalculationService;
 import com.publicissapient.kpidashboard.job.shared.dto.ProjectInputDTO;
 
@@ -34,7 +35,7 @@ public class ProjectItemProcessor implements ItemProcessor<ProjectInputDTO, KpiM
 
     @Override
     public KpiMaturity process(@Nonnull ProjectInputDTO item) {
-        log.info("[kpi-maturity-calculation job] Starting kpi metrics calculation for project with nodeId: {}", item.nodeId());
+        log.info("{} Starting kpi metrics calculation for project with nodeId: {}", JobConstants.LOG_PREFIX_KPI_MATURITY,item.nodeId());
 
         return kpiMaturityCalculationService.calculateKpiMaturityForProject(item);
     }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/reader/ProjectItemReader.java

@@ -18,6 +18,7 @@
 
 import org.springframework.batch.item.ItemReader;
 
+import com.publicissapient.kpidashboard.job.constant.JobConstants;
 import com.publicissapient.kpidashboard.job.productivitycalculation.service.ProjectBatchService;
 import com.publicissapient.kpidashboard.job.shared.dto.ProjectInputDTO;
 
@@ -34,7 +35,7 @@ public class ProjectItemReader implements ItemReader<ProjectInputDTO> {
     public ProjectInputDTO read() {
         ProjectInputDTO projectInputDTO = projectBatchService.getNextProjectInputData();
 
-        log.info("[kpi-maturity-calculation job] Received project input dto {}", projectInputDTO);
+        log.info("{} Received project input dto {}", JobConstants.LOG_PREFIX_KPI_MATURITY, projectInputDTO);
 
         return projectInputDTO;
     }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/strategy/KpiMaturityCalculationJobStrategy.java

@@ -31,7 +31,8 @@
 import org.springframework.transaction.PlatformTransactionManager;
 
 import com.publicissapient.kpidashboard.common.model.kpimaturity.organization.KpiMaturity;
-import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogServiceImpl;
+import com.publicissapient.kpidashboard.common.service.JobExecutionTraceLogService;
+import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogService;
 import com.publicissapient.kpidashboard.job.config.base.SchedulingConfig;
 import com.publicissapient.kpidashboard.job.kpimaturitycalculation.config.KpiMaturityCalculationConfig;
 import com.publicissapient.kpidashboard.job.kpimaturitycalculation.listener.KpiMaturityCalculationJobExecutionListener;
@@ -59,7 +60,8 @@ public class KpiMaturityCalculationJobStrategy implements JobStrategy {
 
 	private final ProjectBatchService projectBatchService;
 	private final KpiMaturityCalculationService kpiMaturityCalculationService;
-	private final ProcessorExecutionTraceLogServiceImpl processorExecutionTraceLogServiceImpl;
+	private final JobExecutionTraceLogService jobExecutionTraceLogService;
+	private final ProcessorExecutionTraceLogService processorExecutionTraceLogService;
 
 	@Override
 	public String getJobName() {
@@ -71,7 +73,7 @@ public Job getJob() {
 		return new JobBuilder(this.kpiMaturityCalculationConfig.getName(), this.jobRepository)
 				.start(chunkProcessProjects())
 				.listener(new KpiMaturityCalculationJobExecutionListener(this.projectBatchService,
-						this.processorExecutionTraceLogServiceImpl))
+						this.jobExecutionTraceLogService))
 				.build();
 	}
 
@@ -98,7 +100,7 @@ private AsyncItemProcessor<ProjectInputDTO, KpiMaturity> asyncProjectProcessor()
 
 	private AsyncItemWriter<KpiMaturity> asyncItemWriter() {
 		AsyncItemWriter<KpiMaturity> writer = new AsyncItemWriter<>();
-		writer.setDelegate(new ProjectItemWriter(this.kpiMaturityCalculationService));
+		writer.setDelegate(new ProjectItemWriter(this.kpiMaturityCalculationService, this.processorExecutionTraceLogService));
 		return writer;
 	}
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/writer/ProjectItemWriter.java

@@ -18,6 +18,8 @@
 
 import java.util.List;
 
+import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogService;
+import com.publicissapient.kpidashboard.job.constant.JobConstants;
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.lang.NonNull;
@@ -32,11 +34,13 @@
 @RequiredArgsConstructor
 public class ProjectItemWriter implements ItemWriter<KpiMaturity> {
 
-    private final KpiMaturityCalculationService kpiMaturityCalculationService;
+	private final KpiMaturityCalculationService kpiMaturityCalculationService;
+	private final ProcessorExecutionTraceLogService processorExecutionTraceLogService;
 
-    @Override
-    public void write(@NonNull Chunk<? extends KpiMaturity> chunk) {
-        log.info("[kpi-maturity-calculation job] Received chunk items for inserting into database with size: {}", chunk.size());
-        kpiMaturityCalculationService.saveAll((List<KpiMaturity>) chunk.getItems());
-    }
+	@Override
+	public void write(@NonNull Chunk<? extends KpiMaturity> chunk) {
+		log.info("{} Received chunk items for inserting into database with size: {}",
+				JobConstants.LOG_PREFIX_KPI_MATURITY, chunk.size());
+		kpiMaturityCalculationService.saveAll((List<KpiMaturity>) chunk.getItems());
+	}
 }