ED-305: withdrawal repair tools

apps/ff_cth/src/ct_domain_config.erl

@@ -6,6 +6,8 @@
 
 -export([head/0]).
 
+-export([all/1]).
+-export([checkout_object/2]).
 -export([commit/2]).
 -export([insert/1]).
 -export([update/1]).
@@ -21,6 +23,7 @@
 
 -type revision() :: dmt_client:version().
 -type object() :: dmsl_domain_thrift:'DomainObject'().
+-type object_ref() :: dmt_client:object_ref().
 
 -spec head() -> revision().
 head() ->
@@ -31,6 +34,11 @@ all(Revision) ->
     #'Snapshot'{domain = Domain} = dmt_client:checkout(Revision),
     Domain.
 
+-spec checkout_object(revision(), object_ref()) -> object() | no_return().
+checkout_object(Revision, ObjectRef) ->
+    #'Snapshot'{domain = Domain} = dmt_client:checkout(Revision),
+    maps:get(ObjectRef, Domain).
+
 -spec commit(revision(), dmt_client:commit()) -> revision() | no_return().
 commit(Revision, Commit) ->
     dmt_client:commit(Revision, Commit).

apps/ff_server/src/ff_server.erl

@@ -93,7 +93,7 @@ init([]) ->
             {withdrawal_session_management, ff_withdrawal_session_handler},
             {deposit_management, ff_deposit_handler},
             {withdrawal_session_repairer, ff_withdrawal_session_repair},
-            {withdrawal_repairer, ff_withdrawal_repair},
+            {withdrawal_repairer, ff_withdrawal_repair_handler},
             {deposit_repairer, ff_deposit_repair},
             {w2w_transfer_management, ff_w2w_transfer_handler},
             {w2w_transfer_repairer, ff_w2w_transfer_repair}

apps/ff_server/src/ff_withdrawal_codec.erl

@@ -203,6 +203,12 @@ unmarshal(repair_scenario, {add_events, #wthd_AddEventsRepair{events = Events, a
             events => unmarshal({list, change}, Events),
             action => maybe_unmarshal(complex_action, Action)
         })};
