TD-365: Continue trying to create a withdrawal when no binbase data is available (#38)

kehitt · web-flow · commit e9e05cee9260 · 2022-08-03T14:32:56.000+03:00
diff --git a/Makefile b/Makefile
@@ -80,6 +80,8 @@ check-format:
 dialyze:
 	$(REBAR) as test dialyzer
 
+static-check: check-format lint xref dialyze
+
 release:
 	$(REBAR) as prod release
 
diff --git a/apps/ff_cth/src/ct_payment_system.erl b/apps/ff_cth/src/ct_payment_system.erl
@@ -828,19 +828,26 @@ default_termset(Options) ->
                         },
                         #domain_CashFlowDecision{
                             if_ =
-                                {all_of,
+                                {any_of,
                                     ?ordset([
-                                        {condition, {currency_is, ?cur(<<"RUB">>)}},
-                                        {condition,
-                                            {payment_tool,
-                                                {bank_card, #domain_BankCardCondition{
-                                                    definition =
-                                                        {payment_system, #domain_PaymentSystemCondition{
-                                                            payment_system_is = #domain_PaymentSystemRef{
-                                                                id = <<"VISA">>
-                                                            }
-                                                        }}
-                                                }}}}
+                                        {all_of,
+                                            ?ordset([
+                                                {condition, {currency_is, ?cur(<<"RUB">>)}},
+                                                {condition,
+                                                    {payment_tool,
+                                                        {bank_card, #domain_BankCardCondition{
+                                                            definition =
+                                                                {payment_system, #domain_PaymentSystemCondition{
+                                                                    payment_system_is = #domain_PaymentSystemRef{
+                                                                        id = <<"VISA">>
+                                                                    }
+                                                                }}
+                                                        }}}}
+                                            ])},
+                                        {all_of,
+                                            ?ordset([
+                                                condition(cost_in, {424242, <<"RUB">>})
+                                            ])}
                                     ])},
                             then_ =
                                 {value, [
diff --git a/apps/ff_server/src/ff_withdrawal_handler.erl b/apps/ff_server/src/ff_withdrawal_handler.erl
@@ -60,9 +60,7 @@ handle_function_('GetQuote', {MarshaledParams}, _Opts) ->
             woody_error:raise(business, #wthd_IdentityProvidersMismatch{
                 wallet_provider = ff_codec:marshal(identity_provider, WalletProvider),
                 destination_provider = ff_codec:marshal(identity_provider, DestinationProvider)
-            });
-        {error, {destination_resource, {bin_data, _}}} ->
-            woody_error:raise(business, #wthd_NoDestinationResourceInfo{})
+            })
     end;
 handle_function_('Create', {MarshaledParams, MarshaledContext}, Opts) ->
     Params = ff_withdrawal_codec:unmarshal_withdrawal_params(MarshaledParams),
@@ -107,9 +105,7 @@ handle_function_('Create', {MarshaledParams, MarshaledContext}, Opts) ->
             woody_error:raise(business, #wthd_IdentityProvidersMismatch{
                 wallet_provider = ff_codec:marshal(identity_provider, WalletProvider),
                 destination_provider = ff_codec:marshal(identity_provider, DestinationProvider)
-            });
-        {error, {destination_resource, {bin_data, not_found}}} ->
-            woody_error:raise(business, #wthd_NoDestinationResourceInfo{})
+            })
     end;
 handle_function_('Get', {ID, EventRange}, _Opts) ->
     ok = scoper:add_meta(#{id => ID}),
diff --git a/apps/ff_server/test/ff_withdrawal_handler_SUITE.erl b/apps/ff_server/test/ff_withdrawal_handler_SUITE.erl
@@ -22,7 +22,8 @@
 -export([create_cashlimit_validation_error_test/1]).
 -export([create_inconsistent_currency_validation_error_test/1]).
 -export([create_currency_validation_error_test/1]).
--export([create_destination_resource_notfound_test/1]).
+-export([create_destination_resource_no_bindata_ok_test/1]).
+-export([create_destination_resource_no_bindata_fail_test/1]).
 -export([create_destination_notfound_test/1]).
 -export([create_destination_generic_ok_test/1]).
 -export([create_wallet_notfound_test/1]).
@@ -55,7 +56,8 @@ groups() ->
             create_cashlimit_validation_error_test,
             create_currency_validation_error_test,
             create_inconsistent_currency_validation_error_test,
-            create_destination_resource_notfound_test,
+            create_destination_resource_no_bindata_ok_test,
+            create_destination_resource_no_bindata_fail_test,
             create_destination_notfound_test,
             create_destination_generic_ok_test,
             create_wallet_notfound_test,
@@ -280,8 +282,8 @@ create_inconsistent_currency_validation_error_test(C) ->
     },
     ?assertEqual({exception, ExpectedError}, Result).
 
