Makes get_batch/get_values lenient to nonexistent limit-configs too (#42)

Author: nanodirijabl

apps/limiter/src/lim_config_machine.erl

@@ -305,7 +305,7 @@ rollback(#limiter_LimitChange{id = ID, version = Version} = LimitChange, LimitCo
     {ok, [lim_liminator:limit_response()]} | {error, config_error() | {processor(), get_limit_error()}}.
 get_values(LimitChanges, LimitContext) ->
     do(fun() ->
-        Changes = unwrap(collect_changes(hold, LimitChanges, LimitContext, strict)),
+        Changes = unwrap(collect_changes(hold, LimitChanges, LimitContext, lenient)),
         Names = lists:map(fun lim_liminator:get_name/1, Changes),
         unwrap(lim_liminator:get_values(Names, LimitContext))
     end).
@@ -318,7 +318,7 @@ get_batch(OperationID, LimitChanges, LimitContext) ->
             OperationID,
             lim_liminator:get(
                 OperationID,
-                unwrap(collect_changes(hold, LimitChanges, LimitContext, strict)),
+                unwrap(collect_changes(hold, LimitChanges, LimitContext, lenient)),
                 LimitContext
             )
         )

apps/limiter/src/lim_liminator.erl

@@ -43,11 +43,15 @@ get_name(#liminator_LimitChange{limit_name = Name}) ->
 
 -spec get_values([limit_name()], lim_context()) ->
     {ok, [limit_response()]} | {error, invalid_request_error()}.
+get_values([], _LimitContext) ->
+    {ok, []};
 get_values(Names, LimitContext) ->
     do('GetLastLimitsValues', Names, LimitContext).
 
 -spec get(operation_id(), [limit_change()], lim_context()) ->
     {ok, [limit_response()]} | {error, invalid_request_error()}.
+get(_OperationID, [], _LimitContext) ->
+    {ok, []};
 get(OperationID, Changes, LimitContext) ->
     do('Get', #liminator_LimitRequest{operation_id = OperationID, limit_changes = Changes}, LimitContext).
 

apps/limiter/test/lim_turnover_SUITE.erl

@@ -70,6 +70,8 @@
 -export([batch_commit_ok/1]).
 -export([batch_rollback_ok/1]).
 -export([batch_rollback_lenient_to_config_notfound_ok/1]).
+-export([batch_get_values_lenient_to_config_notfound_ok/1]).
+-export([batch_hold_strict_to_config_notfound_ok/1]).
 -export([two_batch_hold_ok/1]).
 -export([two_batch_commit_ok/1]).
 -export([two_batch_rollback_ok/1]).
@@ -140,6 +142,8 @@ groups() ->
             batch_commit_ok,
             batch_rollback_ok,
             batch_rollback_lenient_to_config_notfound_ok,
+            batch_get_values_lenient_to_config_notfound_ok,
+            batch_hold_strict_to_config_notfound_ok,
             two_batch_hold_ok,
             two_batch_commit_ok,
             two_batch_rollback_ok,
@@ -879,6 +883,10 @@ construct_request(C) ->
         ?LIMIT_CHANGE(ID2, 0, Version2)
     ]).
 
+add_non_existent_limit_config(?LIMIT_REQUEST(_ID, Changes) = Request) ->
+    NonexistentChange = ?LIMIT_CHANGE(<<"this-does-not-exist">>, 0, dmt_client:get_last_version()),
+    Request#limiter_LimitRequest{limit_changes = [NonexistentChange | Changes]}.
+
 -spec batch_hold_ok(config()) -> _.
 batch_hold_ok(C) ->
     Context =
@@ -922,15 +930,37 @@ batch_rollback_lenient_to_config_notfound_ok(C) ->
         end,
     Request0 = construct_request(C),
     ok = hold_and_assert_batch(10, Request0, Context, C),
-    Request1 = Request0#limiter_LimitRequest{
-        limit_changes = [
-            ?LIMIT_CHANGE(<<"this-does-not-exist">>, 0, dmt_client:get_last_version())
-            | Request0#limiter_LimitRequest.limit_changes
-        ]
-    },
+    Request1 = add_non_existent_limit_config(Request0),
     {ok, ok} = lim_client:rollback_batch(Request1, Context, ?config(client, C)),
     ok = assert_values(0, Request0, Context, C).
 
+-spec batch_get_values_lenient_to_config_notfound_ok(config()) -> _.
+batch_get_values_lenient_to_config_notfound_ok(C) ->
+    Context =
+        case get_group_name(C) of
+            withdrawals -> ?wthdproc_ctx_withdrawal(?cash(10));
+            _Default -> ?payproc_ctx_payment(?cash(10), ?cash(10))
+        end,
+    Request0 = construct_request(C),
+    ok = hold_and_assert_batch(10, Request0, Context, C),
+    Request1 = add_non_existent_limit_config(Request0),
+    ok = assert_batch(10, Request1, Context, C),
+    ok = assert_values(10, Request1, Context, C).
+
+-spec batch_hold_strict_to_config_notfound_ok(config()) -> _.
+batch_hold_strict_to_config_notfound_ok(C) ->
+    Context =
+        case get_group_name(C) of
+            withdrawals -> ?wthdproc_ctx_withdrawal(?cash(10));
+            _Default -> ?payproc_ctx_payment(?cash(10), ?cash(10))
+        end,
+    Request0 = construct_request(C),
+    Request1 = add_non_existent_limit_config(Request0),
+    ?assertEqual(
+        {exception, #limiter_LimitNotFound{}},
+        lim_client:hold_batch(Request1, Context, ?config(client, C))
+    ).
+
 -spec two_batch_hold_ok(config()) -> _.
 two_batch_hold_ok(C) ->
     Context =