BG-360: Bump damsel

Author: ndiezel0

apps/hellgate/include/allocation.hrl

@@ -73,10 +73,10 @@
     body = Body
 }).
 
--define(allocation_trx_target_shop(OwnerID, ShopID),
+-define(allocation_trx_target_shop(PartyConfigRef, ShopConfigRef),
     {shop, #domain_AllocationTransactionTargetShop{
-        owner_id = OwnerID,
-        shop_id = ShopID
+        party_ref = PartyConfigRef,
+        shop_ref = ShopConfigRef
     }}
 ).
 

apps/hellgate/include/hg_invoice.hrl

@@ -6,7 +6,7 @@
     invoice :: undefined | hg_invoice:invoice(),
     payments = [] :: [{hg_invoice:payment_id(), hg_invoice:payment_st()}],
     party :: undefined | hg_invoice:party(),
-    party_id :: undefined | hg_invoice:party_id()
+    party_config_ref :: undefined | hg_invoice:party_config_ref()
 }).
 
 -endif.

apps/hellgate/src/hg_accounting.erl

@@ -37,9 +37,9 @@
 -type thrift_account() :: dmsl_accounter_thrift:'Account'().
 
 -type payment() :: dmsl_domain_thrift:'InvoicePayment'().
--type party_id() :: dmsl_domain_thrift:'PartyID'().
+-type party_config_ref() :: dmsl_domain_thrift:'PartyConfigRef'().
 -type shop() :: dmsl_domain_thrift:'ShopConfig'().
--type shop_id() :: dmsl_domain_thrift:'ShopConfigID'().
+-type shop_config_ref() :: dmsl_domain_thrift:'ShopConfigRef'().
 -type route() :: hg_route:payment_route().
 -type payment_institution() :: dmsl_domain_thrift:'PaymentInstitution'().
 -type provider() :: dmsl_domain_thrift:'Provider'().
@@ -48,8 +48,8 @@
 
 -type collect_account_context() :: #{
     payment := payment(),
-    party_id := party_id(),
-    shop := {shop_id(), shop()},
+    party_config_ref := party_config_ref(),
+    shop := {shop_config_ref(), shop()},
     route := route(),
     payment_institution := payment_institution(),
     provider := provider(),
@@ -101,23 +101,25 @@ create_account(CurrencyCode, Description) ->
 -spec collect_account_map(collect_account_context()) -> map().
 collect_account_map(#{
     payment := Payment,
-    party_id := PartyID,
+    party_config_ref := PartyConfigRef,
     shop := ShopObj,
     route := Route,
     payment_institution := PaymentInstitution,
     provider := Provider,
     varset := VS,
     revision := Revision
 }) ->
