EMP-228: Passes updated payment resource's contact_info to provider

.github/workflows/erlang-checks.yaml

@@ -30,7 +30,7 @@ jobs:
   run:
     name: Run checks
     needs: setup
-    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.15
+    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.17
     with:
       otp-version: ${{ needs.setup.outputs.otp-version }}
       rebar-version: ${{ needs.setup.outputs.rebar-version }}

apps/hellgate/test/hg_ct_domain.hrl

@@ -85,10 +85,14 @@
 ).
 
 -define(contact_info(EMail, Phone),
-    ?contact_info(EMail, Phone, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+    ?contact_info(
+        EMail, Phone, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined
+    )
 ).
 
--define(contact_info(EMail, Phone, FirstName, LastName, Country, State, City, Address, PostalCode),
+-define(contact_info(
+    EMail, Phone, FirstName, LastName, Country, State, City, Address, PostalCode, DateOfBirth, DocumentId
+),
     #domain_ContactInfo{
         email = EMail,
         phone_number = Phone,
@@ -98,7 +102,9 @@
         state = State,
         city = City,
         address = Address,
-        postal_code = PostalCode
+        postal_code = PostalCode,
+        date_of_birth = DateOfBirth,
+        document_id = DocumentId
     }
 ).
 

apps/hellgate/test/hg_dummy_provider.erl

@@ -267,6 +267,15 @@ token_respond(Response, CallbackResult) ->
 %
 process_payment(?processed(), undefined, PaymentInfo, CtxOpts, _) ->
     case get_payment_info_scenario(PaymentInfo) of
+        {assert_contact_info, ContactInfo} ->
+            ProvidedContactInfo =
+                PaymentInfo#proxy_provider_PaymentInfo.payment#proxy_provider_InvoicePayment.contact_info,
+            case ContactInfo of
+                ProvidedContactInfo ->
+                    maybe_fail(PaymentInfo, CtxOpts, result(?sleep(0), <<"sleeping">>));
+                _ ->
+                    error({contact_info_mismatch, ContactInfo, ProvidedContactInfo})
+            end;
         {preauth_3ds, Timeout} ->
             Tag = generate_tag(<<"payment">>),
             Uri = get_callback_url(),
@@ -684,6 +693,8 @@ get_payment_tool_scenario({'bank_card', #domain_BankCard{token = <<"unexpected_f
 get_payment_tool_scenario({'bank_card', #domain_BankCard{token = <<"scenario_", BinScenario/binary>>}}) ->
     Scenario = decode_failure_scenario(BinScenario),
     {temporary_unavailability, Scenario};
+get_payment_tool_scenario({'bank_card', #domain_BankCard{token = <<"assert_contact_info/", ContactInfoBin/binary>>}}) ->
+    {assert_contact_info, binary_to_term(ContactInfoBin)};
 get_payment_tool_scenario(
     {'payment_terminal', #domain_PaymentTerminal{payment_service = #domain_PaymentServiceRef{id = <<"euroset-ref">>}}}
 ) ->
@@ -733,7 +744,8 @@ get_payment_tool_scenario(
     | empty_cvv
     | {scenario, failure_scenario()}
     | {preauth_3ds, integer()}
-    | {preauth_3ds_sleep, integer()}.
+    | {preauth_3ds_sleep, integer()}
+    | {assert_contact_info, dmsl_domain_thrift:'ContactInfo'()}.
 
 -type tag() :: dmsl_proxy_provider_thrift:'CallbackTag'().
 -type session_change() :: dmsl_proxy_provider_thrift:'PaymentSessionChange'().
@@ -753,6 +765,8 @@ make_payment_tool(Code, PSys) when
         Code =:= unexpected_failure_no_trx
 ->
     ?SESSION42(make_bank_card_payment_tool(atom_to_binary(Code, utf8), PSys));
+make_payment_tool({assert_contact_info, ContactInfo}, PSys) ->
+    ?SESSION42(make_bank_card_payment_tool(<<"assert_contact_info/", (term_to_binary(ContactInfo))/binary>>, PSys));
 make_payment_tool(inspector_fail_first, PSys) ->
     ?SESSION42(make_bank_card_payment_tool(<<"inspector_fail_first">>, PSys));
 make_payment_tool(inspector_fail_all, PSys) ->

apps/hellgate/test/hg_invoice_tests_SUITE.erl

@@ -208,6 +208,8 @@
 -export([payment_cascade_fail_provider_error/1]).
 -export([payment_cascade_fail_ui/1]).
 
+-export([payment_tool_contact_info_passed_to_provider/1]).
+
 -export([route_not_found_provider_unavailable/1]).
 -export([payment_success_ruleset_provider_available/1]).
 -export([route_found_provider_lacking_conversion/1]).
@@ -301,7 +303,9 @@ groups() ->
 
             {group, allocation},
 
-            {group, route_cascading}
+            {group, route_cascading},
+
+            {group, proxy_provider_protocol}
         ]},
 
         {base_payments, [], [
@@ -503,6 +507,9 @@ groups() ->
             payment_cascade_deadline_failures,
             payment_cascade_fail_provider_error,
             payment_cascade_fail_ui
+        ]},
+        {proxy_provider_protocol, [parallel], [
+            payment_tool_contact_info_passed_to_provider
         ]}
     ].
 
@@ -3328,7 +3335,9 @@ registered_payment_adjustment_success(C) ->
                     payment_session_id = Session,
                     client_info = #domain_ClientInfo{}
                 },
-                contact_info = ?contact_info(String, String, String, String, String, String, String, String, String)
+                contact_info = ?contact_info(
+                    String, String, String, String, String, String, String, String, String, String, String
+                )
             }},
         route = Route,
         transaction_info = ?trx_info(<<"1">>, #{})
@@ -7871,6 +7880,45 @@ payment_cascade_deadline_failures(C) ->
     ?assertMatch(#domain_InvoicePayment{status = {failed, _}}, Payment),
     ?invoice_status_changed(?invoice_cancelled(<<"overdue">>)) = next_change(InvoiceID, Client).
 
+%%=============================================================================
+%% proxy_provider_protocol group
+
+-spec payment_tool_contact_info_passed_to_provider(config()) -> test_return().
+payment_tool_contact_info_passed_to_provider(C) ->
+    PartyID = cfg(party_id_big_merch, C),
+    RootUrl = cfg(root_url, C),
+    PartyClient = cfg(party_client, C),
+    Client = hg_client_invoicing:start_link(hg_ct_helper:create_client(RootUrl)),
+    ShopID = hg_ct_helper:create_shop(PartyID, ?cat(1), <<"RUB">>, ?tmpl(1), ?pinst(1), PartyClient),
+    InvoiceParams = make_invoice_params(PartyID, ShopID, <<"rubberduck">>, make_due_date(10), make_cash(42000)),
+    InvoiceID = create_invoice(InvoiceParams, Client),
+    ?invoice_created(?invoice_w_status(?invoice_unpaid())) = next_change(InvoiceID, Client),
+    PaymentID = process_payment(
+        InvoiceID, make_payment_params_with_contact_info_assertion(?pmt_sys(<<"visa-ref">>)), Client
+    ),
+    PaymentID = await_payment_capture(InvoiceID, PaymentID, Client),
+    ?invoice_state(
+        ?invoice_w_status(?invoice_paid()),
+        [?payment_state(Payment)]
+    ) = hg_client_invoicing:get(InvoiceID, Client),
+    ?payment_w_status(PaymentID, ?captured()) = Payment.
+
+make_payment_params_with_contact_info_assertion(PmtSys) ->
+    String = <<"STRING">>,
+    ContactInfo = ?contact_info(String, String, String, String, String, String, String, String, String, String, String),
+    {PaymentTool, Session} = hg_dummy_provider:make_payment_tool({assert_contact_info, ContactInfo}, PmtSys),
+    #payproc_InvoicePaymentParams{
+        payer =
+            {payment_resource, #payproc_PaymentResourcePayerParams{
+                resource = #domain_DisposablePaymentResource{
+                    payment_tool = PaymentTool,
+                    payment_session_id = Session,
+                    client_info = #domain_ClientInfo{}
+                },
+                contact_info = ContactInfo
+            }},
+        flow = {instant, #payproc_InvoicePaymentParamsFlowInstant{}}
+    }.
 %%
 
 await_cascade_triggering(InvoiceID, PaymentID, Client) ->

rebar.lock

@@ -21,7 +21,7 @@
  {<<"ctx">>,{pkg,<<"ctx">>,<<"0.6.0">>},2},
  {<<"damsel">>,
   {git,"https://github.com/valitydev/damsel.git",
-       {ref,"81d1edce2043500e4581867da3f5f4c31e682f44"}},
+       {ref,"24932cdc557a75bfb3a4aeb1738638366003aba4"}},
   0},
  {<<"dmt_client">>,
   {git,"https://github.com/valitydev/dmt-client.git",