CNDE-1849: Refactor Investigation Service to use Kafka updates for Pa…

…ge Case Answers (#66)
CDCgov · Oct 25, 2024 · 197cb5c · 197cb5c
1 parent aa8246c
commit 197cb5c
Show file tree

Hide file tree

Showing 21 changed files with 819 additions and 341 deletions.
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/...a/gov/cdc/etldatapipeline/investigation/repository/model/dto/InvestigationCaseAnswer.java b/...a/gov/cdc/etldatapipeline/investigation/repository/model/dto/InvestigationCaseAnswer.java
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/...java/gov/cdc/etldatapipeline/investigation/repository/model/reporting/PageCaseAnswer.java b/...java/gov/cdc/etldatapipeline/investigation/repository/model/reporting/PageCaseAnswer.java
@@ -0,0 +1,37 @@
+package gov.cdc.etldatapipeline.investigation.repository.model.reporting;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+
+@Data
+@NoArgsConstructor
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class PageCaseAnswer {
+    private @NonNull Long actUid;
+    private @NonNull Long nbsCaseAnswerUid;
+    private @NonNull Long nbsUiMetadataUid;
+    private @NonNull Long nbsRdbMetadataUid;
+    private @NonNull Long nbsQuestionUid;
+
+    private String rdbTableNm;
+    private String rdbColumnNm;
+    private String answerTxt;
+    private String answerGroupSeqNbr;
+    private String investigationFormCd;
+    private String unitValue;
+    private String questionIdentifier;
+    private String dataLocation;
+    private String questionLabel;
+    private String otherValueIndCd;
+    private String unitTypeCd;
+    private String mask;
+    private String dataType;
+    private String questionGroupSeqNbr;
+    private Long codeSetGroupId;
+    private String blockNm;
+    private String lastChgTime;
+    private String recordStatusCd;
+}
diff --git a/...a/gov/cdc/etldatapipeline/investigation/repository/model/reporting/PageCaseAnswerKey.java b/...a/gov/cdc/etldatapipeline/investigation/repository/model/reporting/PageCaseAnswerKey.java
@@ -0,0 +1,17 @@
+package gov.cdc.etldatapipeline.investigation.repository.model.reporting;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+
+
+@Data
+@NoArgsConstructor
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class PageCaseAnswerKey {
+    @NonNull
+    private Long actUid;
+    private Long nbsCaseAnswerUid;
+}