Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CNDIT-1777 Fix ObservationNumeric data type for Kafka schema #49

Merged
merged 1 commit into from
Oct 2, 2024
Merged

CNDIT-1777 Fix ObservationNumeric data type for Kafka schema #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...va/gov/cdc/etldatapipeline/observation/repository/model/reporting/ObservationNumeric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data;

import java.math.BigDecimal;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
Expand All @@ -18,9 +16,9 @@ public class ObservationNumeric {
@JsonProperty("ovn_comparator_cd_1")
private String ovnComparatorCd1;
@JsonProperty("ovn_numeric_value_1")
private BigDecimal ovnNumericValue1;
private String ovnNumericValue1;
sveselev marked this conversation as resolved.
Show resolved Hide resolved
@JsonProperty("ovn_numeric_value_2")
private BigDecimal ovnNumericValue2;
private String ovnNumericValue2;
private String ovnNumericUnitCd;
private String ovnSeparatorCd;
}
5 changes: 2 additions & 3 deletions ...ervice/src/test/java/gov/cdc/etldatapipeline/observation/ObservationDataProcessTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.springframework.kafka.core.KafkaTemplate;
import org.testcontainers.shaded.org.checkerframework.checker.nullness.qual.NonNull;

import java.math.BigDecimal;
import java.util.List;
import java.util.concurrent.CompletableFuture;

Expand Down Expand Up @@ -258,8 +257,8 @@ void testOrganizationNumericTransformation() throws JsonProcessingException {
numeric.setOvnComparatorCd1("100");
numeric.setOvnLowRange("10-100");
numeric.setOvnHighRange("100-1000");
numeric.setOvnNumericValue1(new BigDecimal("1"));
numeric.setOvnNumericValue2(new BigDecimal("1"));
numeric.setOvnNumericValue1("1.0");
numeric.setOvnNumericValue2("1.0");
numeric.setOvnNumericUnitCd("mL");
numeric.setOvnSeparatorCd(":");

Expand Down