Consolidate ObservationMapper version and ObsBuilder versions

openmrs · May 4, 2024 · a7aeb88 · a7aeb88
1 parent 76bbdf5
commit a7aeb88
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 192 deletions.
diff --git a/api/src/main/java/org/openmrs/module/emrapi/encounter/ObservationMapper.java b/api/src/main/java/org/openmrs/module/emrapi/encounter/ObservationMapper.java
@@ -16,23 +16,18 @@
 import org.openmrs.Concept;
 import org.openmrs.Drug;
 import org.openmrs.Obs;
-import org.openmrs.annotation.OpenmrsProfile;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction;
 import org.openmrs.module.emrapi.encounter.mapper.UserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 
-@Component("observationMapper")
-@OpenmrsProfile(openmrsPlatformVersion = "[1.9.* - 1.11.*]")
 public class ObservationMapper {
-    private ConceptMapper conceptMapper;
-    private DrugMapper drugMapper;
-    private UserMapper userMapper;
 
-    @Autowired(required = false)
+    private final ConceptMapper conceptMapper;
+    private final DrugMapper drugMapper;
+    private final UserMapper userMapper;
+
     public ObservationMapper(ConceptMapper conceptMapper, DrugMapper drugMapper, UserMapper userMapper) {
         this.conceptMapper = conceptMapper;
         this.drugMapper = drugMapper;
@@ -59,6 +54,18 @@ public EncounterTransaction.Observation map(Obs obs) {
                 observation.addGroupMember(map(obsGroupMember));
             }
         }
+        observation.setFormNamespace(obs.getFormFieldNamespace());
+        observation.setFormFieldPath(obs.getFormFieldPath());
+
+        Obs.Interpretation obsInterpretation = obs.getInterpretation();
+        Obs.Status obsStatus = obs.getStatus();
+
+        String interpretation = (obsInterpretation != null) ? obsInterpretation.name() : null;
+        String status = (obsStatus != null) ? obsStatus.name() : null;
+
+        observation.setInterpretation(interpretation);
+        observation.setStatus(status);
+
         return observation;
     }
 

diff --git a/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/ObservationMapper1_12.java b/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/ObservationMapper1_12.java
diff --git a/api/src/main/java/org/openmrs/module/emrapi/test/builder/ObsBuilder.java b/api/src/main/java/org/openmrs/module/emrapi/test/builder/ObsBuilder.java
@@ -129,4 +129,9 @@ public ObsBuilder setEncounter(Encounter encounter) {
         obs.setEncounter(encounter);
         return this;
     }
+
+    public ObsBuilder setFormField(String formNameSpace, String formFieldPath){
+        obs.setFormField(formNameSpace, formFieldPath);
+        return this;
+    }
 }
diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml
@@ -320,6 +320,12 @@
         <constructor-arg name="observationTypeMatcher" ref="observationTypeMatcher"/>
     </bean>
 
+    <bean id="observationMapper" class="org.openmrs.module.emrapi.encounter.ObservationMapper">
+        <constructor-arg name="conceptMapper" ref="conceptMapper"/>
+        <constructor-arg name="drugMapper" ref="drugMapper"/>
+        <constructor-arg name="userMapper" ref="userMapper"/>
+    </bean>
+
     <bean id="conceptMapper" class="org.openmrs.module.emrapi.encounter.ConceptMapper"/>
 
     <bean id="diagnosisMapper" class="org.openmrs.module.emrapi.encounter.DiagnosisMapper">

diff --git a/api/src/test/java/org/openmrs/module/emrapi/encounter/ObservationMapperTest.java b/api/src/test/java/org/openmrs/module/emrapi/encounter/ObservationMapperTest.java
@@ -70,12 +70,14 @@ public void setUp(){
     @Test
     public void shouldMapObservationWithNumericValue(){
         when(conceptDatatype.isNumeric()).thenReturn(true);
-        Obs obs = obsBuilder.setValue(100.0).get();
+        Obs obs = obsBuilder.setValue(100.0).setFormField("form uuid", "formFieldPath").get();
 
         EncounterTransaction.Observation observation = observationMapper.map(obs);
 
         assertEquals(obs.getUuid(), observation.getUuid());
         assertEquals(100.0, observation.getValue());
+        assertEquals(observation.getFormNamespace(), "form uuid");
+        assertEquals(observation.getFormFieldPath(), "formFieldPath");
     }
 
     @Test

diff --git a/api/src/test/java/org/openmrs/module/emrapi/encounter/builder/ObsBuilder1_12.java b/api/src/test/java/org/openmrs/module/emrapi/encounter/builder/ObsBuilder1_12.java
diff --git a/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/ObservationMapper1_12Test.java b/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/ObservationMapper1_12Test.java