Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinWheelerMT merged 9 commits into from
Mar 12, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bd5c47c
NIAD-3304: GP2GP Sending Adaptor not preserving legacy read codes on …
MartinWheelerMT Mar 7, 2025
d96112e
Started adding tests for current behaviour for blood pressure codeabl…
Bhavesh-Patel Mar 7, 2025
d1b1c11
* Added additional tests for `mapCodableConceptToCdForBloodPressure`
MartinWheelerMT Mar 10, 2025
c1cefc8
* Added additional tests for `mapCodableConceptToCdForBloodPressure`
MartinWheelerMT Mar 10, 2025
b78be88
* Add test for the case where an extension is provided, but the exten…
MartinWheelerMT Mar 10, 2025
831e89f
* Add additional test for populating original text when codeable conc…
MartinWheelerMT Mar 12, 2025
67f281f
* Add additional test for populating original text when codeable conc…
MartinWheelerMT Mar 12, 2025
ff1ddab
* Remove whitespace
MartinWheelerMT Mar 12, 2025
1cea6b7
* Rename method parameter
MartinWheelerMT Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/CodeableConceptCdMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -152,7 +153,7 @@
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()) {
Expand Down Expand Up @@ -324,15 +325,19 @@
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())
Expand All @@ -344,6 +349,24 @@
}
}

private Optional<String> findOriginalText(CodeableConcept codeableConcept, Optional<Coding> coding) {
return findOriginalText(
codeableConcept,
coding,
codingParameter -> retrieveDescriptionExtension(codingParameter).stream().toList()

Check warning on line 356 in service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/CodeableConceptCdMapper.java

View workflow job for this annotation

GitHub Actions / pitest

A change can be made to a lambda on line 356 without causing a test to fail 

replaced return value with Collections.emptyList for 1st lambda in findOriginalText (covered by 2 tests EmptyObjectReturnValsMutator)
);
}

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,
Expand Down
Loading