Merge pull request #106 from bcgov/fix/changeMergeQuery

change merge direction
bcgov · Oct 24, 2024 · cf76e80 · cf76e80
2 parents 7e9a677 + a138b5c
commit cf76e80
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/pen/services/service/events/EventHandlerService.java b/api/src/main/java/ca/bc/gov/educ/api/pen/services/service/events/EventHandlerService.java
@@ -264,7 +264,7 @@ public byte[] handleGetMergeInDateRangeEvent(@NonNull final Event event) throws
       }
     }
 
-    final List<StudentMergeEntity> mergeEntities = this.getStudentMergeService().findStudentMerges(createDateStart, createDateEnd, StudentMergeDirectionCodes.FROM.getCode());
+    final List<StudentMergeEntity> mergeEntities = this.getStudentMergeService().findStudentMerges(createDateStart, createDateEnd, StudentMergeDirectionCodes.TO.getCode());
 
     final Event newEvent = Event.builder()
             .sagaId(event.getSagaId())

diff --git a/...java/ca/bc/gov/educ/api/pen/services/service/events/EventHandlerDelegatorServiceTest.java b/...java/ca/bc/gov/educ/api/pen/services/service/events/EventHandlerDelegatorServiceTest.java
@@ -188,7 +188,7 @@ public void testHandleGetMergeEvent_givenStudentId_whenSuccessfullyProcessed_sho
   @Test
   public void testHandleGetMergeInDateRangeEvent_givenDateRange_whenSuccessfullyProcessed_shouldHaveEventOutcomeMERGE_FOUND() throws JsonProcessingException {
     final var studentMerge = mapper.toModel(createStudentMergePayload());
-    studentMerge.setStudentMergeDirectionCode(StudentMergeDirectionCodes.FROM.getCode());
+    studentMerge.setStudentMergeDirectionCode(StudentMergeDirectionCodes.TO.getCode());
     studentMerge.setCreateDate(LocalDateTime.now().minusDays(5));
     this.studentMergeRepository.save(studentMerge);
 

diff --git a/...src/test/java/ca/bc/gov/educ/api/pen/services/service/events/EventHandlerServiceTest.java b/...src/test/java/ca/bc/gov/educ/api/pen/services/service/events/EventHandlerServiceTest.java
@@ -179,7 +179,7 @@ public void testHandleGetMergeEvent_givenStudentIdPayload_whenSuccessfullyProces
   @Test
   public void testHandleGetMergeInDateRangeEvent_givenDateRangePayload_whenSuccessfullyProcessed_shouldHaveEventOutcomeMERGE_FOUND() throws JsonProcessingException {
     final var studentMerge = this.createStudentMergePayload();
-    studentMerge.setStudentMergeDirectionCode(StudentMergeDirectionCodes.FROM.getCode());
+    studentMerge.setStudentMergeDirectionCode(StudentMergeDirectionCodes.TO.getCode());
     var studentMergeEntity = mapper.toModel(studentMerge);
     studentMergeEntity.setCreateDate(LocalDateTime.now().minusDays(1));
     this.studentMergeRepository.save(studentMergeEntity);