Update investigation model (#3)

CDCgov · Jul 16, 2024 · a9c7a17 · a9c7a17
1 parent 5689d1f
commit a9c7a17
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
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
@@ -286,6 +286,27 @@ public class Investigation {
     @Column(name = "notification_last_chg_time")
     private String notificationLastChgTime;
 
+    @Column(name = "case_management_uid")
+    private Long caseManagementUid;
+
+    @Column(name = "nac_page_case_uid")
+    private Long nacPageCaseUid;
+
+    @Column(name = "nac_last_chg_time")
+    private String nacLastChgTime;
+
+    @Column(name = "nac_add_time")
+    private String nacAddTime;
+
+    @Column(name = "person_as_reporter_uid")
+    private Long personAsReporterUid;
+
+    @Column(name = "hospital_uid")
+    private Long hospitalUid;
+
+    @Column(name = "ordering_facility_uid")
+    private Long orderingFacilityUid;
+
     @Column(name = "act_ids")
     private String actIds;
 

diff --git a/.../cdc/etldatapipeline/investigation/repository/model/reporting/InvestigationReporting.java b/.../cdc/etldatapipeline/investigation/repository/model/reporting/InvestigationReporting.java
@@ -87,6 +87,13 @@ public class InvestigationReporting {
     private String notificationAddTime;
     private String notificationRecordStatusCd;
     private String notificationLastChgTime;
+    private Long caseManagementUid;
+    private Long nacPageCaseUid;
+    private String nacLastChgTime;
+    private String nacAddTime;
+    private Long personAsReporterUid;
+    private Long hospitalUid;
+    private Long orderingFacilityUid;
     private Long investigatorId;
     private Long physicianId;
     private Long patientId;

diff --git a/...e/src/test/java/gov/cdc/etldatapipeline/investigation/InvestigationModelMappingTests.java b/...e/src/test/java/gov/cdc/etldatapipeline/investigation/InvestigationModelMappingTests.java
@@ -111,6 +111,14 @@ void testInvestigationReporting() {
         assertNull(reporting.getNotificationAddTime());
         assertNull(reporting.getNotificationRecordStatusCd());
         assertNull(reporting.getNotificationLastChgTime());
+
+        assertEquals(investigation.getCaseManagementUid(), reporting.getCaseManagementUid());
+        assertEquals(investigation.getNacPageCaseUid(), reporting.getNacPageCaseUid());
+        assertEquals(investigation.getNacLastChgTime(), reporting.getNacLastChgTime());
+        assertEquals(investigation.getNacAddTime(), reporting.getNacAddTime());
+        assertEquals(investigation.getPersonAsReporterUid(), reporting.getPersonAsReporterUid());
+        assertEquals(investigation.getHospitalUid(), reporting.getHospitalUid());
+        assertEquals(investigation.getOrderingFacilityUid(), reporting.getOrderingFacilityUid());
     }
 
     private Investigation getInvestigation() {