CNDE-1878: Postprocessing service integration for case_count (#81)

CDCgov · Nov 13, 2024 · c4f8528 · c4f8528
1 parent 1329d30
commit c4f8528
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/...ava/gov/cdc/etldatapipeline/postprocessingservice/repository/InvestigationRepository.java b/...ava/gov/cdc/etldatapipeline/postprocessingservice/repository/InvestigationRepository.java
@@ -24,4 +24,7 @@ public interface InvestigationRepository extends JpaRepository<InvestigationResu
     void executeStoredProcForHepDatamart(
             @Param("publicHealthCaseUids") String publicHealthCaseUids,
             @Param("patientUids") String patientUids);
+
+    @Procedure("sp_nrt_case_count_postprocessing")
+    void executeStoredProcForCaseCount(@Param("healthcaseUids") String healthcaseUids);
 }
diff --git a/...ain/java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingService.java b/...ain/java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingService.java
@@ -71,6 +71,7 @@ enum Entity {
         OBSERVATION(7, "observation", "observation_uid", null),
         F_PAGE_CASE(0, "fact page case", PHC_UID, "sp_f_page_case_postprocessing"),
         CASE_ANSWERS(0, "case answers", PHC_UID, "sp_page_builder_postprocessing"),
+        CASE_COUNT(0, "case count", PHC_UID, "sp_nrt_case_count_postprocessing"),
         UNKNOWN(-1, "unknown", "unknown_uid", "sp_nrt_unknown_postprocessing");
 
         private final int priority;
@@ -230,6 +231,10 @@ protected void processCachedIds() {
 
                         processTopic(keyTopic, Entity.F_PAGE_CASE, ids,
                                 investigationRepository::executeStoredProcForFPageCase);
+
+                        processTopic(keyTopic, Entity.CASE_COUNT, ids,
+                                investigationRepository::executeStoredProcForCaseCount);
+
                         datamartProcessor.process(invData);
                         break;
                     case NOTIFICATION:

diff --git a/...java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingServiceTest.java b/...java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingServiceTest.java
@@ -135,10 +135,11 @@ void testPostProcessInvestigationMessage() {
         String expectedPublicHealthCaseIdsString = "123";
         verify(investigationRepositoryMock).executeStoredProcForPublicHealthCaseIds(expectedPublicHealthCaseIdsString);
         verify(investigationRepositoryMock).executeStoredProcForFPageCase(expectedPublicHealthCaseIdsString);
+        verify(investigationRepositoryMock).executeStoredProcForCaseCount(expectedPublicHealthCaseIdsString);
         verify(investigationRepositoryMock, never()).executeStoredProcForPageBuilder(anyLong(), anyString());
 
         List<ILoggingEvent> logs = listAppender.list;
-        assertEquals(6, logs.size());
+        assertEquals(8, logs.size());
         assertTrue(logs.get(2).getFormattedMessage().contains(PostProcessingService.Entity.INVESTIGATION.getStoredProcedure()));
         assertTrue(logs.get(5).getMessage().contains(PostProcessingService.SP_EXECUTION_COMPLETED));
     }
@@ -180,7 +181,7 @@ void testPostProcessPageBuilder() {
                 expectedRdbTableNames);
 
         List<ILoggingEvent> logs = listAppender.list;
-        assertEquals(8, logs.size());
+        assertEquals(10, logs.size());
         assertTrue(logs.get(7).getMessage().contains(PostProcessingService.SP_EXECUTION_COMPLETED));
     }
 
@@ -352,8 +353,8 @@ void testPostProcessCacheIdsPriority() {
         assertTrue(topicLogList.get(2).contains(patientTopic));
         assertTrue(topicLogList.get(3).contains(invTopic));
         assertTrue(topicLogList.get(4).contains(invTopic));
-        assertTrue(topicLogList.get(5).contains(ntfTopic));
-        assertTrue(topicLogList.get(6).contains(ldfTopic));
+        assertTrue(topicLogList.get(6).contains(ntfTopic));
+        assertTrue(topicLogList.get(7).contains(ldfTopic));
     }
 
     @Test