Skip to content

FLAGSAPI-806 convert any date value 1 to a default date #647

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

Merged
stuartmcneill1-nhs merged 4 commits into from
Mar 18, 2025
Merged

FLAGSAPI-806 convert any date value 1 to a default date #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
451074f
modified date validator to convert any date value=1 to a default date…
stuartmcneill1-nhs Mar 10, 2025
0ff28e5
changes following review from steve and alex
stuartmcneill1-nhs Mar 17, 2025
5ea7288
Merge branch 'master' into FLAGSAPI-806-convert-date-value-1-to-defau…
stuartmcneill1-nhs Mar 18, 2025
843b23f
FLAGSAPI-806 removed trailing spaces
stuartmcneill1-nhs Mar 18, 2025
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
10 changes: 10 additions & 0 deletions docker/service/src/main/java/uk/nhs/adaptors/scr/mappings/from/hl7/XmlToFhirMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package uk.nhs.adaptors.scr.mappings.from.hl7;

import lombok.SneakyThrows;
import org.slf4j.LoggerFactory;
import org.hl7.fhir.r4.model.BaseDateTimeType;
import org.hl7.fhir.r4.model.DateTimeType;
import org.hl7.fhir.r4.model.InstantType;
Expand Down Expand Up @@ -106,6 +107,15 @@ static <T extends BaseDateTimeType> T parseDate(String date, Class<T> clazz) {
baseDateTimeType.setTimeZone(TimeZone.getTimeZone(TIMEZONE));
baseDateTimeType.setYear(parseInt(date) + 1);
baseDateTimeType.setMillis(yearPrecision);
} else if (date.equals("1")) {
date = "19700101";
LocalDate parsed = LocalDate.parse(date, DateTimeFormatter.ofPattern(DATE_PATTERN));
baseDateTimeType.setPrecision(DAY);
baseDateTimeType.setTimeZone(TimeZone.getTimeZone(TIMEZONE));
setDatePart(baseDateTimeType, parsed.getDayOfMonth(), parsed.getMonthValue(), parsed.getYear());
baseDateTimeType.setMillis(dayPrecision);
org.slf4j.Logger logger = LoggerFactory.getLogger(XmlToFhirMapper.class);
logger.error("Invalid date value:1 updated");
} else {
throw new ScrBaseException("Unsupported date format: " + date);
}
Expand Down
4 changes: 4 additions & 0 deletions docker/service/src/test/java/uk/nhs/adaptors/scr/mappings/from/hl7/XmlToFhirMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public void When_ParsingDate_Expect_CorrectDateFormat() {
date = parseDate("2023", InstantType.class);
assertThat(date.getValueAsString()).isEqualTo("2023");

// FLAGSAPI-806
date = parseDate("1", InstantType.class);
assertThat(date.getValueAsString()).isEqualTo("1970-01-01");

assertThrows(ScrBaseException.class, () -> {
parseDate("-2023", InstantType.class);
});
Expand Down