Merge pull request #10392 from kjellwinblad/kjell/rule_engine/add_mis…

…sing_datetime_function/EMQX-9245 freat: add date_to_unix_ts/3 function to the rule engine
emqx · Apr 17, 2023 · 0c727fc · 0c727fc
2 parents 14e807a + 37f42a4
commit 0c727fc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/apps/emqx_rule_engine/src/emqx_rule_funcs.erl b/apps/emqx_rule_engine/src/emqx_rule_funcs.erl
@@ -227,6 +227,7 @@
     now_timestamp/1,
     format_date/3,
     format_date/4,
+    date_to_unix_ts/3,
     date_to_unix_ts/4
 ]).
 
@@ -1085,6 +1086,9 @@ format_date(TimeUnit, Offset, FormatString, TimeEpoch) ->
         )
     ).
 
+date_to_unix_ts(TimeUnit, FormatString, InputString) ->
+    date_to_unix_ts(TimeUnit, "Z", FormatString, InputString).
+
 date_to_unix_ts(TimeUnit, Offset, FormatString, InputString) ->
     emqx_rule_date:parse_date(
         time_unit(TimeUnit),

diff --git a/apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl
@@ -958,7 +958,7 @@ prop_format_date_fun() ->
     Args1 = [<<"second">>, <<"+07:00">>, <<"%m--%d--%y---%H:%M:%S%Z">>],
     ?FORALL(
         S,
-        erlang:system_time(second),
+        range(0, 4000000000),
         S ==
             apply_func(
                 date_to_unix_ts,
@@ -974,7 +974,7 @@ prop_format_date_fun() ->
     Args2 = [<<"millisecond">>, <<"+04:00">>, <<"--%m--%d--%y---%H:%M:%S%Z">>],
     ?FORALL(
         S,
-        erlang:system_time(millisecond),
+        range(0, 4000000000),
         S ==
             apply_func(
                 date_to_unix_ts,
@@ -990,7 +990,7 @@ prop_format_date_fun() ->
     Args = [<<"second">>, <<"+08:00">>, <<"%y-%m-%d-%H:%M:%S%Z">>],
     ?FORALL(
         S,
-        erlang:system_time(second),
+        range(0, 4000000000),
         S ==
             apply_func(
                 date_to_unix_ts,
@@ -1002,6 +1002,24 @@ prop_format_date_fun() ->
                         )
                     ]
             )
+    ),
+    %% When no offset is specified, the offset should be taken from the formatted time string
+    ArgsNoOffset = [<<"second">>, <<"%y-%m-%d-%H:%M:%S%Z">>],
+    ArgsOffset = [<<"second">>, <<"+08:00">>, <<"%y-%m-%d-%H:%M:%S%Z">>],
+    ?FORALL(
+        S,
+        range(0, 4000000000),
+        S ==
+            apply_func(
+                date_to_unix_ts,
+                ArgsNoOffset ++
+                    [
+                        apply_func(
+                            format_date,
+                            ArgsOffset ++ [S]
+                        )
+                    ]
+            )
     ).
 
 %%------------------------------------------------------------------------------

diff --git a/changes/ce/feat-10392.en.md b/changes/ce/feat-10392.en.md
@@ -0,0 +1 @@
+A new function to convert a formatted date to an integer timestamp has been added: date_to_unix_ts/3