Kavitha | refactored annotation to medicationAdministrationNote

Bahmni · Dec 27, 2023 · cadcc34 · cadcc34
1 parent 1dbad33
commit cadcc34
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationNoteResponse.java b/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationNoteResponse.java
@@ -2,7 +2,7 @@
 
 import lombok.*;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.openmrs.module.ipd.api.model.Annotation;
+import org.openmrs.module.ipd.api.model.MedicationAdministrationNote;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.representation.Representation;
 
@@ -20,12 +20,12 @@ public class MedicationAdministrationNoteResponse {
     private Date recordedTime;
     private String text;
 
-    public static MedicationAdministrationNoteResponse createFrom(Annotation openmrsAnnotation) {
+    public static MedicationAdministrationNoteResponse createFrom(MedicationAdministrationNote openmrsObject) {
         return MedicationAdministrationNoteResponse.builder()
-                .uuid(openmrsAnnotation.getUuid())
-                .author(ConversionUtil.convertToRepresentation(openmrsAnnotation.getAuthor(), Representation.REF))
-                .recordedTime(openmrsAnnotation.getRecordedTime())
-                .text(openmrsAnnotation.getText())
+                .uuid(openmrsObject.getUuid())
+                .author(ConversionUtil.convertToRepresentation(openmrsObject.getAuthor(), Representation.REF))
+                .recordedTime(openmrsObject.getRecordedTime())
+                .text(openmrsObject.getText())
                 .build();
     }
 }
diff --git a/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java b/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java
@@ -2,7 +2,7 @@
 
 import lombok.*;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.ipd.api.model.Annotation;
+import org.openmrs.module.ipd.api.model.MedicationAdministrationNote;
 import org.openmrs.module.ipd.api.model.MedicationAdministrationPerformer;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.representation.Representation;
@@ -52,7 +52,7 @@ public static MedicationAdministrationResponse createFrom(org.openmrs.module.ipd
         }
         List<MedicationAdministrationNoteResponse> notes = new java.util.ArrayList<>();
         if (openmrsMedicationAdministration.getNotes() != null) {
-            for (Annotation note : openmrsMedicationAdministration.getNotes()) {
+            for (MedicationAdministrationNote note : openmrsMedicationAdministration.getNotes()) {
                 notes.add(MedicationAdministrationNoteResponse.createFrom(note));
             }
         }

diff --git a/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java b/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java
@@ -9,14 +9,11 @@
 import org.openmrs.Provider;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.fhir2.api.translators.ConceptTranslator;
-import org.openmrs.module.fhir2.apiext.translators.AnnotationTranslator;
 import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationStatusTranslator;
 import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationTranslator;
-//import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationPerformerTranslator;
-//import org.openmrs.module.fhir2.model.Annotation;
 import org.openmrs.module.ipd.api.model.MedicationAdministration;
+import org.openmrs.module.ipd.api.model.MedicationAdministrationNote;
 import org.openmrs.module.ipd.api.model.MedicationAdministrationPerformer;
-import org.openmrs.module.ipd.api.model.Annotation;
 import org.openmrs.module.ipd.contract.*;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.representation.Representation;
@@ -59,10 +56,10 @@ public MedicationAdministration mapRequestToMedicationAdministration(MedicationA
             }
         }
         medicationAdministration.setPerformers(new HashSet<>(providers));
-        List<Annotation> notes = new ArrayList<>();
+        List<MedicationAdministrationNote> notes = new ArrayList<>();
         if (request.getNotes() != null) {
             for (MedicationAdministrationNoteRequest note : request.getNotes()) {
-                Annotation newNote = new Annotation();
+                MedicationAdministrationNote newNote = new MedicationAdministrationNote();
                 newNote.setAuthor(Context.getProviderService().getProviderByUuid(note.getAuthorUuid()));
                 newNote.setText(note.getText());
                 newNote.setRecordedTime(note.getRecordedTimeAsLocaltime());