updating a log message to be more clear (#1017)

NHSDigital · Dec 2, 2024 · 342f512 · 342f512
1 parent 9c14598
commit 342f512
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendController.java b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendController.java
@@ -59,7 +59,9 @@ public ResponseEntity<String> scheduleEhrExtractResend(@PathVariable String conv
         if (hasNoErrorsInEhrReceivedAcknowledgement(ehrExtractStatus) && ehrExtractStatus.getError() == null) {
 
             var details = getCodeableConcept(PRECONDITION_FAILED);
-            var diagnostics = "The current resend operation is still in progress. Please wait for it to complete before retrying";
+            var diagnostics = "The current patient transfer operation is still in progress. "
+                              + "The conversation can only be resent after a negative acknowledgement is sent/received, "
+                              + "or no acknowledgement is received from the requesting side 8 days after sending the EHR.";
             var operationOutcome = createOperationOutcome(OperationOutcome.IssueType.BUSINESSRULE,
                                                           OperationOutcome.IssueSeverity.ERROR,
                                                           details,

diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendControllerTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendControllerTest.java
@@ -39,8 +39,10 @@
 @ExtendWith(MockitoExtension.class)
 class EhrResendControllerTest {
 
-    public static final String DIAGNOSTICS_MSG =
-        "The current resend operation is still in progress. Please wait for it to complete before retrying";
+    public static final String DIAGNOSTICS_MSG
+         = "The current patient transfer operation is still in progress. "
+            + "The conversation can only be resent after a negative acknowledgement is sent/received, "
+            + "or no acknowledgement is received from the requesting side 8 days after sending the EHR.";
     private static final Instant NOW = Instant.parse("2024-01-01T10:00:00Z");
     private static final Instant FIVE_DAYS_AGO = NOW.minus(Duration.ofDays(5));
     private static final String URI_TYPE = "https://fhir.nhs.uk/STU3/StructureDefinition/GPConnect-OperationOutcome-1";