Support for additional time format for ZonedDateTime

Author: tencnivel

Project.toml

@@ -1,7 +1,7 @@
 name = "PostgresORM"
 uuid = "748b5efa-ed57-4836-b183-a38105a77fdd"
 authors = ["Vincent Laugier <vincent.laugier@gmail.com>"]
-version = "0.4.0"
+version = "0.5.0"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

src/PostgresORMUtil/utils.jl

@@ -179,10 +179,10 @@ function vector_of_integers2vector_of_enums(
 end
 
 function string2zoneddatetime(str)
-    # eg. "2019-09-03T11:00:00.000Z"
+
+    # Attempt 1: eg. "2019-09-03T11:00:00.000Z"
     date_match_GMT =
         match(r"^([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{3}Z)$", str)
-
     if !isnothing(date_match_GMT)
         # "2019-07-24T00:41:49.732Z" becomes "2019-07-24T00:41:49.732"
         date_match_remove_endingZ =
@@ -192,10 +192,28 @@ function string2zoneddatetime(str)
             ZonedDateTime(DateTime(date_match_remove_endingZ.match),
                           TimeZone("UTC"))
         return utc_zdt
-    else
-        return nothing
     end
 
+    # Attempt 2: eg. "2022-04-09T18:06:26+02:00"
+    date_match_with_tz1 =
+        match(r"^([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\+[0-9]{2}:[0-9]{2})$", str)
+    if !isnothing(date_match_with_tz1)
+        zdt =
+            ZonedDateTime(date_match_with_tz1.match,"yyyy-mm-ddTHH:MM:SSzzzz")
+        return zdt
+    end
+
+    # Attempt 3: eg. "2022-04-08T02:30:22.668+02:00"
+    date_match_with_tz1 =
+        match(r"^([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{3}\+[0-9]{2}:[0-9]{2})$", str)
+    if !isnothing(date_match_with_tz1)
+        zdt =
+            ZonedDateTime(date_match_with_tz1.match,"yyyy-mm-ddTHH:MM:SS.ssszzzz")
+        return zdt
+    end
+
+    return nothing
+
 end
 
 function int2enum(enumType::DataType,enum_int::Missing)

test/PostgresORMUtil/runtests-utils.jl

@@ -92,7 +92,9 @@ end
 end
 
 @testset "Test utils.jl - function `string2zoneddatetime`" begin
-    PostgresORMUtil.string2zoneddatetime("2019-09-03T11:00:00.000Z")
+    PostgresORMUtil.string2zoneddatetime("2019-09-03T11:00:00.000Z") |> string |> ZonedDateTime
+    PostgresORMUtil.string2zoneddatetime("2022-04-09T18:06:26+01:30")
+    PostgresORMUtil.string2zoneddatetime("2022-04-08T02:30:22.668+03:00")
 end
 
 @testset "Test utils.jl - function `postgresql_string_array_2_string_vector`" begin

test/runtests-prerequisite.jl

@@ -13,3 +13,4 @@ using PostgresORM
 using PostgresORM.PostgresORMUtil
 using PostgresORM.PostgresORMUtil.Pluralize
 using PostgresORM.Tool
+using TimeZones