From 8b0d5fccb2b2a4afa860aae1406fde54d8ade389 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Tue, 10 Mar 2026 13:48:29 +0000 Subject: [PATCH 1/2] make PS adaptor fully compatible with UK07 messaging format --- .../pss/translator/task/scheduled/EHRTimeoutHandler.java | 2 +- .../uk/nhs/adaptors/pss/translator/service/SDSServiceTest.java | 2 +- .../pss/translator/task/scheduled/EHRTimeoutHandlerTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java index 513fb34ad..96c4fd542 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java @@ -58,7 +58,7 @@ @AllArgsConstructor(onConstructor = @__(@Autowired)) public class EHRTimeoutHandler { - private static final String EHR_EXTRACT_MESSAGE_NAME = "RCMR_IN030000UK06"; + private static final String EHR_EXTRACT_MESSAGE_NAME = "RCMR_IN030000UK07"; private static final String COPC_MESSAGE_NAME = "COPC_IN000001UK01"; private static final Integer MAX_TIMEOUT_OVERWRITE = 172800; private final PersistDurationService persistDurationService; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SDSServiceTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SDSServiceTest.java index 5f1f1c229..e4e812933 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SDSServiceTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SDSServiceTest.java @@ -36,7 +36,7 @@ @ExtendWith(MockitoExtension.class) public class SDSServiceTest { - private static final String EHR_EXTRACT_MESSAGE_TYPE = "RCMR_IN030000UK06"; + private static final String EHR_EXTRACT_MESSAGE_TYPE = "RCMR_IN030000UK07"; private static final String COPC_MESSAGE_TYPE = "COPC_IN000001UK01"; private static final String TEST_ODS_CODE = "P83007"; private static final String TEST_CONVERSATION_ID = "test-conversation-id"; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandlerTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandlerTest.java index 615305900..3b2c97613 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandlerTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandlerTest.java @@ -83,7 +83,7 @@ @ExtendWith({MockitoExtension.class, OutputCaptureExtension.class}) class EHRTimeoutHandlerTest { - private static final String EHR_EXTRACT_MESSAGE_NAME = "RCMR_IN030000UK06"; + private static final String EHR_EXTRACT_MESSAGE_NAME = "RCMR_IN030000UK07"; private static final String COPC_MESSAGE_NAME = "COPC_IN000001UK01"; private static final int EHR_EXTRACT_PERSIST_DURATION = 7; From bf5f7fdf089a143f7bfac6eac28c8366f50b5d58 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Tue, 10 Mar 2026 13:59:21 +0000 Subject: [PATCH 2/2] changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 299d637b2..54e3a5fc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed * Updated the Requesting Adaptor to map newly granular EHRSupplyType values from EMIS into the corresponding GPC JSON record fields. +* Corrected the EHR Extract interaction identifier used by timeout handling from RCMR_IN030000UK06 to RCMR_IN030000UK07. ### Added * Added support for mapping different EhrSupplyType (e.g. NHS prescription, OTC sale) into the Medication Statement Prescribing Agency extension