Merge pull request #114 from bcgov/feature/replicate-student-courses-saga

Fix for course replication saga not picking up queued sagas

Author: mightycox

api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/StudentCourseUpdateOrchestrator.java

@@ -30,6 +30,7 @@
 
 import static ca.bc.gov.educ.api.pen.replication.constants.EventOutcome.*;
 import static ca.bc.gov.educ.api.pen.replication.constants.EventType.*;
+import static ca.bc.gov.educ.api.pen.replication.constants.SagaStatusEnum.IN_PROGRESS;
 
 @Component
 @Slf4j
@@ -65,6 +66,7 @@ public void populateStepsToExecuteMap() {
 
   private void prepareStudentCourseUpdate(final Event event, final Saga saga, final StudentCourseUpdateSagaData sagaData) {
     saga.setSagaState(PREPARE_STUDENT_COURSE_UPDATE.toString());
+    saga.setStatus(IN_PROGRESS.toString());
     final SagaEvent eventStates = this.createEventState(saga, event.getEventType(), event.getEventOutcome(), event.getEventPayload());
     this.getSagaService().updateAttachedSagaWithEvents(saga, eventStates);
 

api/src/main/java/ca/bc/gov/educ/api/pen/replication/schedulers/EventTaskScheduler.java

@@ -99,10 +99,10 @@ private void processQueuedSaga(final Saga saga) {
       if (sagaData != null) {
         val studentID = sagaData.getStudentID();
 
-        // Check if there's a conflicting in-progress saga for this student
-        val conflictingSagas = this.getSagaService().findInProgressStudentCourseUpdateSagasByStudentID(studentID).stream().filter(s -> !s.getSagaId().equals(saga.getSagaId())).toList();
+        // If this saga isn't the oldest for this student, don't run it
+        val inProgressSagas = this.getSagaService().findInProgressStudentCourseUpdateSagasByStudentID(studentID);
 
-        if (conflictingSagas.isEmpty()) {
+        if (inProgressSagas.isEmpty() ||  inProgressSagas.get(0).getSagaId().equals(saga.getSagaId())) {
           this.getSagaEnumOrchestratorMap().get(SagaEnum.getKeyFromValue(saga.getSagaName())).startSaga(saga);
           log.info("Started queued saga {} for studentID {}", saga.getSagaId(), studentID);
         }