refactor: move time string utility to common module (#49944)

airbytehq · Dec 19, 2024 · c5bbe33 · c5bbe33
1 parent 8819bd1
commit c5bbe33
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 73 deletions.
diff --git a/...data/iceberg/parquet/TimeStringUtility.kt → ...irbyte/cdk/load/util/TimeStringUtility.kt b/...data/iceberg/parquet/TimeStringUtility.kt → ...irbyte/cdk/load/util/TimeStringUtility.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.cdk.load.data.iceberg.parquet
+package io.airbyte.cdk.load.util
 
 import io.airbyte.cdk.load.data.TimeStringToInteger
 import java.time.LocalDate
@@ -13,12 +13,17 @@ import java.time.OffsetTime
 import java.time.ZoneOffset
 import java.time.ZonedDateTime
 
+/** Collection of time/date string to time/date object conversion utilities. */
 object TimeStringUtility {
 
     fun toLocalDate(dateString: String): LocalDate {
         return LocalDate.parse(dateString, TimeStringToInteger.DATE_TIME_FORMATTER)
     }
 
+    fun toLocalDateTime(dateString: String): LocalDateTime {
+        return LocalDateTime.parse(dateString, TimeStringToInteger.DATE_TIME_FORMATTER)
+    }
+
     fun toOffset(timeString: String): LocalTime {
         return try {
             toMicrosOfDayWithTimezone(timeString)

diff --git a/airbyte-cdk/bulk/core/load/src/test/kotlin/io/airbyte/cdk/load/util/TimeStringUtilityTest.kt b/airbyte-cdk/bulk/core/load/src/test/kotlin/io/airbyte/cdk/load/util/TimeStringUtilityTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.cdk.load.util
+
+import io.airbyte.cdk.load.data.TimeStringToInteger
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetTime
+import java.time.ZoneOffset
+import java.time.ZonedDateTime
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Test
+
+internal class TimeStringUtilityTest {
+
+    @Test
+    fun testToLocalDate() {
+        val localDateString = "2024-11-18"
+        val localDate = TimeStringUtility.toLocalDate(localDateString)
+        assertEquals(
+            LocalDate.parse(localDateString, TimeStringToInteger.DATE_TIME_FORMATTER),
+            localDate
+        )
+    }
+
+    @Test
+    fun testToLocalDateInvalidDateString() {
+        val invalidDateStr = "invalid-date"
+        assertThrows(java.time.format.DateTimeParseException::class.java) {
+            TimeStringUtility.toLocalDate(invalidDateStr)
+        }
+    }
+
+    @Test
+    fun testToLocalDateTime() {
+        val localDateTimeString = "2024-11-18T12:34:56Z"
+        val localDateTime = TimeStringUtility.toLocalDateTime(localDateTimeString)
+        assertEquals(
+            LocalDateTime.parse(localDateTimeString, TimeStringToInteger.DATE_TIME_FORMATTER),
+            localDateTime
+        )
+    }
+
+    @Test
+    fun testToOffsetWithTimezone() {
+        val offsetWithTimezoneString = "12:34:56Z"
+        val offsetWithTimezone = TimeStringUtility.toOffset(offsetWithTimezoneString)
+        assertEquals(
+            OffsetTime.parse(offsetWithTimezoneString, TimeStringToInteger.TIME_FORMATTER)
+                .toLocalTime(),
+            offsetWithTimezone
+        )
+    }
+
+    @Test
+    fun testToOffsetWithoutTimezone() {
+        val offsetWithoutTimezoneString = "12:34:56"
+        val offsetWithoutTimezone = TimeStringUtility.toOffset(offsetWithoutTimezoneString)
+        assertEquals(
+            LocalTime.parse(offsetWithoutTimezoneString, TimeStringToInteger.TIME_FORMATTER),
+            offsetWithoutTimezone
+        )
+    }
+
+    @Test
+    fun testToOffsetDateTimeWithTimezone() {
+        val offsetWithTimezoneString = "2024-11-18T12:34:56Z"
+        val offsetWithTimezone = TimeStringUtility.toOffsetDateTime(offsetWithTimezoneString)
+        assertEquals(
+            ZonedDateTime.parse(offsetWithTimezoneString, TimeStringToInteger.DATE_TIME_FORMATTER)
+                .toOffsetDateTime(),
+            offsetWithTimezone
+        )
+    }
+
+    @Test
+    fun testToOffsetDateTimeWithoutTimezone() {
+        val offsetWithoutTimezoneString = "2024-11-18T12:34:56"
+        val offsetWithoutTimezone = TimeStringUtility.toOffsetDateTime(offsetWithoutTimezoneString)
+        assertEquals(
+            LocalDateTime.parse(
+                    offsetWithoutTimezoneString,
+                    TimeStringToInteger.DATE_TIME_FORMATTER
+                )
+                .atOffset(ZoneOffset.UTC),
+            offsetWithoutTimezone
+        )
+    }
+
+    @Test
+    fun testToOffsetDateTimeInvalidFormat() {
+        val invalidDateTime = "invalid-datetime"
+        assertThrows(java.time.format.DateTimeParseException::class.java) {
+            TimeStringUtility.toOffsetDateTime(invalidDateTime)
+        }
+    }
+}
diff --git a/...t/src/main/kotlin/io/airbyte/cdk/load/data/iceberg/parquet/AirbyteValueToIcebergRecord.kt b/...t/src/main/kotlin/io/airbyte/cdk/load/data/iceberg/parquet/AirbyteValueToIcebergRecord.kt
@@ -15,6 +15,7 @@ import io.airbyte.cdk.load.data.StringValue
 import io.airbyte.cdk.load.data.TimeValue
 import io.airbyte.cdk.load.data.TimestampValue
 import io.airbyte.cdk.load.data.UnknownValue
+import io.airbyte.cdk.load.util.TimeStringUtility
 import org.apache.iceberg.Schema
 import org.apache.iceberg.data.GenericRecord
 import org.apache.iceberg.types.Type

diff --git a/...rc/testFixtures/kotlin/io/airbyte/cdk/load/data/icerberg/parquet/TimeStringUtilityTest.kt b/...rc/testFixtures/kotlin/io/airbyte/cdk/load/data/icerberg/parquet/TimeStringUtilityTest.kt