using a more appropriate error code

Author: ORybak5

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendController.java

@@ -30,7 +30,7 @@
 public class EhrResendController {
 
     private static final String OPERATION_OUTCOME_URL = "https://fhir.nhs.uk/STU3/StructureDefinition/GPConnect-OperationOutcome-1";
-    private static final String FORBIDDEN = "FORBIDDEN";
+    private static final String CONFLICT = "CONFLICT";
     private static final String INVALID_IDENTIFIER_VALUE = "INVALID_IDENTIFIER_VALUE";
 
     private EhrExtractStatusRepository ehrExtractStatusRepository;
@@ -58,14 +58,14 @@ public ResponseEntity<String> scheduleEhrExtractResend(@PathVariable String conv
 
         if (hasNoErrorsInEhrReceivedAcknowledgement(ehrExtractStatus) && ehrExtractStatus.getError() == null) {
 
-            var details = getCodeableConcept(FORBIDDEN);
+            var details = getCodeableConcept(CONFLICT);
             var diagnostics = "The current resend operation is still in progress. Please wait for it to complete before retrying";
             var operationOutcome = createOperationOutcome(OperationOutcome.IssueType.BUSINESSRULE,
                                                           OperationOutcome.IssueSeverity.ERROR,
                                                           details,
                                                           diagnostics);
             var errorBody = fhirParseService.encodeToJson(operationOutcome);
-            return new ResponseEntity<>(errorBody, HttpStatus.FORBIDDEN);
+            return new ResponseEntity<>(errorBody, HttpStatus.CONFLICT);
         }
 
         LOGGER.info("Creating tasks to start the EHR Extract process resend");

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendControllerTest.java

@@ -46,7 +46,7 @@ class EhrResendControllerTest {
     private static final String FROM_ASID_CODE = "test-from-asid";
     private static final String INCUMBENT_NACK_CODE = "99";
     private static final String INCUMBENT_NACK_DISPLAY = "Unexpected condition.";
-    private static final String FORBIDDEN = "FORBIDDEN";
+    private static final String CONFLICT = "CONFLICT";
     private static final String GPCONNECT_ERROR_OR_WARNING_CODE = "http://fhir.nhs.net/ValueSet/gpconnect-error-or-warning-code-1";
     private static final String INVALID_IDENTIFIER_VALUE = "INVALID_IDENTIFIER_VALUE";
     public static final String ISSUE_CODE_VALUE = "value";
@@ -144,8 +144,8 @@ void When_AnEhrExtractHasNotFailedAndAnotherResendRequestArrives_Expect_FailedOp
         JsonNode rootNode = objectMapper.readTree(response.getBody());
 
         assertAll(
-            () -> assertResponseHasExpectedOperationOutcome(rootNode, FORBIDDEN, DIAGNOSTICS_MSG, ISSUE_CODE_BUSINESS_RULE),
-            () -> assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode())
+            () -> assertResponseHasExpectedOperationOutcome(rootNode, CONFLICT, DIAGNOSTICS_MSG, ISSUE_CODE_BUSINESS_RULE),
+            () -> assertEquals(HttpStatus.CONFLICT, response.getStatusCode())
         );
     }
 
@@ -199,8 +199,8 @@ void When_AnEhrExtractHasNotFailed_Expect_RespondsWith403() throws JsonProcessin
         JsonNode rootNode = objectMapper.readTree(response.getBody());
 
         assertAll(
-            () -> assertResponseHasExpectedOperationOutcome(rootNode, FORBIDDEN, DIAGNOSTICS_MSG, ISSUE_CODE_BUSINESS_RULE),
-            () -> assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode())
+            () -> assertResponseHasExpectedOperationOutcome(rootNode, CONFLICT, DIAGNOSTICS_MSG, ISSUE_CODE_BUSINESS_RULE),
+            () -> assertEquals(HttpStatus.CONFLICT, response.getStatusCode())
         );
     }