NIAD-3304: Adaptor not preserving legacy read codes on export (#1146)

* NIAD-3304: GP2GP Sending Adaptor not preserving legacy read codes on export

* Add initial unit test for mapping allergy codable concepts.

* Started adding tests for current behaviour for blood pressure codeable concept mapping

* * Added additional tests for `mapCodableConceptToCdForBloodPressure`
* Refactor `findOriginalText`method to accept functional parameter so that different ways of retrieving the description display extension can be used.

* * Added additional tests for `mapCodableConceptToCdForBloodPressure`
* Refactor `findOriginalText`method to accept functional parameter so that different ways of retrieving the description display extension can be used.

* * Add test for the case where an extension is provided, but the extension is not defined by the url as a description extension.

* * Add additional test for populating original text when codeable concept has only non-snomed codes.

* * Add additional test for populating original text when codeable concept has only non-snomed codes.

* * Remove whitespace

* * Rename method parameter

---------

Co-authored-by: Bhavesh Patel <[email protected]>

Author: MartinWheelerMT

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

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.dstu3.model.AllergyIntolerance;
@@ -152,7 +153,7 @@ public String mapCodeableConceptToCdForBloodPressure(CodeableConcept codeableCon
         var mainCode = getSnomedCodeCoding(codeableConcept);
 
         builder.nullFlavor(mainCode.isEmpty());
-        var originalText = findOriginalText(codeableConcept, mainCode);
+        var originalText = findOriginalTextUsingNestedDisplayExtension(codeableConcept, mainCode);
         originalText.ifPresent(builder::mainOriginalText);
 
         if (mainCode.isPresent()) {
@@ -324,15 +325,19 @@ private List<Coding> getNonSnomedCodeCodings(CodeableConcept codeableConcept) {
         return nonSnomedCodeCodings;
     }
 
-    private Optional<String> findOriginalText(CodeableConcept codeableConcept, Optional<Coding> coding) {
+    private Optional<String> findOriginalText(
+        CodeableConcept codeableConcept,
+        Optional<Coding> coding,
+        Function<Coding, List<Extension>> getOriginalTextFromDescriptionExtension) {
+
         if (coding.isPresent()) {
             if (codeableConcept.hasText()) {
                 return Optional.ofNullable(codeableConcept.getText());
             } else {
                 if (coding.get().hasDisplay()) {
                     return getCodingDisplayName(coding.get());
                 } else {
-                    var extension = retrieveDescriptionExtension(coding.get());
+                    var extension = getOriginalTextFromDescriptionExtension.apply(coding.get());
                     return extension.stream()
                         .filter(displayExtension -> DESCRIPTION_DISPLAY.equals(displayExtension.getUrl()))
                         .map(extension1 -> extension1.getValue().toString())
@@ -344,6 +349,24 @@ private Optional<String> findOriginalText(CodeableConcept codeableConcept, Optio
         }
     }
 
+    private Optional<String> findOriginalText(CodeableConcept codeableConcept, Optional<Coding> coding) {
+        return findOriginalText(
+            codeableConcept,
+            coding,
+            codingParameter -> retrieveDescriptionExtension(codingParameter).stream().toList()
+        );
+    }
+
+    private Optional<String> findOriginalTextUsingNestedDisplayExtension(CodeableConcept codeableConcept, Optional<Coding> coding) {
+        return findOriginalText(
+            codeableConcept,
+            coding,
+            codingParameter -> retrieveDescriptionExtension(codingParameter)
+                .map(Extension::getExtension)
+                .orElseGet(Collections::emptyList)
+        );
+    }
+
     private Optional<String> findOriginalTextForAllergy(
         CodeableConcept codeableConcept,
         Optional<Coding> coding,