CNDE-1403 Unit tests fix

CDCgov · Oct 30, 2024 · 27765f4 · 27765f4
1 parent d7e094e
commit 27765f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...ain/java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingService.java b/...ain/java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingService.java
@@ -317,7 +317,7 @@ private String extractValFromMessage(String topic, String payload) {
                 }
             } else if (topic.endsWith(Entity.OBSERVATION.getName())) {
                 String domainCd = objectMapper.readTree(payload).get(PAYLOAD).path("obs_domain_cd_st_1").asText();
-                String ctrlCd = Optional.ofNullable(objectMapper.readTree(payload).get("ctrl_cd_display_form"))
+                String ctrlCd = Optional.ofNullable(objectMapper.readTree(payload).get(PAYLOAD).get("ctrl_cd_display_form"))
                         .filter(node -> !node.isNull()).map(JsonNode::asText).orElse(null);
 
                 if (MORB_REPORT.equals(ctrlCd)) {
@@ -336,9 +336,6 @@ private String extractValFromMessage(String topic, String payload) {
     }
 
     private boolean assertMatches(String value, String... vals ) {
-        if ("null".equals(value)) {
-            value = null;
-        }
         return Arrays.asList(vals).contains(value);
     }
 

diff --git a/...java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingServiceTest.java b/...java/gov/cdc/etldatapipeline/postprocessingservice/service/PostProcessingServiceTest.java
@@ -233,6 +233,7 @@ void testPostProcessObservationMorb() {
             "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"Result\",\"ctrl_cd_display_form\": \"LabReport\"}}'",
             "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"R_Order\",\"ctrl_cd_display_form\": \"LabReportMorb\"}}'",
             "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"R_Result\",\"ctrl_cd_display_form\": \"LabReport\"}}'",
+            "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"I_Order\",\"ctrl_cd_display_form\": null}}'",
             "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"I_Result\",\"ctrl_cd_display_form\": null}}'"
     })
     void testPostProcessObservationLab(String payload) {
@@ -265,8 +266,7 @@ void testPostProcessObservationLab(String payload) {
             "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"Order\",\"ctrl_cd_display_form\": \"NoReport\"}}'",
             "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"NoOrderOrResult\",\"ctrl_cd_display_form\": \"LabReport\"}}'",
             "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": null,\"ctrl_cd_display_form\": \"LabReport\"}}'",
-            "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"C_Result\",\"ctrl_cd_display_form\": \"LabComment\"}}'",
-            "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"Result\",\"ctrl_cd_display_form\": null}}'"
+            "'{\"payload\":{\"observation_uid\":123, \"obs_domain_cd_st_1\": \"C_Result\",\"ctrl_cd_display_form\": \"LabComment\"}}'"
     })
     void testPostProcessObservationNoReport(String payload) {
         String topic = "dummy_observation";
@@ -408,6 +408,7 @@ void testProduceDatamartTopicWithNoPatient() {
 
     @ParameterizedTest
     @CsvSource({
+            "'{\"payload\":{\"public_health_case_uid\":123,\"rdb_table_name_list\":null}}'",
             "'{\"payload\":{\"patient_uid\":123}}'",
             "'{\"payload\":{invalid}'"
     })