Release 4.13.1

gradle.properties

@@ -1,5 +1,5 @@
 springBoot                        = 2.6.6
 dependencyManagement              = 1.0.11.RELEASE
-projectVersion                    = 4.13.0
+projectVersion                    = 4.13.1
 paypalHyperwalletDockerRepository = hyperwallet-mirakl-connector
 org.gradle.jvmargs                = -XX:PermSize=1024M -XX:MaxPermSize=1024M

infrastructure/src/main/java/com/paypal/infrastructure/batchjob/repository/BatchJobTrackingRepository.java

@@ -60,7 +60,7 @@ public interface BatchJobTrackingRepository extends JpaRepository<BatchJobTrackI
 				LEFT JOIN BatchJobItemTrackInfoEntity ji ON j.batchJobId = ji.batchJobId
 				WHERE j.batchJobType = :batchJobType
 					AND j.startTime >= :from
-				GROUP BY j.batchJobId
+				GROUP BY j.batchJobId, j.batchJobType, j.startTime, j.finishTime, j.status
 				HAVING COUNT(ji.itemId) > 0
 				ORDER BY j.startTime DESC
 			""")

infrastructure/src/test/java/com/paypal/infrastructure/batchjob/integrationtests/ExtractionDeltaCalculationITTest.java

@@ -65,11 +65,16 @@ void repository_shouldFindJobsWithItems_WhenTheyAreInDateRange() {
 				10);
 		List<BatchJobItemTrackInfoEntity> batchJobItemTrackInfoEntities3 = BatchJobTrackingEntitiesMother
 				.buildJobItemsTrackingInfo(batchJobTrackInfoEntity3, 10);
+		BatchJobTrackInfoEntity batchJobTrackInfoEntity4 = BatchJobTrackingEntitiesMother.buildJobTrackingInfo('B', 4,
+				10);
+		List<BatchJobItemTrackInfoEntity> batchJobItemTrackInfoEntities4 = BatchJobTrackingEntitiesMother
+				.buildJobItemsTrackingInfo(batchJobTrackInfoEntity4, 10);
 
-		batchJobTrackingRepository
-				.saveAll(List.of(batchJobTrackInfoEntity1, batchJobTrackInfoEntity2, batchJobTrackInfoEntity3));
+		batchJobTrackingRepository.saveAll(List.of(batchJobTrackInfoEntity1, batchJobTrackInfoEntity2,
+				batchJobTrackInfoEntity3, batchJobTrackInfoEntity4));
 		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities1);
 		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities3);
+		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities4);
 
 		List<BatchJobTrackInfoEntity> jobsWithItems = batchJobTrackingRepository.findLastJobExecutionsWithItems(
 				batchJobTrackInfoEntity1.getBatchJobType(), TimeMachine.now().minusDays(11).minusSeconds(1),
@@ -88,10 +93,16 @@ void repository_shouldNotFindJobsWithItems_WhenTheyAreNotInDateRange() {
 				3);
 		List<BatchJobItemTrackInfoEntity> batchJobItemTrackInfoEntities2 = BatchJobTrackingEntitiesMother
 				.buildJobItemsTrackingInfo(batchJobTrackInfoEntity2, 10);
+		BatchJobTrackInfoEntity batchJobTrackInfoEntity4 = BatchJobTrackingEntitiesMother.buildJobTrackingInfo('B', 4,
+				10);
+		List<BatchJobItemTrackInfoEntity> batchJobItemTrackInfoEntities4 = BatchJobTrackingEntitiesMother
+				.buildJobItemsTrackingInfo(batchJobTrackInfoEntity4, 10);
 
-		batchJobTrackingRepository.saveAll(List.of(batchJobTrackInfoEntity1, batchJobTrackInfoEntity2));
+		batchJobTrackingRepository
+				.saveAll(List.of(batchJobTrackInfoEntity1, batchJobTrackInfoEntity2, batchJobTrackInfoEntity4));
 		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities1);
 		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities2);
+		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities4);
 
 		List<BatchJobTrackInfoEntity> jobsWithItems = batchJobTrackingRepository.findLastJobExecutionsWithItems(
 				batchJobTrackInfoEntity1.getBatchJobType(), TimeMachine.now().minusDays(2), Pageable.unpaged());
@@ -111,10 +122,16 @@ void service_shouldFindLastJobWithItems_WhenTheyAreInDateRange() {
 				2);
 		List<BatchJobItemTrackInfoEntity> batchJobItemTrackInfoEntities2 = BatchJobTrackingEntitiesMother
 				.buildJobItemsTrackingInfo(batchJobTrackInfoEntity2, 10);
+		BatchJobTrackInfoEntity batchJobTrackInfoEntity4 = BatchJobTrackingEntitiesMother.buildJobTrackingInfo('B', 4,
+				10);
+		List<BatchJobItemTrackInfoEntity> batchJobItemTrackInfoEntities4 = BatchJobTrackingEntitiesMother
+				.buildJobItemsTrackingInfo(batchJobTrackInfoEntity4, 10);
 
-		batchJobTrackingRepository.saveAll(List.of(batchJobTrackInfoEntity1, batchJobTrackInfoEntity2));
+		batchJobTrackingRepository
+				.saveAll(List.of(batchJobTrackInfoEntity1, batchJobTrackInfoEntity2, batchJobTrackInfoEntity4));
 		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities1);
 		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities2);
+		batchJobItemTrackingRepository.saveAll(batchJobItemTrackInfoEntities4);
 
 		Optional<BatchJobTrackInfoEntity> result = batchJobTrackingService.findLastJobExecutionWithNonEmptyExtraction(
 				batchJobTrackInfoEntity1.getBatchJobType(), TimeMachine.now().minusDays(2).minusSeconds(1));