Merge pull request #1576 from bcgov/feature/isfsReport

Fixes for unique saga result
bcgov · Jan 29, 2025 · d29517b · d29517b
2 parents 190c55f + dfbf020
commit d29517b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.../java/ca/bc/gov/educ/studentdatacollection/api/service/v1/events/EventHandlerService.java b/.../java/ca/bc/gov/educ/studentdatacollection/api/service/v1/events/EventHandlerService.java
@@ -60,9 +60,14 @@ public void handleReadFromTopicEvent(final Event event) throws JsonProcessingExc
         log.trace(EXECUTION_IS_NOT_REQUIRED, event);
         return;
       }
-      val saga = this.studentProcessingOrchestrator.createSaga(event.getEventPayload(), UUID.fromString(sagaData.getSdcSchoolCollectionStudent().getSdcSchoolCollectionStudentID()), UUID.fromString(sagaData.getSdcSchoolCollectionStudent().getSdcSchoolCollectionID()), ApplicationProperties.STUDENT_DATA_COLLECTION_API, null);
-      log.debug("Starting student processing orchestrator :: {}", saga);
-      this.studentProcessingOrchestrator.startSaga(saga);
+      try {
+        val saga = this.studentProcessingOrchestrator.createSaga(event.getEventPayload(), UUID.fromString(sagaData.getSdcSchoolCollectionStudent().getSdcSchoolCollectionStudentID()), UUID.fromString(sagaData.getSdcSchoolCollectionStudent().getSdcSchoolCollectionID()), ApplicationProperties.STUDENT_DATA_COLLECTION_API, null);
+        log.debug("Starting student processing orchestrator :: {}", saga);
+        this.studentProcessingOrchestrator.startSaga(saga);
+      }catch(Exception e){
+        //This will happen occasionally when we have multiple messages hitting our pods
+        log.debug("Skipping processing on student {} :: saga already exists :: exception was: {}", sagaData.getSdcSchoolCollectionStudent().getSdcSchoolCollectionStudentID(), e.getMessage());
+      }
     }
   }
 

diff --git a/api/src/main/resources/db/migration/V1.0.89__STUDENT_DATA_COLLECTION.API.sql b/api/src/main/resources/db/migration/V1.0.89__STUDENT_DATA_COLLECTION.API.sql
@@ -0,0 +1,3 @@
+ALTER TABLE SDC_SAGA
+    ADD CONSTRAINT UNQ_SDC_SCHOOL_COLLECTION_STUDENT_ID_SAGA_NAME
+        UNIQUE (SDC_SCHOOL_COLLECTION_STUDENT_ID, SAGA_NAME);