Merge branch 'refs/heads/main' into CNDE-1403-post-process-lab100-lab101

CDCgov · Oct 30, 2024 · 81bbe8a · 81bbe8a
2 parents 900d19a + 0ea1b11
commit 81bbe8a
Show file tree

Hide file tree

Showing 30 changed files with 2,154 additions and 393 deletions.
diff --git a/.github/workflows/Build-and-deploy-reporting-services.yaml b/.github/workflows/Build-and-deploy-reporting-services.yaml
@@ -7,6 +7,7 @@ on:
       - rel-**
 #       Uncomment the following line only to test the build deploy from private branches.
 #      - CNDIT-*
+#      - CNDE-*
     paths-ignore:
       - "docker-compose.yml"
       - "**.md"

diff --git a/...n-util/src/main/java/gov/cdc/etldatapipeline/commonutil/json/CustomJsonGeneratorImpl.java b/...n-util/src/main/java/gov/cdc/etldatapipeline/commonutil/json/CustomJsonGeneratorImpl.java
@@ -9,6 +9,8 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
 
 @Slf4j
 public class CustomJsonGeneratorImpl {
@@ -39,11 +41,11 @@ private static ArrayNode generateFieldsArray(Object model) {
 
                 String fieldName = getFieldName(field);
 
+                List<String> pKeys = Arrays.asList("public_health_case_uid", "act_uid", "observation_uid",
+                        "organization_uid", "provider_uid", "patient_uid", "notification_uid");
+
                 fieldNode.put("type", getType(field.getType().getSimpleName().toLowerCase()));
-                fieldNode.put("optional", (!fieldName.equals("public_health_case_uid")
-                        && !fieldName.equals("observation_uid") && !fieldName.equals("organization_uid")
-                        && !fieldName.equals("patient_uid") && !fieldName.equals("provider_uid")
-                        && !fieldName.equals("notification_uid")));
+                fieldNode.put("optional", (!pKeys.contains(fieldName)));
                 fieldNode.put("field", fieldName);
                 fieldsArray.add(fieldNode);
             }

diff --git a/...vice/src/main/java/gov/cdc/etldatapipeline/investigation/config/OdseDataSourceConfig.java b/...vice/src/main/java/gov/cdc/etldatapipeline/investigation/config/OdseDataSourceConfig.java
diff --git a/...rvice/src/main/java/gov/cdc/etldatapipeline/investigation/config/RdbDataSourceConfig.java b/...rvice/src/main/java/gov/cdc/etldatapipeline/investigation/config/RdbDataSourceConfig.java
diff --git a/...ository/odse/InvestigationRepository.java → ...n/repository/InvestigationRepository.java b/...ository/odse/InvestigationRepository.java → ...n/repository/InvestigationRepository.java
@@ -1,4 +1,4 @@
-package gov.cdc.etldatapipeline.investigation.repository.odse;
+package gov.cdc.etldatapipeline.investigation.repository;
 
 import gov.cdc.etldatapipeline.investigation.repository.model.dto.Investigation;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/...pository/odse/NotificationRepository.java → ...on/repository/NotificationRepository.java b/...pository/odse/NotificationRepository.java → ...on/repository/NotificationRepository.java
@@ -1,4 +1,4 @@
-package gov.cdc.etldatapipeline.investigation.repository.odse;
+package gov.cdc.etldatapipeline.investigation.repository;
 
 import gov.cdc.etldatapipeline.investigation.repository.model.dto.NotificationUpdate;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/...c/main/java/gov/cdc/etldatapipeline/investigation/repository/model/dto/Investigation.java b/...c/main/java/gov/cdc/etldatapipeline/investigation/repository/model/dto/Investigation.java
@@ -274,18 +274,6 @@ public class Investigation {
     @Column(name = "program_area_description")
     private String programAreaDescription;
 
-    @Column(name = "notification_local_id")
-    private String notificationLocalId;
-
-    @Column(name = "notification_add_time")
-    private String notificationAddTime;
-
-    @Column(name = "notification_record_status_cd")
-    private String notificationRecordStatusCd;
-
-    @Column(name = "notification_last_chg_time")
-    private String notificationLastChgTime;
-
     @Column(name = "case_management_uid")
     private Long caseManagementUid;
 

diff --git a/...a/gov/cdc/etldatapipeline/investigation/repository/model/dto/InvestigationCaseAnswer.java b/...a/gov/cdc/etldatapipeline/investigation/repository/model/dto/InvestigationCaseAnswer.java
diff --git a/.../gov/cdc/etldatapipeline/investigation/repository/model/dto/InvestigationTransformed.java b/.../gov/cdc/etldatapipeline/investigation/repository/model/dto/InvestigationTransformed.java
@@ -4,6 +4,7 @@
 
 @Data
 public class InvestigationTransformed {
+    private Long publicHealthCaseUid;
     private Long investigatorId;
     private Long physicianId;
     private Long patientId;
@@ -13,4 +14,8 @@ public class InvestigationTransformed {
     private String legacyCaseId;
     private Long phcInvFormId;
     private String rdbTableNameList;
+
+    public InvestigationTransformed(Long publicHealthCaseUid) {
+        this.publicHealthCaseUid = publicHealthCaseUid;
+    }
 }
diff --git a/.../dto/InvestigationConfirmationMethod.java → ...ting/InvestigationConfirmationMethod.java b/.../dto/InvestigationConfirmationMethod.java → ...ting/InvestigationConfirmationMethod.java
@@ -1,4 +1,4 @@
-package gov.cdc.etldatapipeline.investigation.repository.model.dto;
+package gov.cdc.etldatapipeline.investigation.repository.model.reporting;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

diff --git a/...o/InvestigationConfirmationMethodKey.java → ...g/InvestigationConfirmationMethodKey.java b/...o/InvestigationConfirmationMethodKey.java → ...g/InvestigationConfirmationMethodKey.java
@@ -1,4 +1,4 @@
-package gov.cdc.etldatapipeline.investigation.repository.model.dto;
+package gov.cdc.etldatapipeline.investigation.repository.model.reporting;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
@@ -9,8 +9,6 @@
 @NoArgsConstructor
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class InvestigationConfirmationMethodKey {
-
     private Long publicHealthCaseUid;
     private String confirmationMethodCd;
-
 }
diff --git a/...eline/investigation/repository/model/reporting/InvestigationConfirmationMethodUidKey.java b/...eline/investigation/repository/model/reporting/InvestigationConfirmationMethodUidKey.java
@@ -0,0 +1,13 @@
+package gov.cdc.etldatapipeline.investigation.repository.model.reporting;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class InvestigationConfirmationMethodUidKey {
+    private Long publicHealthCaseUid;
+}
diff --git a/...y/model/dto/InvestigationObservation.java → ...l/reporting/InvestigationObservation.java b/...y/model/dto/InvestigationObservation.java → ...l/reporting/InvestigationObservation.java
@@ -1,4 +1,4 @@
-package gov.cdc.etldatapipeline.investigation.repository.model.dto;
+package gov.cdc.etldatapipeline.investigation.repository.model.reporting;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

diff --git a/.../cdc/etldatapipeline/investigation/repository/model/reporting/InvestigationReporting.java b/.../cdc/etldatapipeline/investigation/repository/model/reporting/InvestigationReporting.java
@@ -88,10 +88,6 @@ public class InvestigationReporting {
     private String coinfectionId;
     private String contactInvTxt;
     private String programAreaDescription;
-    private String notificationLocalId;
-    private String notificationAddTime;
-    private String notificationRecordStatusCd;
-    private String notificationLastChgTime;
     private Long caseManagementUid;
     private Long nacPageCaseUid;
     private String nacLastChgTime;