Merge branch 'main' into NIAD-1573

Author: Alex-Nita

e2e-tests/build.gradle

@@ -13,18 +13,18 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.apache.qpid:qpid-jms-client:2.7.0'
+    implementation 'org.apache.qpid:qpid-jms-client:2.8.0'
     implementation "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1"
     implementation 'org.mongodb:mongo-java-driver:3.12.14'
     testImplementation(platform('org.junit:junit-bom:5.13.4'))
     testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.19.2'
-    testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.2'
+    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.20.0'
+    testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0'
     testImplementation 'commons-io:commons-io:2.20.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation "org.assertj:assertj-core:3.27.4"
     testImplementation 'ch.qos.logback:logback-classic:1.5.18'
-    testImplementation 'org.xmlunit:xmlunit-assertj3:2.10.3'
+    testImplementation 'org.xmlunit:xmlunit-assertj3:2.10.4'
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.5'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

mock-mhs-adaptor/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework:spring-jms'
-	implementation 'org.apache.qpid:qpid-jms-client:2.7.0'
+	implementation 'org.apache.qpid:qpid-jms-client:2.8.0'
 	implementation 'org.apache.commons:commons-lang3:3.18.0'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }

service/build.gradle

@@ -50,9 +50,9 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-logging'
 
 	// Infrastructure
-	implementation 'software.amazon.awssdk:s3:2.32.14'
+	implementation 'software.amazon.awssdk:s3:2.33.9'
 	implementation ('com.azure:azure-storage-blob:12.30.0')
-	implementation 'org.apache.qpid:qpid-jms-client:2.7.0'
+	implementation 'org.apache.qpid:qpid-jms-client:2.8.0'
 
 	// Utils
 	implementation 'org.apache.commons:commons-lang3:3.18.0'

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EncounterMapperTest.java

@@ -173,6 +173,22 @@ public void When_MappingEncounterWithNoType_Expect_Exception() {
             .hasMessage("Could not map Encounter type");
     }
 
+    @Test
+    public void When_MappingEncounterLocationWithNoReference_Expect_Exception() {
+        lenient().when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        lenient().when(bundle.getEntry()).thenReturn(List.of(BUNDLE_ENTRY_WITH_CONSULTATION));
+        var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);
+
+        var jsonInput = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY
+                                                             + "input-encounter-with-location-with-no-reference.json");
+        Encounter parsedEncounter = new FhirParseService().parseResource(jsonInput, Encounter.class);
+        when(encounterComponentsMapper.mapComponents(parsedEncounter)).thenReturn(sampleComponent);
+
+        assertThatThrownBy(() -> encounterMapper.mapEncounterToEhrComposition(parsedEncounter))
+            .isExactlyInstanceOf(EhrMapperException.class)
+            .hasMessage("Resource not found: Location/EB3994A6-5A87-4B53-A414-913137072F57");
+    }
+
     @Test
     public void When_MappingEncounterWithInvalidParticipantReferenceResourceType_Expect_Exception() {
         var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);

service/src/test/resources/ehr/mapper/encounter/input-encounter-with-location-with-no-reference.json

@@ -0,0 +1,79 @@
+{
+  "resourceType":"Encounter",
+  "id":"F550CC56-EF65-4934-A7B1-3DC2E02243C3",
+  "meta":{
+    "profile":[
+      "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Encounter-1"
+    ]
+  },
+  "identifier":[
+    {
+      "system":"https://EMISWeb/A82038",
+      "value":"F550CC56-EF65-4934-A7B1-3DC2E02243C3"
+    }
+  ],
+  "status":"finished",
+  "type":[
+    {
+      "text":"GP Surgery",
+      "coding": [
+        {
+          "system":"http://snomed.info/sct",
+          "code":"24561000000109",
+          "display":"A+E report"
+        }
+      ]
+    }
+  ],
+  "subject":{
+    "reference":"Patient/88F14BF6-CADE-47D6-90E2-B10519BF956F"
+  },
+  "participant":[
+    {
+      "type":[
+        {
+          "coding":[
+            {
+              "system":"http://hl7.org/fhir/v3/ParticipationType",
+              "code":"PPRF",
+              "display":"primary performer"
+            }
+          ]
+        }
+      ],
+      "individual":{
+        "reference":"Practitioner/6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73"
+      }
+    },
+    {
+      "type":[
+        {
+          "coding":[
+            {
+              "system":"https://fhir.nhs.uk/STU3/CodeSystem/GPConnect-ParticipantType-1",
+              "code":"REC",
+              "display":"recorder"
+            }
+          ]
+        }
+      ],
+      "individual":{
+        "reference":"Practitioner/6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73"
+      }
+    }
+  ],
+  "period":{
+    "start":"2010-01-13T15:20:00+00:00",
+    "end":"2010-01-13T16:20:00+00:00"
+  },
+  "location":[
+    {
+      "location":{
+        "reference":"Location/EB3994A6-5A87-4B53-A414-913137072F57"
+      }
+    }
+  ],
+  "serviceProvider":{
+    "reference":"Organization/5E496953-065B-41F2-9577-BE8F2FBD0757"
+  }
+}