-    Map0 = collect_merchant_account_map(PartyID, ShopObj, #{}),
+    Map0 = collect_merchant_account_map(PartyConfigRef, ShopObj, #{}),
     Map1 = collect_provider_account_map(Payment, Provider, Route, Map0),
     Map2 = collect_system_account_map(Payment, PaymentInstitution, Revision, Map1),
     collect_external_account_map(Payment, VS, Revision, Map2).
 
--spec collect_merchant_account_map(party_id(), {shop_id(), shop()}, map()) -> map().
-collect_merchant_account_map(PartyID, {ShopID, #domain_ShopConfig{account = Account}}, Acc) ->
+-spec collect_merchant_account_map(party_config_ref(), {shop_config_ref(), shop()}, map()) -> map().
+collect_merchant_account_map(
+    PartyConfigRef, {ShopConfigRef, #domain_ShopConfig{account = Account}}, Acc
+) ->
     Acc#{
-        merchant => {PartyID, ShopID},
+        merchant => {PartyConfigRef, ShopConfigRef},
         {merchant, settlement} => Account#domain_ShopAccount.settlement,
         {merchant, guarantee} => Account#domain_ShopAccount.guarantee
     }.
@@ -134,7 +136,9 @@ collect_provider_account_map(Payment, #domain_Provider{accounts = ProviderAccoun
 -spec collect_system_account_map(payment(), payment_institution(), revision(), map()) -> map().
 collect_system_account_map(Payment, PaymentInstitution, Revision, Acc) ->
     Currency = get_currency(get_payment_cost(Payment)),
-    SystemAccount = hg_payment_institution:get_system_account(Currency, Revision, PaymentInstitution),
+    SystemAccount = hg_payment_institution:get_system_account(
+        Currency, Revision, PaymentInstitution
+    ),
     Acc#{
         {system, settlement} => SystemAccount#domain_SystemAccount.settlement,
         {system, subagent} => SystemAccount#domain_SystemAccount.subagent

apps/hellgate/src/hg_allocation.erl

@@ -22,11 +22,11 @@
 
 -type party() :: dmsl_domain_thrift:'PartyConfig'().
 -type shop() :: dmsl_domain_thrift:'ShopConfig'().
--type party_id() :: dmsl_payproc_thrift:'PartyID'().
--type shop_id() :: dmsl_payproc_thrift:'ShopID'().
+-type party_config_ref() :: dmsl_domain_thrift:'PartyConfigRef'().
+-type shop_config_ref() :: dmsl_domain_thrift:'ShopConfigRef'().
 -type target_map() :: #{
-    party_id => party_id(),
-    shop_id => shop_id()
+    party_config_ref => party_config_ref(),
+    shop_config_ref => shop_config_ref()
 }.
 
 -type sub_errors() ::
@@ -85,14 +85,18 @@ assert_allocatable(_Allocation, _PaymentAllocationServiceTerms, _Party, _Shop, _
     {error, allocation_not_allowed}.
 
 -spec construct_target(target_map()) -> target().
-construct_target(#{party_id := PartyID, shop_id := ShopID}) ->
-    ?allocation_trx_target_shop(PartyID, ShopID).
-
--spec calculate(allocation_prototype(), party_id(), shop_id(), cash()) -> allocation().
-calculate(AllocationPrototype, PartyID, ShopID, Cost) ->
+construct_target(#{
+    party_config_ref := PartyConfigRef,
+    shop_config_ref := ShopConfigRef
+}) ->
+    ?allocation_trx_target_shop(PartyConfigRef, ShopConfigRef).
+
+-spec calculate(allocation_prototype(), party_config_ref(), shop_config_ref(), cash()) ->
+    allocation().
+calculate(AllocationPrototype, PartyConfigRef, ShopConfigRef, Cost) ->
     FeeTarget = construct_target(#{
-        party_id => PartyID,
-        shop_id => ShopID
+        party_config_ref => PartyConfigRef,
+        shop_config_ref => ShopConfigRef
     }),
     calculate(AllocationPrototype, FeeTarget, Cost).
 
@@ -177,7 +181,9 @@ calculate_trxs([Head | Transactions], FeeTarget, CostLeft, FeeAcc, ID0, Acc0) ->
 construct_positive_trx(ID, Target, Amount, Details, Body) ->
     case construct_trx(ID, Target, Amount, Details, Body) of
         undefined ->
-            throw({invalid_transaction, ?allocation_trx(ID, Target, Amount, Details, Body), zero_amount});
+            throw(
+                {invalid_transaction, ?allocation_trx(ID, Target, Amount, Details, Body), zero_amount}
+            );
         Trx ->
             Trx
     end.
@@ -215,7 +221,9 @@ add_fee(undefined, FeeAmount) ->
 add_fee(FeeCost, FeeAmount) ->
     hg_cash:add(FeeCost, FeeAmount).
 
-calculate_trxs_body(?allocation_trx_prototype_body_amount(?cash(_, SymCode) = Amount), _FeeTarget, _TP) ->
+calculate_trxs_body(
+    ?allocation_trx_prototype_body_amount(?cash(_, SymCode) = Amount), _FeeTarget, _TP
+) ->
     {undefined, Amount, ?cash(0, SymCode)};
 calculate_trxs_body(?allocation_trx_prototype_body_total(Total, Fee), FeeTarget, TP) ->
     CalculatedFee = calculate_trxs_fee(Fee, Total),
@@ -229,7 +237,9 @@ calculate_trxs_body(?allocation_trx_prototype_body_total(Total, Fee), FeeTarget,
 
 calculate_trxs_fee(?allocation_trx_prototype_fee_fixed(Amount), _Total) ->
     Amount;
-calculate_trxs_fee(?allocation_trx_prototype_fee_share(P, Q, RoundingMethod0), ?cash(Total, SymCode)) ->
+calculate_trxs_fee(
+    ?allocation_trx_prototype_fee_share(P, Q, RoundingMethod0), ?cash(Total, SymCode)
+) ->
     RoundingMethod1 = genlib:define(RoundingMethod0, round_half_away_from_zero),
     R = genlib_rational:new(P * Total, Q),
     Amount = ?cash(genlib_rational:round(R, RoundingMethod1), SymCode),

apps/hellgate/src/hg_cashflow.erl

@@ -17,7 +17,7 @@
 -type account_id() :: dmsl_domain_thrift:'AccountID'().
 -type account_map() :: #{
     account() => account_id(),
-    merchant := {party_id(), shop_id()},
+    merchant := {party_config_ref(), shop_config_ref()},
     provider := route()
 }.
 -type context() :: dmsl_domain_thrift:'CashFlowContext'().
@@ -27,8 +27,8 @@
 -type cash_volume() :: dmsl_domain_thrift:'CashVolume'().
 -type final_cash_flow_account() :: dmsl_domain_thrift:'FinalCashFlowAccount'().
 
--type shop_id() :: dmsl_domain_thrift:'ShopID'().
--type party_id() :: dmsl_domain_thrift:'PartyID'().
+-type shop_config_ref() :: dmsl_domain_thrift:'ShopConfigRef'().
+-type party_config_ref() :: dmsl_domain_thrift:'PartyConfigRef'().
 -type route() :: hg_route:payment_route().
 
 %%
@@ -80,10 +80,12 @@ construct_final_account(AccountType, AccountMap) ->
         transaction_account = construct_transaction_account(AccountType, AccountMap)
     }.
 
-construct_transaction_account({merchant, MerchantFlowAccount}, #{merchant := {PartyID, ShopID}}) ->
+construct_transaction_account({merchant, MerchantFlowAccount}, #{
+    merchant := {PartyConfigRef, ShopConfigRef}
+}) ->
     AccountOwner = #domain_MerchantTransactionAccountOwner{
-        party_id = PartyID,
-        shop_id = ShopID
+        party_ref = PartyConfigRef,
+        shop_ref = ShopConfigRef
     },
     {merchant, #domain_MerchantTransactionAccount{
         type = MerchantFlowAccount,
@@ -117,7 +119,9 @@ resolve_account(AccountType, AccountMap) ->
         #{AccountType := V} ->
             V;
         #{} ->
-            error({misconfiguration, {'Cash flow account can not be mapped', {AccountType, AccountMap}}})
+            error(
+                {misconfiguration, {'Cash flow account can not be mapped', {AccountType, AccountMap}}}
+            )
     end.
 
 %%
@@ -142,7 +146,9 @@ revert_details(Details) ->
 ).
 
 -define(share(P, Q, Of, RoundingMethod),
-    {share, #domain_CashVolumeShare{'parts' = ?rational(P, Q), 'of' = Of, 'rounding_method' = RoundingMethod}}
+    {share, #domain_CashVolumeShare{
+        'parts' = ?rational(P, Q), 'of' = Of, 'rounding_method' = RoundingMethod
+    }}
 ).
 
 -define(product(Fun, CVs),
@@ -182,12 +188,16 @@ compute_product(Fun, [CV | CVRest], CV0, Context) ->
         CVRest
     ).
 
-compute_product(Fun, CV, CVMin = #domain_Cash{amount = AmountMin, currency = Currency}, CV0, Context) ->
+compute_product(
+    Fun, CV, CVMin = #domain_Cash{amount = AmountMin, currency = Currency}, CV0, Context
+) ->
     case compute_volume(CV, Context) of
         #domain_Cash{amount = Amount, currency = Currency} ->
             CVMin#domain_Cash{amount = compute_product_fun(Fun, AmountMin, Amount)};
         _ ->
-            error({misconfiguration, {'Cash volume product over volumes of different currencies', CV0}})
+            error(
+                {misconfiguration, {'Cash volume product over volumes of different currencies', CV0}}
+            )
     end.
 
 compute_product_fun(min_of, V1, V2) ->
@@ -232,7 +242,9 @@ increment_remainder(AccountType, Cash, Acc) ->
 decrement_remainder(AccountType, ?cash(Amount, Currency), Acc) ->
     modify_remainder(AccountType, ?cash(-Amount, Currency), Acc).
 
-modify_remainder(#domain_FinalCashFlowAccount{account_type = AccountType}, ?cash(Amount, Currency), Acc) ->
+modify_remainder(
+    #domain_FinalCashFlowAccount{account_type = AccountType}, ?cash(Amount, Currency), Acc
+) ->
     maps:update_with(
         AccountType,
         fun(?cash(A, C)) when C == Currency ->

apps/hellgate/src/hg_cashflow_utils.erl

@@ -10,8 +10,8 @@
 -type cash_flow_context() :: #{
     operation := refund | payment,
     provision_terms := dmsl_domain_thrift:'PaymentsProvisionTerms'(),
-    party := {party_id(), party()},
-    shop := {shop_id(), shop()},
+    party := {party_config_ref(), party()},
+    shop := {shop_config_ref(), shop()},
     route := route(),
     payment := payment(),
     provider := provider(),
@@ -29,9 +29,9 @@
 -export([collect_cashflow/2]).
 
 -type party() :: dmsl_domain_thrift:'PartyConfig'().
--type party_id() :: dmsl_domain_thrift:'PartyID'().
+-type party_config_ref() :: dmsl_domain_thrift:'PartyConfigRef'().
 -type shop() :: dmsl_domain_thrift:'ShopConfig'().
--type shop_id() :: dmsl_domain_thrift:'ShopConfigID'().
+-type shop_config_ref() :: dmsl_domain_thrift:'ShopConfigRef'().
 -type route() :: dmsl_domain_thrift:'PaymentRoute'().
 -type payment() :: dmsl_domain_thrift:'InvoicePayment'().
 -type refund() :: dmsl_domain_thrift:'InvoicePaymentRefund'().
@@ -70,20 +70,24 @@ collect_allocation_cash_flow(
 ) ->
     lists:foldl(
         fun(?allocation_trx(_ID, Target, Amount), Acc) ->
-            ?allocation_trx_target_shop(PartyID, ShopID) = Target,
-            {PartyID, TargetParty} = hg_party:get_party(PartyID),
-            {ShopID, TargetShop} = hg_party:get_shop(ShopID, TargetParty, Revision),
+            ?allocation_trx_target_shop(PartyConfigRef, ShopConfigRef) = Target,
+            {PartyConfigRef, TargetParty} = hg_party:get_party(PartyConfigRef),
+            {#domain_ShopConfigRef{id = ShopConfigID} = ShopConfigRef, TargetShop} = hg_party:get_shop(
+                ShopConfigRef, PartyConfigRef, Revision
+            ),
             VS1 = VS0#{
-                party_id => PartyID,
-                shop_id => ShopID,
+                party_config_ref => PartyConfigRef,
+                shop_id => ShopConfigID,
                 cost => Amount
             },
             AllocationPaymentInstitution =
                 get_cashflow_payment_institution(Shop, VS1, Revision),
             construct_transaction_cashflow(
                 Amount,
                 AllocationPaymentInstitution,
-                Context#{party => {PartyID, TargetParty}, shop => {ShopID, TargetShop}}
+                Context#{
+                    party => {PartyConfigRef, TargetParty}, shop => {ShopConfigRef, TargetShop}
+                }
             ) ++ Acc
         end,
         [],
@@ -110,14 +114,20 @@ construct_transaction_cashflow(
         end,
     MerchantCashflowSelector = get_terms_cashflow(OpType, MerchantPaymentsTerms1),
     MerchantCashflow = get_selector_value(merchant_payment_fees, MerchantCashflowSelector),
-    AccountMap = hg_accounting:collect_account_map(make_collect_account_context(PaymentInstitution, Context)),
+    AccountMap = hg_accounting:collect_account_map(
+        make_collect_account_context(PaymentInstitution, Context)
+    ),
     construct_final_cashflow(MerchantCashflow, #{operation_amount => Amount}, AccountMap).
 
 construct_provider_cashflow(PaymentInstitution, Context = #{provision_terms := ProvisionTerms}) ->
     ProviderCashflowSelector = get_provider_cashflow_selector(ProvisionTerms),
     ProviderCashflow = get_selector_value(provider_payment_cash_flow, ProviderCashflowSelector),
-    AccountMap = hg_accounting:collect_account_map(make_collect_account_context(PaymentInstitution, Context)),
-    construct_final_cashflow(ProviderCashflow, #{operation_amount => get_amount(Context)}, AccountMap).
+    AccountMap = hg_accounting:collect_account_map(
+        make_collect_account_context(PaymentInstitution, Context)
+    ),
+    construct_final_cashflow(
+        ProviderCashflow, #{operation_amount => get_amount(Context)}, AccountMap
+    ).
 
 construct_final_cashflow(Cashflow, Context, AccountMap) ->
     hg_cashflow:finalize(Cashflow, Context, AccountMap).
@@ -140,7 +150,9 @@ get_amount(#{payment := #domain_InvoicePayment{cost = Cost}}) ->
 
 get_provider_cashflow_selector(#domain_PaymentsProvisionTerms{cash_flow = ProviderCashflowSelector}) ->
     ProviderCashflowSelector;
-get_provider_cashflow_selector(#domain_PaymentRefundsProvisionTerms{cash_flow = ProviderCashflowSelector}) ->
+get_provider_cashflow_selector(#domain_PaymentRefundsProvisionTerms{
+    cash_flow = ProviderCashflowSelector
+}) ->
     ProviderCashflowSelector.
 
 get_terms_cashflow(payment, MerchantPaymentsTerms) ->
@@ -161,7 +173,7 @@ get_selector_value(Name, Selector) ->
     hg_accounting:collect_account_context().
 make_collect_account_context(PaymentInstitution, #{
     payment := Payment,
-    party := {PartyID, _},
+    party := {PartyConfigRef, _},
     shop := Shop,
     route := Route,
     provider := Provider,
@@ -170,7 +182,7 @@ make_collect_account_context(PaymentInstitution, #{
 }) ->
     #{
         payment => Payment,
-        party_id => PartyID,
+        party_config_ref => PartyConfigRef,
         shop => Shop,
         route => Route,
         payment_institution => PaymentInstitution,

apps/hellgate/src/hg_inspector.erl

@@ -105,8 +105,8 @@ get_payment_info(
         location = Location
     },
     #domain_Invoice{
-        owner_id = PartyID,
-        shop_id = ShopID,
+        party_ref = PartyConfigRef,
+        shop_ref = ShopConfigRef,
         id = InvoiceID,
         created_at = InvoiceCreatedAt,
         due = InvoiceDue,
@@ -123,14 +123,14 @@ get_payment_info(
     }
 ) ->
     Party = #proxy_inspector_Party{
-        party_id = PartyID
+        party_ref = PartyConfigRef
     },
     ShopCategory = hg_domain:get(
         Revision,
         {category, CategoryRef}
     ),
     ProxyShop = #proxy_inspector_Shop{
-        id = ShopID,
+        shop_ref = ShopConfigRef,
         category = ShopCategory,
         name = Shop#domain_ShopConfig.name,
         description = Shop#domain_ShopConfig.description,