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

Add GMT+12 MOJURO TimeZone to ReportStream #16864

Merged
merged 5 commits into from
Dec 24, 2024
Merged

Add GMT+12 MOJURO TimeZone to ReportStream #16864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a308fd9
Add GMT+12 MOJURO TimeZone to ReportStream
oslynn Dec 20, 2024
b709cf5
Added the enrichment schema for MAJURO timezone
oslynn Dec 23, 2024
61e0237
Fixed Test name
oslynn Dec 23, 2024
02c5b89
Merge branch 'main' into oo/oslynn/16825/Add_GMT+12_MOJURO_TimeZone_T…
oslynn Dec 23, 2024
e6e2ef9
Merge branch 'main' into oo/oslynn/16825/Add_GMT+12_MOJURO_TimeZone_T…
oslynn Dec 24, 2024
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
14 changes: 4 additions & 10 deletions frontend-react/src/utils/TemporarySettingsAPITypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ enum USTimeZone {
EAST_INDIANA = "EAST_INDIANA",
HAWAII = "HAWAII",
INDIANA_STARKE = "INDIANA_STARKE",
MAJURO = "MAJURO",
MICHIGAN = "MICHIGAN",
MOUNTAIN = "MOUNTAIN",
PACIFIC = "PACIFIC",
Expand Down Expand Up @@ -139,10 +140,7 @@ class SampleFilterObject extends SampleObject {

getAllEnums(): Map<string, string[]> {
return new Map<string, string[]>([
[
"Available Filters",
Array.from(Object.values(ReportStreamFilterDefinition)),
],
["Available Filters", Array.from(Object.values(ReportStreamFilterDefinition))],
]);
}

Expand Down Expand Up @@ -221,9 +219,7 @@ class SampleTranslationObj extends SampleObject {
schemaName = "schema";

getAllEnums(): Map<string, string[]> {
return new Map<string, string[]>([
["format", Array.from(Object.values(Format))],
]);
return new Map<string, string[]>([["format", Array.from(Object.values(Format))]]);
}

description(): string {
Expand Down Expand Up @@ -265,9 +261,7 @@ class SampleTransportObject extends SampleObject {
};

getAllEnums(): Map<string, string[]> {
return new Map<string, string[]>([
["GAEN.uuidFormat", Array.from(Object.values(GAENUUIDFormat))],
]);
return new Map<string, string[]>([["GAEN.uuidFormat", Array.from(Object.values(GAENUUIDFormat))]]);
}

description(): string {
Expand Down
3 changes: 3 additions & 0 deletions prime-router/src/main/kotlin/USTimeZone.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ enum class USTimeZone(val zoneId: String) {

// not technically a US time zone but we need it
UTC("UTC"),

// Marshall Island timezone (UTC+12)
MAJURO("Pacific/Majuro"),
}
12 changes: 12 additions & 0 deletions prime-router/src/main/resources/metadata/fhir_transforms/common/datetime-to-local-majuro.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
elements:
- name: hl7-datetime-to-local
resource: "Bundle.descendants().where(url='https://reportstream.cdc.gov/fhir/StructureDefinition/hl7v2-date-time')"
bundleProperty: "%resource.value[x]"
value: ["%resource.value.changeTimezone('Pacific/Majuro')"]


- name: message-date-time-to-local
resource: 'Bundle.entry.resource.ofType(MessageHeader).extension("https://reportstream.cdc.gov/fhir/StructureDefinition/msh-message-header").extension("MSH.7")'
condition: '%resource.value.exists()'
bundleProperty: '%resource.value[x]'
value: ["%resource.value.changeTimezone('Pacific/Majuro')"]
8 changes: 8 additions & 0 deletions prime-router/src/test/kotlin/ReceiverTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package gov.cdc.prime.router
import assertk.assertThat
import assertk.assertions.isEqualTo
import assertk.assertions.isFalse
import assertk.assertions.isNotEqualTo
import assertk.assertions.isNull
import assertk.assertions.isTrue
import gov.cdc.prime.router.unittest.UnitTestUtils
Expand Down Expand Up @@ -273,4 +274,11 @@ internal class ReceiverTests {
val receiver = Receiver("elr", "IGNORE", Topic.COVID_19, CustomerStatus.INACTIVE, translatorConfig)
assertThat(receiver.transportType.type).isEqualTo("NULL")
}

@Test
fun `test MAJURO receiver timezone`() {
val shouldWork1 =
ZonedDateTime.of(2024, 12, 20, 0, 0, 0, 0, ZoneId.of(USTimeZone.MAJURO.zoneId)).toOffsetDateTime()
assertThat(shouldWork1).isNotEqualTo("2024-12-20T00:00+12:00")
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this test actually testing? Is testing that it works or that it doesn't work?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test to see, it is working.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be testing that the date gets converted to MAJURO than?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, are you correct. I will test the date get converted to MAJURO as well. Thanks.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the test the date get converted to MAJURO. Done.

}
13 changes: 13 additions & 0 deletions prime-router/src/test/kotlin/fhirengine/engine/CustomTranslationFunctionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,19 @@ class CustomTranslationFunctionsTest {
assertThat(tmp).isEqualTo("20150405212211+0900")
}

@org.junit.jupiter.api.Test
fun `test mojuroTimezone with convertDateTimeToHL7`() {
val timezoneParameters1: MutableList<MutableList<Base>> =
mutableListOf(mutableListOf(StringType("Pacific/Majuro")))
val adjustedDateTime =
CustomFHIRFunctions.changeTimezone(
mutableListOf(DateTimeType("2015-04-05T12:22:11Z")),
timezoneParameters1
)[0] as DateTimeType
val tmp1 = Hl7TranslationFunctions().convertDateTimeToHL7(adjustedDateTime)
assertThat(tmp1).isEqualTo("20150406002211+1200")
}

@org.junit.jupiter.api.Test
fun `test convertDateTimeToHL7 with CustomContext with receiver setting`() {
val receiver = mockkClass(Receiver::class, relaxed = true)
Expand Down
Loading