From c4bafbc91c2822ecbccb45220e42d7068dd8bb89 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:20:42 -0700 Subject: [PATCH 01/18] Updated oracle rln staging endpoint --- prime-router/settings/STLTs/Oracle/oracle-rln.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/settings/STLTs/Oracle/oracle-rln.yml b/prime-router/settings/STLTs/Oracle/oracle-rln.yml index 4d4608b8848..e752cd89b61 100644 --- a/prime-router/settings/STLTs/Oracle/oracle-rln.yml +++ b/prime-router/settings/STLTs/Oracle/oracle-rln.yml @@ -51,7 +51,7 @@ description: "" transport: type: "REST" - reportUrl: "https://spaces.erxhubdevcert.cerner.com/etor" + reportUrl: "https://rln.preprodcernerspaces.com/etor" authType: "apiKey" authTokenUrl: "" tlsKeystore: null From 634f88300d2228c217f4fa69177b35b76e13f5e3 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:21:48 -0700 Subject: [PATCH 02/18] Removed transport from flexion.simulated-lab and flexion.simulated-hospital receiver settings --- prime-router/settings/STLTs/Flexion/flexion.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index ffaf0ebaf79..934d106ffda 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -147,12 +147,6 @@ schemaName: "classpath:/metadata/hl7_mapping/ORU_R01/ORU_R01-base.yml" useTestProcessingMode: false useBatchHeaders: false - transport: - type: "SFTP" - host: "172.17.6.20" # use "sftp" if running locally - port: 22 - filePath: "./upload" - credentialName: null # use "DEFAULT-SFTP" if running locally # Simulated State Public Health Lab Receiver: converts OML_O21 from FHIR to HL7 and routes the message to the SFTP folder - name: "simulated-lab" organizationName: "flexion" @@ -173,12 +167,6 @@ schemaName: "classpath:/metadata/hl7_mapping/receivers/Flexion/etor-oml-receiver-transform.yml" useTestProcessingMode: false useBatchHeaders: false - transport: - type: "SFTP" - host: "172.17.6.20" # use "sftp" if running locally - port: 22 - filePath: "./upload" - credentialName: null # use "DEFAULT-SFTP" if running locally - name: "automated-staging-test-receiver-orders" organizationName: "flexion" topic: "etor-ti" From ba840dfc75d00c77882e80364e8d45aeef3e14a9 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:40:45 -0700 Subject: [PATCH 03/18] Updated ochsner receiver OID to be in MSH5.2 instead of MSH-6.2 --- prime-router/settings/STLTs/LA/la-ochsner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/settings/STLTs/LA/la-ochsner.yml b/prime-router/settings/STLTs/LA/la-ochsner.yml index 0e4f8c2efd6..e890a254220 100644 --- a/prime-router/settings/STLTs/LA/la-ochsner.yml +++ b/prime-router/settings/STLTs/LA/la-ochsner.yml @@ -36,7 +36,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = '1.2.840.114350.1.13.286.2.7.2.695071'" # receiver routing filter (MSH-6.2) + - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '1.2.840.114350.1.13.286.2.7.2.695071'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" timing: From 505e74224038107e5a75e67c4f7d54051023c35e Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:35:23 -0700 Subject: [PATCH 04/18] Updated ETOR jurisdictional filters to use MSH-11 for test file identification --- prime-router/settings/STLTs/AL/al-phl.yml | 1 + prime-router/settings/STLTs/CA/ucsd.yml | 2 +- prime-router/settings/STLTs/Flexion/flexion.yml | 7 ++++--- prime-router/settings/STLTs/LA/la-ochsner.yml | 1 + prime-router/settings/STLTs/LA/la-phl.yml | 1 + prime-router/settings/STLTs/Oracle/oracle-rln.yml | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/prime-router/settings/STLTs/AL/al-phl.yml b/prime-router/settings/STLTs/AL/al-phl.yml index 500a2f1ab89..fa9d794c59f 100644 --- a/prime-router/settings/STLTs/AL/al-phl.yml +++ b/prime-router/settings/STLTs/AL/al-phl.yml @@ -32,6 +32,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = '2.16.840.1.114222.4.3.26.1.1'" # receiver routing filter (MSH-6.2) qualityFilter: - "true" diff --git a/prime-router/settings/STLTs/CA/ucsd.yml b/prime-router/settings/STLTs/CA/ucsd.yml index 2d5afa6e39d..3a7457e5575 100644 --- a/prime-router/settings/STLTs/CA/ucsd.yml +++ b/prime-router/settings/STLTs/CA/ucsd.yml @@ -27,9 +27,9 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).sender.resolve().identifier.where(value = 'CDPH').exists()" # sender routing filter (MSH-4.1) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.1').value in ('R797' | 'R508')" # receiver routing filter (MSH-6.1) - - "Bundle.identifier.value.contains('AUTOMATEDTEST-').not()" # exclude flexion automated test messages (MSH-10) qualityFilter: - "true" timing: diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index 934d106ffda..7150b25bdee 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -135,6 +135,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # test message filter (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = 'simulated-hospital-id'" # receiver routing filter (MSH-6.2) qualityFilter: - "true" @@ -155,6 +156,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # test message filter (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = 'simulated-lab-id'" # receiver routing filter (MSH-6.2) qualityFilter: - "true" @@ -174,7 +176,7 @@ jurisdictionalFilter: - "(Bundle.entry.resource.ofType(MessageHeader).event.code = 'O01') or (Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21')" # ORM_O01 or OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = 'automated-staging-test-receiver-id'" # receiver routing filter (MSH-6.2) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test message filter (MSH-11) qualityFilter: - "true" timing: @@ -197,8 +199,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "(Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = 'automated-staging-test-receiver-id') - or (Bundle.identifier.value.contains('AUTOMATEDTEST-'))" # receiver routing filter (MSH-6.2 or MSH-10) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test message filter (MSH-11) qualityFilter: - "true" timing: diff --git a/prime-router/settings/STLTs/LA/la-ochsner.yml b/prime-router/settings/STLTs/LA/la-ochsner.yml index e890a254220..88e8ef0e2fe 100644 --- a/prime-router/settings/STLTs/LA/la-ochsner.yml +++ b/prime-router/settings/STLTs/LA/la-ochsner.yml @@ -36,6 +36,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '1.2.840.114350.1.13.286.2.7.2.695071'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" diff --git a/prime-router/settings/STLTs/LA/la-phl.yml b/prime-router/settings/STLTs/LA/la-phl.yml index 006e500f903..fad28b10c61 100644 --- a/prime-router/settings/STLTs/LA/la-phl.yml +++ b/prime-router/settings/STLTs/LA/la-phl.yml @@ -32,6 +32,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '2.16.840.1.114222.4.3.26.3.2'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" diff --git a/prime-router/settings/STLTs/Oracle/oracle-rln.yml b/prime-router/settings/STLTs/Oracle/oracle-rln.yml index e752cd89b61..f51abb2590b 100644 --- a/prime-router/settings/STLTs/Oracle/oracle-rln.yml +++ b/prime-router/settings/STLTs/Oracle/oracle-rln.yml @@ -39,6 +39,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value in ('2.16.840.1.113883.3.1898' | '2.16.840.1.113883.3.1899')" # receiver routing filter (MSH-6.2) qualityFilter: - "true" From 263535a0af84e34a8c687b262f73562b82c6cdeb Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:10:17 -0700 Subject: [PATCH 05/18] Updated MSH-11 value filter to send test messages to partners --- prime-router/settings/STLTs/AL/al-phl.yml | 2 +- prime-router/settings/STLTs/CA/ucsd.yml | 2 +- prime-router/settings/STLTs/LA/la-ochsner.yml | 2 +- prime-router/settings/STLTs/LA/la-phl.yml | 2 +- prime-router/settings/STLTs/Oracle/oracle-rln.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/prime-router/settings/STLTs/AL/al-phl.yml b/prime-router/settings/STLTs/AL/al-phl.yml index fa9d794c59f..a177fc23360 100644 --- a/prime-router/settings/STLTs/AL/al-phl.yml +++ b/prime-router/settings/STLTs/AL/al-phl.yml @@ -32,7 +32,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = '2.16.840.1.114222.4.3.26.1.1'" # receiver routing filter (MSH-6.2) qualityFilter: - "true" diff --git a/prime-router/settings/STLTs/CA/ucsd.yml b/prime-router/settings/STLTs/CA/ucsd.yml index 3a7457e5575..81156658ab4 100644 --- a/prime-router/settings/STLTs/CA/ucsd.yml +++ b/prime-router/settings/STLTs/CA/ucsd.yml @@ -27,7 +27,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).sender.resolve().identifier.where(value = 'CDPH').exists()" # sender routing filter (MSH-4.1) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.1').value in ('R797' | 'R508')" # receiver routing filter (MSH-6.1) qualityFilter: diff --git a/prime-router/settings/STLTs/LA/la-ochsner.yml b/prime-router/settings/STLTs/LA/la-ochsner.yml index 88e8ef0e2fe..a74c006ba8e 100644 --- a/prime-router/settings/STLTs/LA/la-ochsner.yml +++ b/prime-router/settings/STLTs/LA/la-ochsner.yml @@ -36,7 +36,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '1.2.840.114350.1.13.286.2.7.2.695071'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" diff --git a/prime-router/settings/STLTs/LA/la-phl.yml b/prime-router/settings/STLTs/LA/la-phl.yml index fad28b10c61..d8d2cf83577 100644 --- a/prime-router/settings/STLTs/LA/la-phl.yml +++ b/prime-router/settings/STLTs/LA/la-phl.yml @@ -32,7 +32,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '2.16.840.1.114222.4.3.26.3.2'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" diff --git a/prime-router/settings/STLTs/Oracle/oracle-rln.yml b/prime-router/settings/STLTs/Oracle/oracle-rln.yml index f51abb2590b..d2ff1707ea4 100644 --- a/prime-router/settings/STLTs/Oracle/oracle-rln.yml +++ b/prime-router/settings/STLTs/Oracle/oracle-rln.yml @@ -39,7 +39,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "(Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('D' | 'N')).not()" # exclude internal etor test messages (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value in ('2.16.840.1.113883.3.1898' | '2.16.840.1.113883.3.1899')" # receiver routing filter (MSH-6.2) qualityFilter: - "true" From e4188f634f16ca1880d710104583d497a77d6fa0 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:13:48 -0700 Subject: [PATCH 06/18] Renamed automated-staging-test-sender => simulated-sender --- prime-router/settings/STLTs/Flexion/flexion.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index 7150b25bdee..ebdee93fa10 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -46,8 +46,8 @@ topic: "etor-ti" customerStatus: "active" format: "HL7" - # Sender used for automated tests in staging - - name: "automated-staging-test-sender" + # Sender used for local tests and automated tests in staging + - name: "simulated-sender" organizationName: "flexion" topic: "etor-ti" customerStatus: "active" From df74782e5665f2c5cc89dd836736ea0907cecead Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:15:23 -0700 Subject: [PATCH 07/18] Removed MSH-6.2 for simulated-hospital and simulated-lab --- prime-router/settings/STLTs/Flexion/flexion.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index ebdee93fa10..cc03de3261b 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -136,7 +136,6 @@ - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # test message filter (MSH-11) - - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = 'simulated-hospital-id'" # receiver routing filter (MSH-6.2) qualityFilter: - "true" timing: @@ -157,7 +156,6 @@ - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # test message filter (MSH-11) - - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = 'simulated-lab-id'" # receiver routing filter (MSH-6.2) qualityFilter: - "true" timing: From c30ff63d5b1d68af6ceaeaddf8f61b5818107e47 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:43:26 -0700 Subject: [PATCH 08/18] Removed AL senders and receivers: al-phl and oracle-rln --- prime-router/settings/STLTs/AL/al-phl.yml | 56 ----------------- .../settings/STLTs/Oracle/oracle-rln.yml | 61 ------------------- 2 files changed, 117 deletions(-) delete mode 100644 prime-router/settings/STLTs/AL/al-phl.yml delete mode 100644 prime-router/settings/STLTs/Oracle/oracle-rln.yml diff --git a/prime-router/settings/STLTs/AL/al-phl.yml b/prime-router/settings/STLTs/AL/al-phl.yml deleted file mode 100644 index a177fc23360..00000000000 --- a/prime-router/settings/STLTs/AL/al-phl.yml +++ /dev/null @@ -1,56 +0,0 @@ -# Alabama Public Health Lab settings for staging -# -# To load the settings to staging, run: -# ./prime login --env staging -# ./prime multiple-settings set --env staging --input ./settings/STLTs/AL/al-phl.yml -# -# To add the sender key in staging: -# ./prime organization addkey --env staging --public-key /path/to/public/key.pem --scope "al-phl.*.report" --orgName al-phl --kid al-phl.etor-nbs-results --doit -# -# To submit an order to al-phl, in staging: -# Note: replace the TOKEN with the auth JWT and the path to the FHIR message to send -# curl -H 'Authorization: Bearer TOKEN' -H 'Client: flexion.etor-service-sender' -H 'Content-Type: application/fhir+ndjson' --data-binary '@/path/to/oml.fhir' 'https://staging.prime.cdc.gov/api/waters' -# -# To submit a result from al-phl, in staging: -# curl -H 'Authorization: Bearer TOKEN' -H 'Client: al-phl.etor-nbs-results' -H 'Content-Type: application/hl7-v2' --data-binary '@/path/to/oru.hl7' 'https://staging.prime.cdc.gov/api/waters' ---- -- name: "al-phl" - description: "Alabama Public Health Lab" - jurisdiction: "STATE" - stateCode: "AL" - senders: - - name: "etor-nbs-results" - organizationName: "al-phl" - topic: "etor-ti" - customerStatus: "active" - format: "HL7" - receivers: - - name: "etor-nbs-orders" - organizationName: "al-phl" - topic: "etor-ti" - customerStatus: "active" - jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) - - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value = '2.16.840.1.114222.4.3.26.1.1'" # receiver routing filter (MSH-6.2) - qualityFilter: - - "true" - timing: - operation: "MERGE" - numberPerDay: 1440 - initialTime: "00:00" - timeZone: "EASTERN" - maxReportCount: 100 - translation: - type: "HL7" - schemaName: "classpath:/metadata/hl7_mapping/receivers/Flexion/etor-oml-receiver-transform.yml" - useBatchHeaders: false - receivingApplicationName: "AL-PHL" - receivingFacilityName: "AL" - transport: - host: "ph.state.al.us" - port: "22" - filePath: "./" - credentialName: null - type: "SFTP" \ No newline at end of file diff --git a/prime-router/settings/STLTs/Oracle/oracle-rln.yml b/prime-router/settings/STLTs/Oracle/oracle-rln.yml deleted file mode 100644 index d2ff1707ea4..00000000000 --- a/prime-router/settings/STLTs/Oracle/oracle-rln.yml +++ /dev/null @@ -1,61 +0,0 @@ -# Oracle RLN settings in staging -# -# Oracle RLN is defined at the Federal level and will route the message to its final destination -# Partners using Oracle RLN are: -# - Baptist in Alabama -# -# To load the settings in staging, run: -# ./prime login --env staging -# ./prime multiple-settings set --env staging --input ./settings/STLTs/Oracle/oracle-rln.yml -# -# To add the sender key in staging: -# ./prime organization addkey --env staging --public-key /path/to/public/key.pem --scope "oracle-rln.*.report" --orgName oracle-rln --kid oracle-rln.etor-nbs-orders --doit -# -# To submit a result to oracle-rln, in staging: -# Note: replace the TOKEN with the auth JWT and the path to the FHIR message to send -# curl -H 'Authorization: Bearer TOKEN' -H 'Client: flexion.etor-service-sender' -H 'Content-Type: application/fhir+ndjson' --data-binary '@/path/to/oru.fhir' 'https://staging.prime.cdc.gov/api/waters' -# -# To submit an order from la-ochsner, in staging: -# curl -H 'Authorization: Bearer TOKEN' -H 'Client: oracle-rln.etor-nbs-orders' -H 'Content-Type: application/hl7-v2' --data-binary '@/path/to/order.hl7' 'https://staging.prime.cdc.gov/api/waters' ---- -- name: "oracle-rln" - description: "Oracle RLN" - jurisdiction: "FEDERAL" - senders: - - name: "etor-nbs-orders" - organizationName: "oracle-rln" - topic: "etor-ti" - customerStatus: "active" - format: "HL7" - receivers: - - name: "etor-nbs-results" - organizationName: "oracle-rln" - topic: "etor-ti" - customerStatus: "active" - translation: - type: "HL7" - schemaName: "classpath:/metadata/hl7_mapping/ORU_R01/ORU_R01-base.yml" - useBatchHeaders: false - jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) - - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.2,HD.3').value in ('2.16.840.1.113883.3.1898' | '2.16.840.1.113883.3.1899')" # receiver routing filter (MSH-6.2) - qualityFilter: - - "true" - timing: - operation: "MERGE" - numberPerDay: 1440 - initialTime: "00:00" - timeZone: "EASTERN" - maxReportCount: 100 - description: "" - transport: - type: "REST" - reportUrl: "https://rln.preprodcernerspaces.com/etor" - authType: "apiKey" - authTokenUrl: "" - tlsKeystore: null - headers: - Content-Type: "text/plain" - shared-api-key: "From Vault" From 484eae549d4f5f9ddb52cad04a5d4d219112460d Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 22 Oct 2024 07:15:39 -0700 Subject: [PATCH 09/18] Updated MSH-11 comments --- prime-router/settings/STLTs/CA/ucsd.yml | 2 +- prime-router/settings/STLTs/Flexion/flexion.yml | 8 ++++---- prime-router/settings/STLTs/LA/la-ochsner.yml | 2 +- prime-router/settings/STLTs/LA/la-phl.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/prime-router/settings/STLTs/CA/ucsd.yml b/prime-router/settings/STLTs/CA/ucsd.yml index 81156658ab4..f1aed59f3a0 100644 --- a/prime-router/settings/STLTs/CA/ucsd.yml +++ b/prime-router/settings/STLTs/CA/ucsd.yml @@ -27,7 +27,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).sender.resolve().identifier.where(value = 'CDPH').exists()" # sender routing filter (MSH-4.1) - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.1').value in ('R797' | 'R508')" # receiver routing filter (MSH-6.1) qualityFilter: diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index cc03de3261b..cc59654ef0f 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -135,7 +135,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # test message filter (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # internal test processing id (MSH-11) qualityFilter: - "true" timing: @@ -155,7 +155,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # test message filter (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # internal test processing id (MSH-11) qualityFilter: - "true" timing: @@ -174,7 +174,7 @@ jurisdictionalFilter: - "(Bundle.entry.resource.ofType(MessageHeader).event.code = 'O01') or (Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21')" # ORM_O01 or OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test message filter (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test processing id (MSH-11) qualityFilter: - "true" timing: @@ -197,7 +197,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test message filter (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test processing id (MSH-11) qualityFilter: - "true" timing: diff --git a/prime-router/settings/STLTs/LA/la-ochsner.yml b/prime-router/settings/STLTs/LA/la-ochsner.yml index a74c006ba8e..680d751b0e0 100644 --- a/prime-router/settings/STLTs/LA/la-ochsner.yml +++ b/prime-router/settings/STLTs/LA/la-ochsner.yml @@ -36,7 +36,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '1.2.840.114350.1.13.286.2.7.2.695071'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" diff --git a/prime-router/settings/STLTs/LA/la-phl.yml b/prime-router/settings/STLTs/LA/la-phl.yml index d8d2cf83577..6d9df513d5d 100644 --- a/prime-router/settings/STLTs/LA/la-phl.yml +++ b/prime-router/settings/STLTs/LA/la-phl.yml @@ -32,7 +32,7 @@ jurisdictionalFilter: - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing id (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '2.16.840.1.114222.4.3.26.3.2'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" From 5c388cdc6738b7ce3f80069e9ebf93b660277eac Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:53:56 -0700 Subject: [PATCH 10/18] Added transform to ca-phl.etor-nbs-results to fix leading zeros issue --- prime-router/settings/STLTs/CA/ca-phl.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/prime-router/settings/STLTs/CA/ca-phl.yml b/prime-router/settings/STLTs/CA/ca-phl.yml index cb66c7b1199..3c4a75a9165 100644 --- a/prime-router/settings/STLTs/CA/ca-phl.yml +++ b/prime-router/settings/STLTs/CA/ca-phl.yml @@ -21,4 +21,5 @@ topic: "etor-ti" customerStatus: "active" format: "HL7" + schemaName: "classpath:/metadata/fhir_transforms/senders/Flexion/cdph-nbs-sender-transform.yml" receivers: [] From 45b49a427fed6ad8a8261909333e79b15302d929 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Fri, 25 Oct 2024 07:38:04 -0700 Subject: [PATCH 11/18] Cleanup --- prime-router/settings/STLTs/CA/ucsd.yml | 10 +++--- .../settings/STLTs/Flexion/flexion.yml | 32 +++++++++---------- prime-router/settings/STLTs/LA/la-ochsner.yml | 8 ++--- prime-router/settings/STLTs/LA/la-phl.yml | 8 ++--- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/prime-router/settings/STLTs/CA/ucsd.yml b/prime-router/settings/STLTs/CA/ucsd.yml index f1aed59f3a0..bacfc9b602b 100644 --- a/prime-router/settings/STLTs/CA/ucsd.yml +++ b/prime-router/settings/STLTs/CA/ucsd.yml @@ -25,11 +25,11 @@ receivingApplicationName: "EPIC-INNERCONNECT" receivingFacilityName: "CA" jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) - - "Bundle.entry.resource.ofType(MessageHeader).sender.resolve().identifier.where(value = 'CDPH').exists()" # sender routing filter (MSH-4.1) - - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.1').value in ('R797' | 'R508')" # receiver routing filter (MSH-6.1) + - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).sender.resolve().identifier.where(value = 'CDPH').exists()" # sender routing filter (MSH-4.1) + - "Bundle.entry.resource.ofType(MessageHeader).destination.receiver.resolve().identifier.where(extension.value = 'HD.1').value in ('R797' | 'R508')" # receiver routing filter (MSH-6.1) qualityFilter: - "true" timing: diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index cc59654ef0f..844e1a9dd30 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -59,8 +59,8 @@ topic: "etor-ti" customerStatus: "active" jurisdictionalFilter: - - "(Bundle.entry.resource.ofType(MessageHeader).event.code = 'O01') or (Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21')" # ORM_O01 or OML_O21 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.exists(system = 'http://localcodes.org/ETOR').not()" # required to avoid looping issue + - "(Bundle.entry.resource.ofType(MessageHeader).event.code = 'O01') or (Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21')" # ORM_O01 or OML_O21 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.exists(system = 'http://localcodes.org/ETOR').not()" # required to avoid looping issue qualityFilter: - "true" timing: @@ -97,8 +97,8 @@ topic: "etor-ti" customerStatus: "active" jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.exists(system = 'http://localcodes.org/ETOR').not()" # required to avoid looping issue + - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.exists(system = 'http://localcodes.org/ETOR').not()" # required to avoid looping issue qualityFilter: - "true" timing: @@ -133,9 +133,9 @@ topic: "etor-ti" customerStatus: "active" jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # internal test processing id (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # internal test processing id (MSH-11) qualityFilter: - "true" timing: @@ -153,9 +153,9 @@ topic: "etor-ti" customerStatus: "active" jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # internal test processing id (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'D'" # internal test processing id (MSH-11) qualityFilter: - "true" timing: @@ -172,9 +172,9 @@ topic: "etor-ti" customerStatus: "active" jurisdictionalFilter: - - "(Bundle.entry.resource.ofType(MessageHeader).event.code = 'O01') or (Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21')" # ORM_O01 or OML_O21 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test processing id (MSH-11) + - "(Bundle.entry.resource.ofType(MessageHeader).event.code = 'O01') or (Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21')" # ORM_O01 or OML_O21 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test processing id (MSH-11) qualityFilter: - "true" timing: @@ -195,9 +195,9 @@ topic: "etor-ti" customerStatus: "active" jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test processing id (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code = 'N'" # automated test processing id (MSH-11) qualityFilter: - "true" timing: diff --git a/prime-router/settings/STLTs/LA/la-ochsner.yml b/prime-router/settings/STLTs/LA/la-ochsner.yml index 680d751b0e0..f013303ed67 100644 --- a/prime-router/settings/STLTs/LA/la-ochsner.yml +++ b/prime-router/settings/STLTs/LA/la-ochsner.yml @@ -34,10 +34,10 @@ schemaName: "classpath:/metadata/hl7_mapping/ORU_R01/ORU_R01-base.yml" useBatchHeaders: false jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) - - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '1.2.840.114350.1.13.286.2.7.2.695071'" # receiver routing filter (MSH-5.2) + - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'R01'" # ORU_R01 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '1.2.840.114350.1.13.286.2.7.2.695071'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" timing: diff --git a/prime-router/settings/STLTs/LA/la-phl.yml b/prime-router/settings/STLTs/LA/la-phl.yml index 6d9df513d5d..17b8e1e5373 100644 --- a/prime-router/settings/STLTs/LA/la-phl.yml +++ b/prime-router/settings/STLTs/LA/la-phl.yml @@ -30,10 +30,10 @@ topic: "etor-ti" customerStatus: "active" jurisdictionalFilter: - - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI - - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) - - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '2.16.840.1.114222.4.3.26.3.2'" # receiver routing filter (MSH-5.2) + - "Bundle.entry.resource.ofType(MessageHeader).event.code = 'O21'" # OML_O21 + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://localcodes.org/ETOR').code = 'ETOR'" # required to avoid looping issue with TI + - "Bundle.entry.resource.ofType(MessageHeader).meta.tag.where(system = 'http://terminology.hl7.org/CodeSystem/v2-0103').code in ('T' | 'P')" # partner processing ids (MSH-11) + - "Bundle.entry.resource.ofType(MessageHeader).destination.extension.where(url = 'https://reportstream.cdc.gov/fhir/StructureDefinition/universal-id').value = '2.16.840.1.114222.4.3.26.3.2'" # receiver routing filter (MSH-5.2) qualityFilter: - "true" timing: From 008b44cbb0d932737cab108cf144dcbe73696bc1 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:21:39 -0700 Subject: [PATCH 12/18] Add documentation for new sender --- prime-router/settings/STLTs/Flexion/flexion.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index 844e1a9dd30..290def9a861 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -8,9 +8,10 @@ # ./prime multiple-settings set --env staging --input ./settings/STLTs/Flexion/flexion.yml # # To add the sender keys in staging: -# ./prime organization addkey --env staging --public-key /path/to/public/key.pem --scope "flexion.*.report" --orgName flexion --kid flexion.simulated-hospital --doit # ./prime organization addkey --env staging --public-key /path/to/public/key.pem --scope "flexion.*.report" --orgName flexion --kid flexion.etor-service-sender --doit +# ./prime organization addkey --env staging --public-key /path/to/public/key.pem --scope "flexion.*.report" --orgName flexion --kid flexion.simulated-hospital --doit # ./prime organization addkey --env staging --public-key /path/to/public/key.pem --scope "flexion.*.report" --orgName flexion --kid flexion.simulated-lab --doit +# ./prime organization addkey --env staging --public-key /path/to/public/key.pem --scope "flexion.*.report" --orgName flexion --kid flexion.simulated-sender --doit # # To submit an order or result to flexion.simulated-lab or flexion.simulated-hospital, in staging: # Note: replace the TOKEN with the auth JWT and the path to the FHIR message to send From cbf73b4d3018396f3004995865bd136f4b1e8149 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:05:35 -0700 Subject: [PATCH 13/18] Removed duplicated transform and add missing quotes --- prime-router/settings/STLTs/CA/ca-phl.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prime-router/settings/STLTs/CA/ca-phl.yml b/prime-router/settings/STLTs/CA/ca-phl.yml index 9dcac50c00b..30e3f2c28d6 100644 --- a/prime-router/settings/STLTs/CA/ca-phl.yml +++ b/prime-router/settings/STLTs/CA/ca-phl.yml @@ -20,7 +20,6 @@ organizationName: "ca-phl" topic: "etor-ti" customerStatus: "active" - schemaName: classpath:/metadata/fhir_transforms/senders/Flexion/cdph-nbs-sender-transform.yml - format: "HL7" schemaName: "classpath:/metadata/fhir_transforms/senders/Flexion/cdph-nbs-sender-transform.yml" + format: "HL7" receivers: [] From a25c0272eae811e6ebfb60cdf2b6ce757bb925ab Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:31:05 -0700 Subject: [PATCH 14/18] Added transform for simulated-sender --- prime-router/settings/STLTs/Flexion/flexion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index 290def9a861..421c284676e 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -53,6 +53,7 @@ topic: "etor-ti" customerStatus: "active" format: "HL7" + schemaName: "classpath:/metadata/fhir_transforms/senders/Flexion/cdph-nbs-sender-transform.yml" # this transform is needed for automated tests. we may want to create a new transform for this purpose receivers: # ETOR Service Receiver for orders - Routes ORM_O01 and OML_O21 FHIR orders to TI orders endpoint - name: "etor-service-receiver-orders" From d415513f1bebd8df6a578ab38b66f082aafd9655 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:56:17 -0500 Subject: [PATCH 15/18] Bump vite from 5.4.9 to 5.4.10 in /frontend-react in the vite group (#16330) Bumps the vite group in /frontend-react with 1 update: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 5.4.9 to 5.4.10 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.10/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.10/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch dependency-group: vite ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joseph Andersen <12385932+jpandersen87@users.noreply.github.com> --- frontend-react/package.json | 2 +- frontend-react/yarn.lock | 47 +++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/frontend-react/package.json b/frontend-react/package.json index a1a5e5ea824..2d2902b27bd 100644 --- a/frontend-react/package.json +++ b/frontend-react/package.json @@ -190,7 +190,7 @@ "tslib": "^2.8.0", "typescript": "^5.6.3", "undici": "^6.20.1", - "vite": "^5.4.9", + "vite": "^5.4.10", "vite-plugin-checker": "^0.8.0", "vite-plugin-svgr": "^4.2.0", "vitest": "^2.1.3" diff --git a/frontend-react/yarn.lock b/frontend-react/yarn.lock index 9c0111280a8..0209ac76909 100644 --- a/frontend-react/yarn.lock +++ b/frontend-react/yarn.lock @@ -10446,7 +10446,7 @@ __metadata: undici: ^6.20.1 use-deep-compare-effect: ^1.8.1 uuid: ^10.0.0 - vite: ^5.4.9 + vite: ^5.4.10 vite-plugin-checker: ^0.8.0 vite-plugin-svgr: ^4.2.0 vitest: ^2.1.3 @@ -12879,7 +12879,7 @@ __metadata: languageName: node linkType: hard -"vite@npm:^5.0.0, vite@npm:^5.4.9": +"vite@npm:^5.0.0": version: 5.4.9 resolution: "vite@npm:5.4.9" dependencies: @@ -12922,6 +12922,49 @@ __metadata: languageName: node linkType: hard +"vite@npm:^5.4.10": + version: 5.4.10 + resolution: "vite@npm:5.4.10" + dependencies: + esbuild: ^0.21.3 + fsevents: ~2.3.3 + postcss: ^8.4.43 + rollup: ^4.20.0 + peerDependencies: + "@types/node": ^18.0.0 || >=20.0.0 + less: "*" + lightningcss: ^1.21.0 + sass: "*" + sass-embedded: "*" + stylus: "*" + sugarss: "*" + terser: ^5.4.0 + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + "@types/node": + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + bin: + vite: bin/vite.js + checksum: 4db3b8ca3eddbc312d0a95f505d16656e74c6dfa68d3b5eb54b6d6b0f7be1df348d469c43dc69db27dadc06b802f029d654da48f392324efd665ef2c0ca9ba9e + languageName: node + linkType: hard + "vitest@npm:^2.1.3": version: 2.1.3 resolution: "vitest@npm:2.1.3" From b23754a5f3b90c1dcd5646e8e97e5ea300ef3d26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:07:01 +0000 Subject: [PATCH 16/18] Bump the typescript group in /frontend-react with 2 updates (#16328) Bumps the typescript group in /frontend-react with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 8.10.0 to 8.11.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.11.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.10.0 to 8.11.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.11.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: typescript - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: typescript ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joseph Andersen <12385932+jpandersen87@users.noreply.github.com> --- frontend-react/package.json | 4 +- frontend-react/yarn.lock | 122 +++++++++--------------------------- 2 files changed, 33 insertions(+), 93 deletions(-) diff --git a/frontend-react/package.json b/frontend-react/package.json index 2d2902b27bd..f01e69902a5 100644 --- a/frontend-react/package.json +++ b/frontend-react/package.json @@ -144,8 +144,8 @@ "@types/react-router-dom": "^5.3.3", "@types/react-scroll-sync": "^0.9.0", "@types/sanitize-html": "^2.13.0", - "@typescript-eslint/eslint-plugin": "^8.10.0", - "@typescript-eslint/parser": "^8.10.0", + "@typescript-eslint/eslint-plugin": "^8.11.0", + "@typescript-eslint/parser": "^8.11.0", "@vitejs/plugin-react": "^4.3.3", "@vitest/coverage-istanbul": "^2.1.3", "@vitest/ui": "^2.1.3", diff --git a/frontend-react/yarn.lock b/frontend-react/yarn.lock index 0209ac76909..95debdbdaf1 100644 --- a/frontend-react/yarn.lock +++ b/frontend-react/yarn.lock @@ -3032,15 +3032,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/eslint-plugin@npm:8.10.0" +"@typescript-eslint/eslint-plugin@npm:^8.11.0": + version: 8.11.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.11.0" dependencies: "@eslint-community/regexpp": ^4.10.0 - "@typescript-eslint/scope-manager": 8.10.0 - "@typescript-eslint/type-utils": 8.10.0 - "@typescript-eslint/utils": 8.10.0 - "@typescript-eslint/visitor-keys": 8.10.0 + "@typescript-eslint/scope-manager": 8.11.0 + "@typescript-eslint/type-utils": 8.11.0 + "@typescript-eslint/utils": 8.11.0 + "@typescript-eslint/visitor-keys": 8.11.0 graphemer: ^1.4.0 ignore: ^5.3.1 natural-compare: ^1.4.0 @@ -3051,25 +3051,25 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 2bb311eb9a882d530fc94f790f3e1f4745cd4e3523fd8d62ee0ed14d65c4230dc0c797c490c3421c1456fd71349e9bfa146c0b78f63860b75aae6e2a32a6c27c + checksum: 5cfc337a957b1c1a868f0f05ed278d4b631aab3aad037c1ca52f458973dee53c2f79db5cb3ac0278d3a4d2846560335212e347c4b978efd84811d6c910e93975 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/parser@npm:8.10.0" +"@typescript-eslint/parser@npm:^8.11.0": + version: 8.11.0 + resolution: "@typescript-eslint/parser@npm:8.11.0" dependencies: - "@typescript-eslint/scope-manager": 8.10.0 - "@typescript-eslint/types": 8.10.0 - "@typescript-eslint/typescript-estree": 8.10.0 - "@typescript-eslint/visitor-keys": 8.10.0 + "@typescript-eslint/scope-manager": 8.11.0 + "@typescript-eslint/types": 8.11.0 + "@typescript-eslint/typescript-estree": 8.11.0 + "@typescript-eslint/visitor-keys": 8.11.0 debug: ^4.3.4 peerDependencies: eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 2e38f34d9d044e251450116cc081a8f84ba13183e9c3e1dda919ddc00eebe634a37d4dfd785998f259b64cdd770e863ecc6c5cf7c8f422baf3d2bc2a0f9241cf + checksum: b7664933df72e150289889e16f10f042d427d8334786ce33fa2e0d2fd2fbf31a52c6e88f9b6b9a864f4e78c7b60cd52c034886eb1fa82893d69434bcd4f7e173 languageName: node linkType: hard @@ -3093,16 +3093,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/scope-manager@npm:8.10.0" - dependencies: - "@typescript-eslint/types": 8.10.0 - "@typescript-eslint/visitor-keys": 8.10.0 - checksum: 3df8df342e227b80514dcc9151774dea9a71bc649204f702d5b4a1b76a54b4814c5d5a970a6a9213462dd4df0d42342796fab35549e8663d4c0e5d84bd902bba - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/scope-manager@npm:8.11.0" @@ -3113,18 +3103,18 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/type-utils@npm:8.10.0" +"@typescript-eslint/type-utils@npm:8.11.0": + version: 8.11.0 + resolution: "@typescript-eslint/type-utils@npm:8.11.0" dependencies: - "@typescript-eslint/typescript-estree": 8.10.0 - "@typescript-eslint/utils": 8.10.0 + "@typescript-eslint/typescript-estree": 8.11.0 + "@typescript-eslint/utils": 8.11.0 debug: ^4.3.4 ts-api-utils: ^1.3.0 peerDependenciesMeta: typescript: optional: true - checksum: 8b0cec8cff1926a08c2bd675b24b2ccff36e59a8d9169eed38343f70c4e3bba18796fc39f30a9307ded3f345881aded80dbd6dc1d78b9ae76cff04fbe8708788 + checksum: 74704ee811de343ea2d349a16eec53b6cc8f2b5720510bf327e10667304c48410af78b9ec7aee5d43924a3f6c268cc2cddb7a0606f20c62391b0d7045d8b6264 languageName: node linkType: hard @@ -3142,13 +3132,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/types@npm:8.10.0" - checksum: 3839fd43b0f21b432a9f6090a39d5b2254ee48c1eecf14f8f66bea0cbaba9f2f33a7fc78aea37dfe8841442332d0a8f99cc65cd2d01ca43db99550d30d6f7fe8 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/types@npm:8.11.0" @@ -3193,25 +3176,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/typescript-estree@npm:8.10.0" - dependencies: - "@typescript-eslint/types": 8.10.0 - "@typescript-eslint/visitor-keys": 8.10.0 - debug: ^4.3.4 - fast-glob: ^3.3.2 - is-glob: ^4.0.3 - minimatch: ^9.0.4 - semver: ^7.6.0 - ts-api-utils: ^1.3.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 3fc774f51d0a891a5e09bc77f5544b6aa268abec9c01cd9ec831f92dde9c9d61a5c818ca2800c124fb5d61d40ce7ac34740b347c21ba3493e756c052084afd65 - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/typescript-estree@npm:8.11.0" @@ -3231,17 +3195,17 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/utils@npm:8.10.0" +"@typescript-eslint/utils@npm:8.11.0, @typescript-eslint/utils@npm:^8.8.1": + version: 8.11.0 + resolution: "@typescript-eslint/utils@npm:8.11.0" dependencies: "@eslint-community/eslint-utils": ^4.4.0 - "@typescript-eslint/scope-manager": 8.10.0 - "@typescript-eslint/types": 8.10.0 - "@typescript-eslint/typescript-estree": 8.10.0 + "@typescript-eslint/scope-manager": 8.11.0 + "@typescript-eslint/types": 8.11.0 + "@typescript-eslint/typescript-estree": 8.11.0 peerDependencies: eslint: ^8.57.0 || ^9.0.0 - checksum: db67603baacba9cccbbc625801a44e5320bc558be846646ff9962818c64a9ab07edcfdcad98b15a3f8954d3e398e3a41f085c1ec458f7169a1ce7b3674032d59 + checksum: 0a6286fb6c6aaf497bcd5657e4f8167f29c32bb913e4feab3822c504f537ac30975d626dff442cc691e040384ad197313b5685d79296fc8a42ed6c827dcb52fc languageName: node linkType: hard @@ -3277,20 +3241,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:^8.8.1": - version: 8.11.0 - resolution: "@typescript-eslint/utils@npm:8.11.0" - dependencies: - "@eslint-community/eslint-utils": ^4.4.0 - "@typescript-eslint/scope-manager": 8.11.0 - "@typescript-eslint/types": 8.11.0 - "@typescript-eslint/typescript-estree": 8.11.0 - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - checksum: 0a6286fb6c6aaf497bcd5657e4f8167f29c32bb913e4feab3822c504f537ac30975d626dff442cc691e040384ad197313b5685d79296fc8a42ed6c827dcb52fc - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.62.0": version: 5.62.0 resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" @@ -3311,16 +3261,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:8.10.0": - version: 8.10.0 - resolution: "@typescript-eslint/visitor-keys@npm:8.10.0" - dependencies: - "@typescript-eslint/types": 8.10.0 - eslint-visitor-keys: ^3.4.3 - checksum: 0b3060a036dd3b6acacc32b1d81b3ada1ac5523cc2d16a369ecffd3ab5b389cd98802b248bf65ee8a266a166125a9e38acd7e917d4dd26044bdf2c805537b7e3 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/visitor-keys@npm:8.11.0" @@ -10369,8 +10309,8 @@ __metadata: "@types/react-router-dom": ^5.3.3 "@types/react-scroll-sync": ^0.9.0 "@types/sanitize-html": ^2.13.0 - "@typescript-eslint/eslint-plugin": ^8.10.0 - "@typescript-eslint/parser": ^8.10.0 + "@typescript-eslint/eslint-plugin": ^8.11.0 + "@typescript-eslint/parser": ^8.11.0 "@uswds/uswds": 3.7.1 "@vitejs/plugin-react": ^4.3.3 "@vitest/coverage-istanbul": ^2.1.3 From a761f96121fd669fe729bb9418e4efbb89195087 Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:14:15 -0700 Subject: [PATCH 17/18] Update transform for simulated-sender --- prime-router/settings/STLTs/Flexion/flexion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index 421c284676e..bfbbd01093e 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -53,7 +53,7 @@ topic: "etor-ti" customerStatus: "active" format: "HL7" - schemaName: "classpath:/metadata/fhir_transforms/senders/Flexion/cdph-nbs-sender-transform.yml" # this transform is needed for automated tests. we may want to create a new transform for this purpose + schemaName: "classpath:metadata/fhir_transforms/senders/Flexion/automated-testing-etor.yml" receivers: # ETOR Service Receiver for orders - Routes ORM_O01 and OML_O21 FHIR orders to TI orders endpoint - name: "etor-service-receiver-orders" From 84374e23ae5089d83b66b1aed52587799d5c90ca Mon Sep 17 00:00:00 2001 From: Basilio Bogado <541149+basiliskus@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:15:30 -0700 Subject: [PATCH 18/18] Update transform for simulated-sender --- prime-router/settings/STLTs/Flexion/flexion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/settings/STLTs/Flexion/flexion.yml b/prime-router/settings/STLTs/Flexion/flexion.yml index bfbbd01093e..f736c5ff2eb 100644 --- a/prime-router/settings/STLTs/Flexion/flexion.yml +++ b/prime-router/settings/STLTs/Flexion/flexion.yml @@ -53,7 +53,7 @@ topic: "etor-ti" customerStatus: "active" format: "HL7" - schemaName: "classpath:metadata/fhir_transforms/senders/Flexion/automated-testing-etor.yml" + schemaName: "classpath:/metadata/fhir_transforms/senders/Flexion/automated-testing-etor.yml" receivers: # ETOR Service Receiver for orders - Routes ORM_O01 and OML_O21 FHIR orders to TI orders endpoint - name: "etor-service-receiver-orders"