Updated logic to properly convert zoned date time (#42)

eu-digital-green-certificates · Jul 21, 2021 · 22f1864 · 22f1864
1 parent 5ef86a8
commit 22f1864
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/.idea/sonarIssues.xml b/.idea/sonarIssues.xml
diff --git a/engine/src/main/java/dgca/verifier/app/engine/data/source/local/rules/Converters.kt b/engine/src/main/java/dgca/verifier/app/engine/data/source/local/rules/Converters.kt
@@ -30,6 +30,7 @@ import dgca.verifier.app.engine.UTC_ZONE_ID
 import java.time.Instant
 import java.time.LocalDate
 import java.time.ZonedDateTime
+import java.time.temporal.ChronoUnit
 
 
 /*-
@@ -70,16 +71,19 @@ class Converters {
 
     @TypeConverter
     fun fromTimestamp(value: Long?): ZonedDateTime = if (value != null) {
-        val instant: Instant = Instant.ofEpochMilli(value)
+        val instant: Instant = Instant.EPOCH.plus(value, ChronoUnit.MICROS)
         ZonedDateTime.ofInstant(instant, UTC_ZONE_ID)
     } else {
         ZonedDateTime.now(UTC_ZONE_ID)
     }
 
     @TypeConverter
     fun zonedDateTimeToTimestamp(zonedDateTime: ZonedDateTime?): Long {
-        return (zonedDateTime?.withZoneSameInstant(UTC_ZONE_ID)
-            ?: ZonedDateTime.now(UTC_ZONE_ID)).toInstant().toEpochMilli()
+        return ChronoUnit.MICROS.between(
+            Instant.EPOCH,
+            (zonedDateTime?.withZoneSameInstant(UTC_ZONE_ID)
+                ?: ZonedDateTime.now(UTC_ZONE_ID)).toInstant()
+        )
     }
 
     @TypeConverter

diff --git a/engine/src/test/java/dgca/verifier/app/engine/data/source/local/ConvertersTest.kt b/engine/src/test/java/dgca/verifier/app/engine/data/source/local/ConvertersTest.kt
@@ -44,6 +44,19 @@ internal class ConvertersTest {
         )
     }
 
+    @Test
+    fun testConverterEdgeCase() {
+        val converters = Converters()
+        val zonedDateTimeZone = ZonedDateTime.parse("2021-06-30T14:54:51.748565Z")
+        val timestamp = converters.zonedDateTimeToTimestamp(zonedDateTimeZone)
+        val actualZonedDateTime = converters.fromTimestamp(timestamp)
+
+        assertEquals(
+            zonedDateTimeZone.withZoneSameInstant(utcZoneId),
+            actualZonedDateTime
+        )
+    }
+
     @Test
     fun testListOfStringConverter() {
         val expected = listOf("one", "two", "three")