--spec create_destination_resource_notfound_test(config()) -> test_return().
-create_destination_resource_notfound_test(C) ->
+-spec create_destination_resource_no_bindata_fail_test(config()) -> test_return().
+create_destination_resource_no_bindata_fail_test(C) ->
     Cash = make_cash({100, <<"RUB">>}),
     #{
         wallet_id := WalletID,
@@ -293,9 +295,27 @@ create_destination_resource_notfound_test(C) ->
         destination_id = DestinationID,
         body = Cash
     },
+    ?assertError(
+        {woody_error, {external, result_unexpected, _}},
+        call_withdrawal('Create', {Params, #{}})
+    ).
+
+-spec create_destination_resource_no_bindata_ok_test(config()) -> test_return().
+create_destination_resource_no_bindata_ok_test(C) ->
+    %% As per test terms this specific cash amount results in valid cashflow without bin data
+    Cash = make_cash({424242, <<"RUB">>}),
+    #{
+        wallet_id := WalletID,
+        destination_id := DestinationID
+    } = prepare_standard_environment(Cash, <<"TEST_NOTFOUND">>, C),
+    Params = #wthd_WithdrawalParams{
+        id = generate_id(),
+        wallet_id = WalletID,
+        destination_id = DestinationID,
+        body = Cash
+    },
     Result = call_withdrawal('Create', {Params, #{}}),
-    ExpectedError = #wthd_NoDestinationResourceInfo{},
-    ?assertEqual({exception, ExpectedError}, Result).
+    ?assertMatch({ok, _}, Result).
 
 -spec create_destination_notfound_test(config()) -> test_return().
 create_destination_notfound_test(C) ->
diff --git a/apps/ff_transfer/src/ff_withdrawal.erl b/apps/ff_transfer/src/ff_withdrawal.erl
@@ -464,17 +464,13 @@ create_resource(
     Identity,
     DomainRevision
 ) ->
-    case ff_resource:get_bin_data(Token, ResourceDescriptor) of
-        {ok, BinData} ->
-            Varset = #{
-                bin_data => ff_dmsl_codec:marshal(bin_data, BinData)
-            },
-            {ok, PaymentInstitution} = get_payment_institution(Identity, Varset, DomainRevision),
-            PaymentSystem = unwrap(ff_payment_institution:payment_system(PaymentInstitution)),
-            ff_resource:create_bank_card_basic(ResourceBankCardParams, BinData, PaymentSystem);
-        {error, Error} ->
-            {error, {bin_data, Error}}
-    end;
+    BinData = ff_maybe:from_result(ff_resource:get_bin_data(Token, ResourceDescriptor)),
+    Varset = #{
+        bin_data => ff_dmsl_codec:maybe_marshal(bin_data, BinData)
+    },
+    {ok, PaymentInstitution} = get_payment_institution(Identity, Varset, DomainRevision),
+    PaymentSystem = ff_maybe:from_result(ff_payment_institution:payment_system(PaymentInstitution)),
+    ff_resource:create_bank_card_basic(ResourceBankCardParams, BinData, PaymentSystem);
 create_resource(ResourceParams, ResourceDescriptor, _Identity, _DomainRevision) ->
     ff_resource:create_resource(ResourceParams, ResourceDescriptor).
 
diff --git a/apps/ff_transfer/test/ff_withdrawal_SUITE.erl b/apps/ff_transfer/test/ff_withdrawal_SUITE.erl
@@ -30,7 +30,8 @@
 -export([create_identity_providers_mismatch_error_test/1]).
 -export([create_destination_currency_validation_error_test/1]).
 -export([create_currency_validation_error_test/1]).
--export([create_destination_resource_notfound_test/1]).
+-export([create_destination_resource_no_bindata_ok_test/1]).
+-export([create_destination_resource_no_bindata_fail_test/1]).
 -export([create_destination_notfound_test/1]).
 -export([create_wallet_notfound_test/1]).
 -export([create_ok_test/1]).
@@ -89,7 +90,8 @@ groups() ->
             create_destination_currency_validation_error_test,
             create_currency_validation_error_test,
             create_identity_providers_mismatch_error_test,
-            create_destination_resource_notfound_test,
+            create_destination_resource_no_bindata_ok_test,
+            create_destination_resource_no_bindata_fail_test,
             create_destination_notfound_test,
             create_wallet_notfound_test,
             create_ok_test,
@@ -395,8 +397,8 @@ create_identity_providers_mismatch_error_test(C) ->
     Result = ff_withdrawal_machine:create(WithdrawalParams, ff_entity_context:new()),
     ?assertMatch({error, {identity_providers_mismatch, {<<"good-two">>, <<"good-one">>}}}, Result).
 
