Adapt the productivity calculation algorithm to the latest requirements

ai-data-processor/pom.xml

@@ -183,7 +183,7 @@
           <execution>
             <id>build</id>
             <goals>
-                <goal>build</goal>
+              <goal>build</goal>
             </goals>
             <phase>install</phase>
             <configuration>

ai-data-processor/src/test/java/com/publicissapient/kpidashboard/job/productivitycalculation/service/ProductivityCalculationServiceTest.java

@@ -419,28 +419,50 @@ private List<KpiElement> createMockKpiElementsWithIterationData() {
 		List<KpiElement> kpiElements = new ArrayList<>();
 
 		// Wastage KPI
-		KpiElement wastageKpi = new KpiElement();
-		wastageKpi.setKpiId("kpi131");
-		wastageKpi.setKpiName("Wastage");
-		wastageKpi.setSprintId("sprint1");
+		KpiElement wastageKpi1 = new KpiElement();
+		wastageKpi1.setKpiId("kpi131");
+		wastageKpi1.setKpiName("Wastage");
+		wastageKpi1.setSprintId("sprint1");
 
-		Set<IssueKpiModalValue> issueData =
+		Set<IssueKpiModalValue> issueData1 =
 				Set.of(createIssueKpiModalValue(5, 3), createIssueKpiModalValue(4, 2));
-		wastageKpi.setIssueData(issueData);
-		kpiElements.add(wastageKpi);
+		wastageKpi1.setIssueData(issueData1);
+		kpiElements.add(wastageKpi1);
+
+		KpiElement wastageKpi2 = new KpiElement();
+		wastageKpi2.setKpiId("kpi131");
+		wastageKpi2.setKpiName("Wastage");
+		wastageKpi2.setSprintId("sprint2");
+
+		Set<IssueKpiModalValue> issueData2 =
+				Set.of(createIssueKpiModalValue(5, 3), createIssueKpiModalValue(4, 2));
+		wastageKpi2.setIssueData(issueData2);
+		kpiElements.add(wastageKpi2);
 
 		// Work Status KPI
-		KpiElement workStatusKpi = new KpiElement();
-		workStatusKpi.setKpiId("kpi128");
-		workStatusKpi.setKpiName("Work Status");
-		workStatusKpi.setSprintId("sprint1");
+		KpiElement workStatusKpi1 = new KpiElement();
+		workStatusKpi1.setKpiId("kpi128");
+		workStatusKpi1.setKpiName("Work Status");
+		workStatusKpi1.setSprintId("sprint1");
 
 		Set<IssueKpiModalValue> workStatusIssueData =
 				Set.of(
 						createIssueKpiModalValueWithDelay(Map.of("Planned", 2)),
 						createIssueKpiModalValueWithDelay(Map.of("Planned", 3)));
-		workStatusKpi.setIssueData(workStatusIssueData);
-		kpiElements.add(workStatusKpi);
+		workStatusKpi1.setIssueData(workStatusIssueData);
+		kpiElements.add(workStatusKpi1);
+
+		KpiElement workStatusKpi2 = new KpiElement();
+		workStatusKpi2.setKpiId("kpi128");
+		workStatusKpi2.setKpiName("Work Status");
+		workStatusKpi2.setSprintId("sprint2");
+
+		Set<IssueKpiModalValue> workStatusIssueData2 =
+				Set.of(
+						createIssueKpiModalValueWithDelay(Map.of("Planned", 2)),
+						createIssueKpiModalValueWithDelay(Map.of("Planned", 3)));
+		workStatusKpi2.setIssueData(workStatusIssueData2);
+		kpiElements.add(workStatusKpi2);
 
 		return kpiElements;
 	}

argocd/src/main/java/com/publicissapient/kpidashboard/argocd/processor/ArgoCDProcessorJobExecutor.java

@@ -457,11 +457,11 @@ private void cacheRestClient(String cacheEndPoint, String param1, String param2)
 		uriBuilder.path(cacheEndPoint);
 
 		HttpEntity<?> entity = new HttpEntity<>(headers);
-        
+
 		ResponseEntity<String> response = null;
 		try {
 			response =
-                    restTemplate.exchange(uriBuilder.toUriString(), HttpMethod.GET, entity, String.class);
+					restTemplate.exchange(uriBuilder.toUriString(), HttpMethod.GET, entity, String.class);
 		} catch (RestClientException e) {
 			log.error("[JENKINS-CUSTOMAPI-CACHE-EVICT]. Error while consuming rest service {}", e);
 		}

rally/pom.xml

@@ -435,7 +435,7 @@
           <execution>
             <id>build</id>
             <goals>
-                <goal>build</goal>
+              <goal>build</goal>
             </goals>
             <phase>install</phase>
             <configuration>

rally/src/main/java/com/publicissapient/kpidashboard/rally/jobs/RallyProcessorJob.java

@@ -96,7 +96,9 @@ private Step scrumReleaseDataStep() {
 	 */
 	@TrackExecutionTime
 	@Bean
-	public Job fetchIssueScrumRqlJob(@Qualifier("fetchIssueSprintJob") Job fetchIssueScrumRqlJob, @Autowired JobListenerScrum jobListenerScrum) {
+	public Job fetchIssueScrumRqlJob(
+			@Qualifier("fetchIssueSprintJob") Job fetchIssueScrumRqlJob,
+			@Autowired JobListenerScrum jobListenerScrum) {
 		return builderFactory
 				.getJobBuilder("FetchIssueScrum RQL Job", jobRepository)
 				.incrementer(new RunIdIncrementer())
@@ -136,7 +138,8 @@ private Step fetchSprintDataStep() {
 	 */
 	@TrackExecutionTime
 	@Bean
-	public Job fetchIssueSprintJob(@Autowired RallyIssueSprintJobListener rallyIssueSprintJobListener) {
+	public Job fetchIssueSprintJob(
+			@Autowired RallyIssueSprintJobListener rallyIssueSprintJobListener) {
 		return builderFactory
 				.getJobBuilder("fetchIssueSprint Job", jobRepository)
 				.incrementer(new RunIdIncrementer())

rally/src/main/java/com/publicissapient/kpidashboard/rally/processor/RallyIssueHistoryProcessorImpl.java

@@ -164,9 +164,7 @@ private void addHistoryChangeLog(
 			String oldValue,
 			String newValue,
 			List<JiraHistoryChangeLog> changeLogList) {
-		LocalDateTime changedDateTime =
-				DateUtil.convertingStringToLocalDateTime(
-						dateTimeString);
+		LocalDateTime changedDateTime = DateUtil.convertingStringToLocalDateTime(dateTimeString);
 
 		JiraHistoryChangeLog historyChangeLog = new JiraHistoryChangeLog();
 		historyChangeLog.setUpdatedOn(changedDateTime);