Skip to content

Commit

Permalink
feat: add date_to_unix_ts/3 function to the rule engine
Browse files Browse the repository at this point in the history
  • Loading branch information
kjellwinblad committed Apr 13, 2023
1 parent f3446c4 commit d3ccd8a
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
9 changes: 9 additions & 0 deletions apps/emqx_rule_engine/src/emqx_rule_funcs.erl
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@
now_timestamp/1,
format_date/3,
format_date/4,
date_to_unix_ts/3,
date_to_unix_ts/4
]).

Expand Down Expand Up @@ -1085,6 +1086,14 @@ format_date(TimeUnit, Offset, FormatString, TimeEpoch) ->
)
).

date_to_unix_ts(TimeUnit, FormatString, InputString) ->
emqx_rule_date:parse_date(
time_unit(TimeUnit),
"Z",
emqx_plugin_libs_rule:str(FormatString),
emqx_plugin_libs_rule:str(InputString)
).

date_to_unix_ts(TimeUnit, Offset, FormatString, InputString) ->
emqx_rule_date:parse_date(
time_unit(TimeUnit),
Expand Down
18 changes: 18 additions & 0 deletions apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,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,
erlang:system_time(second),
S ==
apply_func(
date_to_unix_ts,
ArgsNoOffset ++
[
apply_func(
format_date,
ArgsOffset ++ [S]
)
]
)
).

%%------------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions changes/ce/feat-10392.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A new function to convert a formatted date to an integer timestamp has been added: date_to_unix_ts/3

0 comments on commit d3ccd8a

Please sign in to comment.