BAH-2916 | Fix. Lab Result Value Sync Issue in Clinical Dashboard (#76)

* Parvathy | BAH-2916 | Fix. Date Format of Accession Note * Parvathy | BAH-2916 | Add. Unit test for ISODateFormat
Bahmni · Jan 25, 2024 · 970b3ec · 970b3ec
1 parent e4f9213
commit 970b3ec
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/openelis/src/org/bahmni/feed/openelis/feed/service/impl/AccessionService.java b/openelis/src/org/bahmni/feed/openelis/feed/service/impl/AccessionService.java
@@ -157,8 +157,8 @@ private List<AccessionNote> mapToAccessionNotes(List<Note> accessionNotes) {
         return accessionNotesToPublish;
     }
 
-    private String toISODateFormat(Timestamp timestamp){
-        return DateFormatUtils.format(timestamp.getTime(),DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
+    String toISODateFormat(Timestamp timestamp){
+        return DateFormatUtils.format(timestamp.getTime(), DateFormatUtils.ISO_DATETIME_FORMAT.getPattern());
     }
 
     private void mapSampleItem(List<TestDetail> testDetails, SampleItem sampleItem) {

diff --git a/openelis/test/org/bahmni/feed/openelis/feed/service/impl/AccessionServiceTest.java b/openelis/test/org/bahmni/feed/openelis/feed/service/impl/AccessionServiceTest.java
@@ -47,8 +47,12 @@
 import us.mn.state.health.lims.systemuser.dao.SystemUserDAO;
 import us.mn.state.health.lims.testresult.valueholder.TestResult;
 
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -226,6 +230,19 @@ public void shouldSetResultValueForNumeric() {
         assertEquals("10", testDetail.getResult());
     }
 
+    @Test
+    public void shouldReturnISODateFormat() throws ParseException {
+        AccessionService accessionService = new TestableAccessionService(sampleDao, sampleHumanDAO, externalReferenceDao, noteDao, dictionaryDao, patientIdentityDAO, patientIdentityTypeDAO, siteInformationDAO);
+        String dateString = "2024-01-22T12:34:56";
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+        Date date = dateFormat.parse(dateString);
+        Timestamp timestamp = new Timestamp(date.getTime());
+
+        String result = accessionService.toISODateFormat(timestamp);
+
+        assertEquals(dateString, result);
+    }
+
     private class TestableAccessionService extends AccessionService {
 
         public TestableAccessionService(SampleDAO sampleDao, SampleHumanDAO sampleHumanDAO,