Skip to content

Commit

Permalink
Apply review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Kamil Waz committed Nov 21, 2022
1 parent 1d4a7ff commit 035d1e3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
12 changes: 11 additions & 1 deletion big_tests/tests/graphql_offline_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
-import(distributed_helper, [mim/0, require_rpc_nodes/1]).
-import(domain_helper, [host_type/0, domain/0]).
-import(graphql_helper, [execute_command/4, get_ok_value/2, get_err_code/1, user_to_bin/1,
get_unauthorized/1, get_not_loaded/1]).
get_unauthorized/1, get_not_loaded/1, get_coercion_err_msg/1]).
-import(config_parser_helper, [mod_config/2]).
-import(mongooseimctl_helper, [mongooseimctl/3, rpc_call/3]).

Expand Down Expand Up @@ -44,6 +44,7 @@ admin_offline_tests() ->
admin_delete_old_messages_test,
admin_delete_expired_messages2_test,
admin_delete_old_messages2_test,
admin_delete_old_messages_invalid_days,
admin_delete_expired_messages_no_domain_test,
admin_delete_old_messages_no_domain_test].

Expand All @@ -56,6 +57,7 @@ domain_admin_offline_tests() ->
admin_delete_old_messages_test,
admin_delete_expired_messages2_test,
admin_delete_old_messages2_test,
admin_delete_old_messages_invalid_days,
domain_admin_delete_expired_messages_no_permission_test,
domain_admin_delete_old_messages_no_permission_test].

Expand Down Expand Up @@ -148,6 +150,14 @@ admin_delete_old_messages2_test(Config, JidMike, JidKate) ->
admin_delete_old_messages2(Config, JidMike, JidKate, domain()),
admin_delete_old_messages2(Config, JidMike, JidKate, unprep(domain())).

admin_delete_old_messages_invalid_days(Config) ->
Result = delete_old_messages(domain(), -1, Config),
ParsedResult = get_coercion_err_msg(Result),
?assertMatch({_, _}, binary:match(ParsedResult, <<"Value is not a positive integer">>)),
Result2 = delete_old_messages(domain(), 0, Config),
ParsedResult2 = get_coercion_err_msg(Result2),
?assertMatch({_, _}, binary:match(ParsedResult2, <<"Value is not a positive integer">>)).

admin_delete_old_messages2(Config, JidMike, JidKate, Domain) ->
generate_message(JidMike, JidKate, 2, 1), % not old enough
generate_message(JidMike, JidKate, 5, -1),
Expand Down
2 changes: 1 addition & 1 deletion priv/graphql/schemas/admin/offline.gql
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ type OfflineAdminMutation @protected @use(modules: ["mod_offline"]){
deleteExpiredMessages(domain: DomainName!): String @use(arg: "domain")
@protected(type: DOMAIN, args: ["domain"])
"Delete messages at least as old as the number of days specified in the parameter"
deleteOldMessages(domain: DomainName!, days: Int!): String
deleteOldMessages(domain: DomainName!, days: PosInt!): String
@protected(type: DOMAIN, args: ["domain"]) @use(arg: "domain")
}
2 changes: 1 addition & 1 deletion src/offline/mod_offline_api.erl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
delete_expired_messages(Domain) ->
call_for_loaded_module(Domain, fun remove_expired_messages/2, [Domain]).

-spec delete_old_messages(jid:lserver(), Days :: integer()) -> api_result().
-spec delete_old_messages(jid:lserver(), Days :: pos_integer()) -> api_result().
delete_old_messages(Domain, Days) ->
call_for_loaded_module(Domain, fun remove_old_messages/3, [Domain, Days]).

Expand Down

0 comments on commit 035d1e3

Please sign in to comment.