CNDIT 1777: RTR Observation Persist Extension To Persist New Columns

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationCoded.java

@@ -0,0 +1,21 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class ObservationCoded {
+    private Long observationUid;
+    private String ovcCode;
+    private String ovcCodeSystemCd;
+    private String ovcCodeSystemDescTxt;
+    private String ovcDisplayName;
+    private String ovcAltCd;
+    private String ovcAltCdDescTxt;
+    private String ovcAltCdSystemCd;
+    private String ovcAltCdSystemDescTxt;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationDate.java

@@ -0,0 +1,15 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class ObservationDate {
+    private Long observationUid;
+    private String ovdFromDate;
+    private String ovdToDate;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationEdx.java

@@ -0,0 +1,15 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class ObservationEdx {
+    private Long edxDocumentUid;
+    private Long edxActUid;
+    private String edxAddTime;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationEdxKey.java

@@ -0,0 +1,15 @@
+package gov.cdc.etldatapipeline.observation.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 ObservationEdxKey {
+    @NonNull
+    private Long edxDocumentUid;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/dto/ObservationKey.java → observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationKey.java

@@ -1,4 +1,4 @@
-package gov.cdc.etldatapipeline.observation.repository.model.dto;
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationMaterial.java

@@ -0,0 +1,27 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class ObservationMaterial {
+    private Long actUid;
+    private String typeCd;
+    private Long materialId;
+    private String subjectClassCd;
+    private String recordStatus;
+    private String typeDescTxt;
+    private String lastChgTime;
+    private String materialCd;
+    private String materialNm;
+    private String materialDetails;
+    private String materialCollectionVol;
+    private String materialCollectionVolUnit;
+    private String materialDesc;
+    private String riskCd;
+    private String riskDescTxt;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationMaterialKey.java

@@ -0,0 +1,17 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+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 ObservationMaterialKey {
+    @NonNull
+    @JsonProperty("material_id")
+    private Long materialId;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationNumeric.java

@@ -0,0 +1,26 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class ObservationNumeric {
+    private Long observationUid;
+    private String ovnHighRange;
+    private String ovnLowRange;
+    @JsonProperty("ovn_comparator_cd_1")
+    private String ovnComparatorCd1;
+    @JsonProperty("ovn_numeric_value_1")
+    private BigDecimal ovnNumericValue1;
+    @JsonProperty("ovn_numeric_value_2")
+    private BigDecimal ovnNumericValue2;
+    private String ovnNumericUnitCd;
+    private String ovnSeparatorCd;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationReason.java

@@ -0,0 +1,15 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class ObservationReason {
+    private Long observationUid;
+    private String reasonCd;
+    private String reasonDescTxt;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationTxt.java

@@ -0,0 +1,16 @@
+package gov.cdc.etldatapipeline.observation.repository.model.reporting;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class ObservationTxt {
+    private Long observationUid;
+    private Integer ovtSeq;
+    private String ovtTxtTypeCd;
+    private String ovtValueTxt;
+}

observation-service/src/main/java/gov/cdc/etldatapipeline/observation/service/ObservationService.java

@@ -5,7 +5,7 @@
 import gov.cdc.etldatapipeline.commonutil.json.CustomJsonGeneratorImpl;
 import gov.cdc.etldatapipeline.observation.repository.IObservationRepository;
 import gov.cdc.etldatapipeline.observation.repository.model.dto.Observation;
-import gov.cdc.etldatapipeline.observation.repository.model.dto.ObservationKey;
+import gov.cdc.etldatapipeline.observation.repository.model.reporting.ObservationKey;
 import gov.cdc.etldatapipeline.observation.repository.model.dto.ObservationTransformed;
 import gov.cdc.etldatapipeline.observation.repository.model.reporting.ObservationReporting;
 import gov.cdc.etldatapipeline.observation.util.ProcessObservationDataUtil;