+unmarshal(repair_scenario, {routing, RoutingScenarioType}) ->
+    {routing, unmarshal(repair_scenario_routing, RoutingScenarioType)};
+unmarshal(repair_scenario_routing, {route_changed, #wthd_RoutingRepairRouteChanged{route = Route}}) ->
+    {route_changed, unmarshal(route, Route)};
+unmarshal(repair_scenario_routing, {route_not_found, #wthd_RoutingRepairRouteNotFound{reason = Reason}}) ->
+    {route_not_found, maybe_unmarshal(string, Reason)};
 unmarshal(change, {created, #wthd_CreatedChange{withdrawal = Withdrawal}}) ->
     {created, unmarshal(withdrawal, Withdrawal)};
 unmarshal(change, {status_changed, #wthd_StatusChange{status = Status}}) ->

apps/ff_server/src/ff_withdrawal_repair.erl → apps/ff_server/src/ff_withdrawal_repair_handler.erl

@@ -1,4 +1,4 @@
--module(ff_withdrawal_repair).
+-module(ff_withdrawal_repair_handler).
 
 -behaviour(ff_woody_wrapper).
 

apps/ff_transfer/src/ff_withdrawal.erl

@@ -7,6 +7,8 @@
 -include_lib("damsel/include/dmsl_payment_processing_thrift.hrl").
 -include_lib("damsel/include/dmsl_withdrawals_provider_adapter_thrift.hrl").
 
+-include_lib("fistful_proto/include/ff_proto_withdrawal_thrift.hrl").
+
 -type id() :: binary().
 -type clock() :: ff_transaction:clock().
 
@@ -24,6 +26,7 @@
     attempts => attempts(),
     resource => destination_resource(),
     adjustments => adjustments_index(),
+    repair_scenario => repair_scenario(),
     status => status(),
     metadata => metadata(),
     external_id => id()
@@ -170,7 +173,7 @@
 -type invalid_withdrawal_status_error() ::
     {invalid_withdrawal_status, status()}.
 
--type action() :: sleep | continue | undefined.
+-type action() :: sleep | continue | undefined | {set_timer, integer()}.
 
 -export_type([withdrawal/0]).
 -export_type([withdrawal_state/0]).
@@ -204,6 +207,7 @@
 -export([id/1]).
 -export([body/1]).
 -export([status/1]).
+-export([activity/1]).
 -export([route/1]).
 -export([attempts/1]).
 -export([external_id/1]).
@@ -223,6 +227,7 @@
 -export([start_adjustment/2]).
 -export([find_adjustment/2]).
 -export([adjustments/1]).
+-export([start_repair/2]).
 -export([effective_final_cash_flow/1]).
 -export([sessions/1]).
 -export([session_id/1]).
@@ -260,6 +265,7 @@
 -type adjustment() :: ff_adjustment:adjustment().
 -type adjustment_id() :: ff_adjustment:id().
 -type adjustments_index() :: ff_adjustment_utils:index().
+-type repair_scenario() :: ff_repair:scenario().
 -type currency_id() :: ff_currency:id().
 -type party_revision() :: ff_party:revision().
 -type domain_revision() :: ff_domain_config:revision().
@@ -307,7 +313,7 @@
 
 -type fail_type() ::
     limit_check
-    | route_not_found
+    | route_not_found | {route_not_found, binary()}
     | {inconsistent_quote_route, {provider_id, provider_id()} | {terminal_id, terminal_id()}}
     | session.
 
@@ -355,6 +361,10 @@ status(T) ->
 route(T) ->
     maps:get(route, T, undefined).
 
+-spec activity(withdrawal_state()) -> activity().
+activity(T) ->
+    deduce_activity(T).
+
 -spec attempts(withdrawal_state()) -> attempts().
 attempts(#{attempts := Attempts}) ->
     Attempts;
@@ -446,7 +456,7 @@ create(Params) ->
             destination_id => DestinationID,
             quote => Quote
         }),
-        [
+        Result = [
             {created,
                 genlib_map:compact(#{
                     version => ?ACTUAL_FORMAT_VERSION,
@@ -462,7 +472,8 @@ create(Params) ->
                 })},
             {status_changed, pending},
             {resource_got, Resource}
-        ]
+        ],
+        Result
     end).
 
 create_resource(
@@ -537,12 +548,31 @@ is_finished(#{status := {failed, _}}) ->
 is_finished(#{status := pending}) ->
     false.
 
+-spec start_repair(repair_scenario(), withdrawal_state()) -> {ok, process_result()}.
+start_repair(Scenario, St) ->
+    Activity = ff_withdrawal:activity(St),
+    %TODO: после вызова process_transfer активити заново высчитывается, надо продумать правильно ли здесь проверять совместимость со сценарием
+    ok = check_activity_compatibility(Scenario, Activity),
+    RepairState = St#{repair_scenario => Scenario},
+    {ok, process_transfer(RepairState)}.
+
+check_activity_compatibility({routing, _}, Activity) when Activity =:= routing ->
+    ok;
+%TODO: activity_not_compatible_with_scenario - или что-то другое? Реализовать в протоколе и тут
+check_activity_compatibility(Scenario, Activity) ->
+    throw({exception, {activity_not_compatible_with_scenario, Activity, Scenario}}).
+
 %% Transfer callbacks
 
 -spec process_transfer(withdrawal_state()) -> process_result().
 process_transfer(Withdrawal) ->
     Activity = deduce_activity(Withdrawal),
-    do_process_transfer(Activity, Withdrawal).
+    case Withdrawal of
+        #{repair_scenario := RepairScenario} ->
+            do_process_repair(RepairScenario, Withdrawal);
+        _ ->
+            do_process_transfer(Activity, Withdrawal)
+    end.
 
 %%
 
@@ -729,6 +759,10 @@ do_finished_activity(#{status := succeeded, p_transfer := committed}) ->
 do_finished_activity(#{status := {failed, _}, p_transfer := cancelled}) ->
     stop.
 
+-spec do_process_repair(repair_scenario(), withdrawal_state()) -> process_result().
+do_process_repair(Scenario, Withdrawal) ->
+    process_repair(Scenario, Withdrawal).
+
 -spec do_process_transfer(activity(), withdrawal_state()) -> process_result().
 do_process_transfer(routing, Withdrawal) ->
     process_routing(Withdrawal);
@@ -761,6 +795,12 @@ do_process_transfer(adjustment, Withdrawal) ->
 do_process_transfer(stop, _Withdrawal) ->
     {undefined, []}.
 
+-spec process_repair(repair_scenario(), withdrawal_state()) -> process_result().
+process_repair({routing, {route_changed, Route}}, _Withdrawal) ->
+    {{set_timer, 0}, [{route_changed, Route}]};
+process_repair({routing, {route_not_found, _} = FailType}, Withdrawal) ->
+    process_transfer_fail(FailType, Withdrawal).
+
 -spec process_routing(withdrawal_state()) -> process_result().
 process_routing(Withdrawal) ->
     case do_process_routing(Withdrawal) of
@@ -1350,6 +1390,7 @@ get_current_session_status(Withdrawal) ->
             pending
     end.
 
+
 %% Withdrawal validators
 
 -spec validate_withdrawal_creation(terms(), body(), wallet(), destination()) ->
@@ -1726,9 +1767,11 @@ build_failure(limit_check, Withdrawal) ->
             }
     end;
 build_failure(route_not_found, _Withdrawal) ->
-    #{
-        code => <<"no_route_found">>
-    };
+    #{code => <<"no_route_found">>};
+build_failure({route_not_found, undefined}, Withdrawal) ->
+    build_failure(route_not_found, Withdrawal);
+build_failure({route_not_found, Reason}, _Withdrawal) ->
+    #{code => Reason};
 build_failure({inconsistent_quote_route, {Type, FoundID}}, Withdrawal) ->
     Details =
         {inconsistent_quote_route, #{

apps/ff_transfer/src/ff_withdrawal_machine.erl

@@ -188,8 +188,18 @@ process_call(CallArgs, _Machine, _, _Opts) ->
 
 -spec process_repair(ff_repair:scenario(), machine(), handler_args(), handler_opts()) ->
     {ok, {repair_response(), result()}} | {error, repair_error()}.
+process_repair({add_events, _} = Scenario, Machine, _Args, _Opts) ->
+    ff_repair:apply_scenario(ff_withdrawal, Machine, Scenario);
 process_repair(Scenario, Machine, _Args, _Opts) ->
-    ff_repair:apply_scenario(ff_withdrawal, Machine, Scenario).
+    St = ff_machine:collapse(ff_withdrawal, Machine),
+    {ok, ScenarioResult} = ff_withdrawal:start_repair(Scenario, withdrawal(St)),
+    ProcessedResult = process_result(ScenarioResult, St),
+    case ff_repair:validate_scenario_result(ff_withdrawal, Machine, ProcessedResult) of
+        {ok, valid} ->
+            {ok, {ok, ProcessedResult}};
+        {error, _Reason} = Error ->
+            {Error, #{}}
+    end.
 
 -spec do_start_adjustment(adjustment_params(), machine()) -> {Response, result()} when
     Response :: ok | {error, ff_withdrawal:start_adjustment_error()}.
@@ -229,7 +239,9 @@ set_action(continue, _St) ->
 set_action(undefined, _St) ->
     undefined;
 set_action(sleep, _St) ->
-    unset_timer.
+    unset_timer;
+set_action({set_timer, Timeout}, _St) ->
+    {set_timer, {timeout, Timeout}}.
 
 call(ID, Call) ->
     case machinery:call(?NS, ID, Call, backend()) of