get display for all snomed inputs

also clean up unused method

Author: mehansen

backend/src/main/java/gov/cdc/usds/simplereport/api/Translators.java

@@ -31,6 +31,7 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 
@@ -542,6 +543,9 @@ public static PersonName consolidateNameArguments(
               "125154007",
               new SnomedConceptRecord(
                   "Specimen unsatisfactory for evaluation", "125154007", TestResult.UNDETERMINED)));
+  public static final Map<String, SnomedConceptRecord> ALL_ACCEPTED_RESULT_SNOMED_RECORDS =
+      Stream.concat(ABNORMAL_SNOMEDS.entrySet().stream(), NORMAL_SNOMEDS.entrySet().stream())
+          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
   public static final SnomedConceptRecord DETECTED_SNOMED_CONCEPT =
       ABNORMAL_SNOMEDS.get(DETECTED_SNOMED);
@@ -571,15 +575,6 @@ public static Optional<String> toOptional(String str) {
     }
   }
 
-  public static TestResult convertSnomedToResult(String snomed) {
-    SnomedConceptRecord concept =
-        RESULTS_SNOMED_CONCEPTS.stream()
-            .filter(snomedConcept -> snomed.equals(snomedConcept.code()))
-            .findFirst()
-            .orElse(INVALID_SNOMED_CONCEPT);
-    return concept.displayName();
-  }
-
   public static String convertTestResultToSnomed(TestResult result) {
     SnomedConceptRecord concept =
         RESULTS_SNOMED_CONCEPTS.stream()
@@ -590,7 +585,7 @@ public static String convertTestResultToSnomed(TestResult result) {
   }
 
   public static SnomedConceptRecord getSnomedConceptByCode(String snomedCode) {
-    return RESULTS_SNOMED_CONCEPTS.stream()
+    return ALL_ACCEPTED_RESULT_SNOMED_RECORDS.values().stream()
         .filter(snomedConcept -> snomedCode.equals(snomedConcept.code()))
         .findFirst()
         .orElse(null);

backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java

@@ -1,10 +1,9 @@
 package gov.cdc.usds.simplereport.validators;
 
-import static gov.cdc.usds.simplereport.api.Translators.ABNORMAL_SNOMEDS;
+import static gov.cdc.usds.simplereport.api.Translators.ALL_ACCEPTED_RESULT_SNOMED_RECORDS;
 import static gov.cdc.usds.simplereport.api.Translators.CANADIAN_STATE_CODES;
 import static gov.cdc.usds.simplereport.api.Translators.COUNTRY_CODES;
 import static gov.cdc.usds.simplereport.api.Translators.GENDER_IDENTITIES;
-import static gov.cdc.usds.simplereport.api.Translators.NORMAL_SNOMEDS;
 import static gov.cdc.usds.simplereport.api.Translators.PAST_DATE_FLEXIBLE_FORMATTER;
 import static gov.cdc.usds.simplereport.api.Translators.STATE_CODES;
 import static gov.cdc.usds.simplereport.api.converter.FhirConstants.DETECTED_SNOMED;
@@ -195,11 +194,10 @@ public class CsvValidatorUtils {
           DETECTED_LITERAL,
           INVALID_RESULT_LITERAL);
 
-  private static final Set<String> ACCEPTED_TEST_RESULT_SNOMEDS =
-      concat(NORMAL_SNOMEDS.keySet().stream(), ABNORMAL_SNOMEDS.keySet().stream()).collect(toSet());
-
   private static final Set<String> ALL_ACCEPTED_TEST_RESULT_VALUES =
-      concat(ACCEPTED_LITERAL_TEST_RESULT_VALUES.stream(), ACCEPTED_TEST_RESULT_SNOMEDS.stream())
+      concat(
+              ACCEPTED_LITERAL_TEST_RESULT_VALUES.stream(),
+              ALL_ACCEPTED_RESULT_SNOMED_RECORDS.keySet().stream())
           .collect(toSet());
   private static final Set<String> RESIDENCE_VALUES =
       Set.of(

backend/src/test/java/gov/cdc/usds/simplereport/api/TranslatorTest.java

@@ -12,6 +12,10 @@
 import static gov.cdc.usds.simplereport.api.Translators.parseUUID;
 import static gov.cdc.usds.simplereport.api.Translators.parseUserShortDate;
 import static gov.cdc.usds.simplereport.api.Translators.parseYesNoUnk;
+import static gov.cdc.usds.simplereport.api.converter.FhirConstants.DETECTED_SNOMED;
+import static gov.cdc.usds.simplereport.api.converter.FhirConstants.INVALID_SNOMED;
+import static gov.cdc.usds.simplereport.api.converter.FhirConstants.NOT_DETECTED_SNOMED;
+import static gov.cdc.usds.simplereport.api.converter.FhirConstants.POSITIVE_SNOMED;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -20,6 +24,7 @@
 
 import gov.cdc.usds.simplereport.api.model.errors.IllegalGraphqlArgumentException;
 import gov.cdc.usds.simplereport.db.model.auxiliary.PersonName;
+import gov.cdc.usds.simplereport.db.model.auxiliary.SnomedConceptRecord;
 import gov.cdc.usds.simplereport.db.model.auxiliary.TestResult;
 import java.time.LocalDate;
 import java.util.Collections;
@@ -415,24 +420,6 @@ void badOrganizationType() {
     assertEquals("[not-a-type] is not a valid organization type", caught.getMessage());
   }
 
-  @Test
-  void convertsPositiveLoincToTestResult() {
-    TestResult result = Translators.convertSnomedToResult("260373001");
-    assertEquals(TestResult.POSITIVE, result);
-  }
-
-  @Test
-  void convertsNegativeLoincToTestResult() {
-    TestResult result = Translators.convertSnomedToResult("260415000");
-    assertEquals(TestResult.NEGATIVE, result);
-  }
-
-  @Test
-  void convertsUnknownLoincToTestResult() {
-    TestResult result = Translators.convertSnomedToResult("blah");
-    assertEquals(TestResult.UNDETERMINED, result);
-  }
-
   @Test
   void convertsPositiveTestResultToAppropriateLoinc() {
     String loinc = Translators.convertTestResultToSnomed(TestResult.POSITIVE);
@@ -451,6 +438,27 @@ void convertsUnknownTestResultToAppropriateLoinc() {
     assertEquals("455371000124106", loinc);
   }
 
+  @Test
+  void convertsSnomedCodeToAppropriateSnomedConceptName() {
+    SnomedConceptRecord result = Translators.getSnomedConceptByCode(POSITIVE_SNOMED);
+    assertEquals("Positive", result.name());
+
+    result = Translators.getSnomedConceptByCode(DETECTED_SNOMED);
+    assertEquals("Detected", result.name());
+
+    result = Translators.getSnomedConceptByCode(NOT_DETECTED_SNOMED);
+    assertEquals("Not detected", result.name());
+
+    result = Translators.getSnomedConceptByCode(INVALID_SNOMED);
+    assertEquals("Invalid result", result.name());
+
+    result = Translators.getSnomedConceptByCode("42425007");
+    assertEquals("Equivocal", result.name());
+
+    result = Translators.getSnomedConceptByCode("720735008");
+    assertEquals("Presumptive positive", result.name());
+  }
+
   static class GoodNameArgumentsProvider implements ArgumentsProvider {
 
     @Override