GP2GP Handles Handle empty Access Structure Record

Author: chiaramapellimt

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * The GP2GP Adaptor now adds the EhrComposition / confidentialityCode field when Encounter.meta.security contains NOPAT security entry
 * The GP2GP Adaptor now populates the ObservationStatement / confidentialityCode field when the .meta.security field of an Uncategorized Data Observation contains NOPAT
 * When List.meta.security field contains NOPAT, the GP2GP Adaptor will now populate the CompoundStatement.confidentialityCode
+* The GP2GP Adaptor now throws an exception when the Access Structure Record is empty, thereby rejecting the transfer
 
 ### Fixed
 * When DiagnosticReport doesn't contain a Specimen reference, instead of "DUMMY" "NOT-PRESENT" value is used

docker/run-e2e-tests.sh

@@ -2,10 +2,10 @@
 
 set -e
 
-if [ -f "vars.sh" ]; then
-    source vars.sh
+if [ -f "vars.local.e2e.sh" ]; then
+    source vars.local.e2e.sh
 else
-  echo "No vars.sh defined. Using docker-compose defaults."
+  echo "No vars.local.e2e.sh defined. Using docker-compose defaults."
 fi
 if [[ "$(docker network ls | grep "commonforgp2gp")" == "" ]] ; then
     docker network create commonforgp2gp

e2e-tests/src/test/java/uk/nhs/adaptors/gp2gp/e2e/EhrExtractTest.java

@@ -84,13 +84,13 @@ dependencies {
 	testImplementation 'org.wiremock:wiremock-standalone:3.13.1'
 	testImplementation 'com.squareup.okhttp3:okhttp:5.1.0'
 	testImplementation 'com.squareup.okhttp3:mockwebserver3:5.1.0'
-	testImplementation 'com.adobe.testing:s3mock-testcontainers:4.9.1'
+	testImplementation 'com.adobe.testing:s3mock-testcontainers:4.7.0'
 
     spotbugs 'com.github.spotbugs:spotbugs:4.9.6'
     spotbugs 'com.github.spotbugs:spotbugs-annotations:4.9.6'
 
     pitest 'com.arcmutate:base:1.3.2'
-    pitest 'com.arcmutate:pitest-git-plugin:2.2.4'
+	pitest 'com.arcmutate:pitest-git-plugin:2.1.0'
 }
 
 test {
@@ -165,7 +165,7 @@ spotbugsMain {
 }
 
 pitest {
-	pitestVersion = '1.16.1'
+	pitestVersion = '1.16.3'
 	junit5PluginVersion = '1.2.1'
 	outputFormats = ['gitci']
 

service/build.gradle

@@ -64,6 +64,7 @@
 @ExtendWith({SpringExtension.class, MongoDBExtension.class, ActiveMQExtension.class, MockitoExtension.class})
 @SpringBootTest
 @DirtiesContext
+@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 public class SendEhrExtractCoreComponentTest extends BaseTaskTest {
     private static final String OUTBOUND_MESSAGE = serializeOutboundMessage("payload");
     public static final String OUTBOUND_MESSAGE_WITH_PLACEHOLDER =

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/SendEhrExtractCoreComponentTest.java

@@ -22,7 +22,7 @@ public static ActiveMqContainer getInstance() {
     @Override
     public void start() {
         super.start();
-        var containerBrokerUri = "amqp://" + getContainerIpAddress() + ":" + getMappedPort(ACTIVEMQ_PORT);
+        var containerBrokerUri = "amqp://" + getHost() + ":" + getMappedPort(ACTIVEMQ_PORT);
         System.setProperty("GP2GP_AMQP_BROKERS", containerBrokerUri);
     }
 }

service/src/intTest/java/uk/nhs/adaptors/gp2gp/testcontainers/ActiveMqContainer.java

@@ -16,6 +16,7 @@
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrExtractException;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.EhrRequestException;
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.GpConnectException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.GpConnectInvalidException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.GpConnectNotFoundException;
@@ -31,6 +32,7 @@ public class TaskErrorHandler {
         EhrExtractException.class, this::handleTranslationError,
         EhrMapperException.class, this::handleTranslationError,
         FhirValidationException.class, this::handleTranslationError,
+        EhrValidationException.class, this::handleTranslationError,
         GpConnectException.class, this::handleGpConnectError,
         GpConnectInvalidException.class, this::handleInvalidNotAuthError,
         GpConnectNotFoundException.class, this::handleNotFoundError,

service/src/main/java/uk/nhs/adaptors/gp2gp/common/task/TaskErrorHandler.java

@@ -0,0 +1,8 @@
+package uk.nhs.adaptors.gp2gp.ehr.exception;
+
+public class EhrValidationException extends RuntimeException {
+
+    public EhrValidationException(String message) {
+        super(message);
+    }
+}

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/exception/EhrValidationException.java

@@ -20,6 +20,7 @@
 import uk.nhs.adaptors.gp2gp.ehr.utils.StatementTimeMappingUtils;
 import uk.nhs.adaptors.gp2gp.ehr.utils.TemplateUtils;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 
 import java.util.List;
 import java.util.Optional;
@@ -56,6 +57,12 @@ public EhrExtractTemplateParameters mapBundleToEhrFhirExtractParams(
         mappedComponents.addAll(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(bundle));
         ehrExtractTemplateParameters.setComponents(mappedComponents);
 
+        if (mappedComponents.isEmpty()) {
+            final String message = "could not extract EHR Extract: empty structured access record.";
+            LOGGER.error(message);
+            throw new EhrValidationException(message);
+        }
+
         ehrExtractTemplateParameters.setAgentDirectory(
             agentDirectoryMapper.mapEHRFolderToAgentDirectory(bundle, getPatientNhsNumber(getGpcStructuredTaskDefinition))
         );

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapper.java

@@ -31,6 +31,7 @@
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrExtractException;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.EhrRequestException;
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.GpConnectException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.GpConnectInvalidException;
 import uk.nhs.adaptors.gp2gp.gpc.exception.GpConnectNotFoundException;
@@ -65,6 +66,17 @@ void When_HandleProcessingError_WithEhrRequestException_Expect_ProcessToBeFailed
             any());
     }
 
+    @Test
+    void When_HandleProcessingError_WithEhrValidationException_Expect_ProcessToBeFailedWithCorrectCode() {
+        taskErrorHandler.handleProcessingError(new EhrValidationException(TEST_EXCEPTION_MESSAGE), taskDefinition);
+
+        verify(processFailureHandlingService).failProcess(
+                any(),
+                eq("10"),
+                eq("Failed to successfully generate EHR Extract."),
+                any());
+    }
+
     @Test
     void When_HandleProcessingError_WithEhrRequestException_Expect_ReturnValueOfFailService() {
         when(processFailureHandlingService.failProcess(any(), any(), any(), any()))