--spec create_destination_resource_notfound_test(config()) -> test_return().
-create_destination_resource_notfound_test(C) ->
+-spec create_destination_resource_no_bindata_fail_test(config()) -> test_return().
+create_destination_resource_no_bindata_fail_test(C) ->
     Cash = {100, <<"RUB">>},
     #{
         wallet_id := WalletID,
@@ -409,8 +411,28 @@ create_destination_resource_notfound_test(C) ->
         wallet_id => WalletID,
         body => Cash
     },
+    ?assertError(
+        {badmatch, {error, {invalid_terms, {not_reduced, _}}}},
+        ff_withdrawal_machine:create(WithdrawalParams, ff_entity_context:new())
+    ).
+
+-spec create_destination_resource_no_bindata_ok_test(config()) -> test_return().
+create_destination_resource_no_bindata_ok_test(C) ->
+    %% As per test terms this specific cash amount results in valid cashflow without bin data
+    Cash = {424242, <<"RUB">>},
+    #{
+        wallet_id := WalletID,
+        destination_id := DestinationID
+    } = prepare_standard_environment(Cash, <<"TEST_NOTFOUND">>, C),
+    WithdrawalID = generate_id(),
+    WithdrawalParams = #{
+        id => WithdrawalID,
+        destination_id => DestinationID,
+        wallet_id => WalletID,
+        body => Cash
+    },
     Result = ff_withdrawal_machine:create(WithdrawalParams, ff_entity_context:new()),
-    ?assertMatch({error, {destination_resource, {bin_data, not_found}}}, Result).
+    ?assertMatch(ok, Result).
 
 -spec create_destination_notfound_test(config()) -> test_return().
 create_destination_notfound_test(C) ->
diff --git a/apps/fistful/src/ff_dmsl_codec.erl b/apps/fistful/src/ff_dmsl_codec.erl
@@ -4,7 +4,9 @@
 -include_lib("damsel/include/dmsl_user_interaction_thrift.hrl").
 
 -export([unmarshal/2]).
+-export([maybe_unmarshal/2]).
 -export([marshal/2]).
+-export([maybe_marshal/2]).
 
 %% Types
 
@@ -211,6 +213,7 @@ unmarshal(string, V) when is_binary(V) ->
 unmarshal(integer, V) when is_integer(V) ->
     V.
 
+-spec maybe_unmarshal(ff_dmsl_codec:type_name(), ff_dmsl_codec:encoded_value()) -> ff_dmsl_codec:decoded_value().
 maybe_unmarshal(_Type, undefined) ->
     undefined;
 maybe_unmarshal(Type, V) ->
@@ -369,6 +372,7 @@ marshal(integer, V) when is_integer(V) ->
 marshal(_, Other) ->
     Other.
 
+-spec maybe_marshal(ff_dmsl_codec:type_name(), ff_dmsl_codec:decoded_value()) -> ff_dmsl_codec:encoded_value().
 maybe_marshal(_Type, undefined) ->
     undefined;
 maybe_marshal(Type, Value) ->
diff --git a/apps/fistful/src/ff_resource.erl b/apps/fistful/src/ff_resource.erl
@@ -312,16 +312,15 @@ create_bank_card(#{bank_card := #{token := Token}} = ResourceBankCardParams, Res
             {error, {bin_data, Error}}
     end.
 
--spec create_bank_card_basic(resource_bank_card_params(), bin_data(), payment_system() | undefined) -> {ok, resource()}.
+-spec create_bank_card_basic(resource_bank_card_params(), bin_data() | undefined, payment_system() | undefined) ->
+    {ok, resource()}.
 create_bank_card_basic(#{bank_card := BankCardParams0} = ResourceBankCardParams, BinData, PaymentSystem) ->
-    KeyList = [bank_name, issuer_country, card_type, category],
-    ExtendData0 = maps:with(KeyList, BinData),
-    ExtendData1 = ExtendData0#{bin_data_id => ff_bin_data:id(BinData)},
+    ExtendData = create_extended_data(BinData),
     BankCardParams1 = genlib_map:compact(BankCardParams0#{payment_system => PaymentSystem}),
     {ok,
         {bank_card,
             genlib_map:compact(#{
-                bank_card => maps:merge(BankCardParams1, ExtendData1),
+                bank_card => maps:merge(BankCardParams1, ExtendData),
                 auth_data => maps:get(auth_data, ResourceBankCardParams, undefined)
             })}}.
 
@@ -361,3 +360,10 @@ create_digital_wallet(#{
 -spec create_generic_resource(resource_generic_params()) -> {ok, resource()}.
 create_generic_resource(#{generic := Generic}) ->
     {ok, {generic, #{generic => Generic}}}.
+
+create_extended_data(undefined) ->
+    #{};
+create_extended_data(BinData) ->
+    KeyList = [bank_name, issuer_country, card_type, category],
+    ExtendData0 = maps:with(KeyList, BinData),
+    ExtendData0#{bin_data_id => ff_bin_data:id(BinData)}.
