diff --git a/apps/limiter/src/lim_config_machine.erl b/apps/limiter/src/lim_config_machine.erl index b5a00d9..c710824 100644 --- a/apps/limiter/src/lim_config_machine.erl +++ b/apps/limiter/src/lim_config_machine.erl @@ -1018,6 +1018,7 @@ check_calculate_year_shard_id_test() -> id = <<"ID">>, owner_id = OwnerID, shop_id = ShopID, + domain_revision = 1, created_at = <<"2000-02-02T12:12:12Z">>, status = {unpaid, #domain_InvoiceUnpaid{}}, details = #domain_InvoiceDetails{product = <<>>}, diff --git a/apps/limiter/src/lim_payproc_context.erl b/apps/limiter/src/lim_payproc_context.erl index 9132dfd..e434d02 100644 --- a/apps/limiter/src/lim_payproc_context.erl +++ b/apps/limiter/src/lim_payproc_context.erl @@ -186,8 +186,6 @@ get_payment_tool(_, _CtxInvoice) -> get_payer_payment_tool(#domain_PaymentResourcePayer{resource = #domain_DisposablePaymentResource{payment_tool = PT}}) -> lim_payproc_utils:payment_tool(PT); -get_payer_payment_tool(#domain_CustomerPayer{payment_tool = PT}) -> - lim_payproc_utils:payment_tool(PT); get_payer_payment_tool(#domain_RecurrentPayer{payment_tool = PT}) -> lim_payproc_utils:payment_tool(PT). @@ -225,8 +223,6 @@ get_payer_contact_email(_, _CtxInvoice) -> get_payer_contact_info(#domain_PaymentResourcePayer{contact_info = CI}) -> CI; -get_payer_contact_info(#domain_CustomerPayer{contact_info = CI}) -> - CI; get_payer_contact_info(#domain_RecurrentPayer{contact_info = CI}) -> CI. @@ -277,14 +273,6 @@ get_payment_tool_test_() -> resource = #domain_DisposablePaymentResource{payment_tool = PaymentTool}, contact_info = #domain_ContactInfo{} }}, - CustomerPayer = - {customer, #domain_CustomerPayer{ - customer_id = <<"customer_id">>, - customer_binding_id = <<"customer_binding_id">>, - rec_payment_tool_id = <<"rec_payment_tool_id">>, - payment_tool = PaymentTool, - contact_info = #domain_ContactInfo{} - }}, RecurrentPayer = {recurrent, #domain_RecurrentPayer{ payment_tool = PaymentTool, @@ -300,10 +288,6 @@ get_payment_tool_test_() -> {ok, ExpectedValue}, get_value(payment_tool, ?CONTEXT_PAYMENT(?PAYMENT_W_PAYER(PaymentResourcePayer))) ), - ?_assertEqual( - {ok, ExpectedValue}, - get_value(payment_tool, ?CONTEXT_PAYMENT(?PAYMENT_W_PAYER(CustomerPayer))) - ), ?_assertEqual( {ok, ExpectedValue}, get_value(payment_tool, ?CONTEXT_PAYMENT(?PAYMENT_W_PAYER(RecurrentPayer))) diff --git a/apps/limiter/test/lim_ct_helper.hrl b/apps/limiter/test/lim_ct_helper.hrl index 46a175e..bbd7d49 100644 --- a/apps/limiter/test/lim_ct_helper.hrl +++ b/apps/limiter/test/lim_ct_helper.hrl @@ -132,6 +132,7 @@ id = ?string, owner_id = OwnerID, shop_id = ShopID, + domain_revision = 1, created_at = ?timestamp, status = {unpaid, #domain_InvoiceUnpaid{}}, details = #domain_InvoiceDetails{product = ?string}, diff --git a/compose.yaml b/compose.yaml index c6ef112..cda6fd2 100644 --- a/compose.yaml +++ b/compose.yaml @@ -24,7 +24,7 @@ services: condition: service_healthy dmt: - image: ghcr.io/valitydev/dominant-v2:sha-109d2ea + image: ghcr.io/valitydev/dominant-v2:sha-f55c065 command: /opt/dmt/bin/dmt foreground healthcheck: test: "/opt/dmt/bin/dmt ping" diff --git a/rebar.config b/rebar.config index 01afc2f..76150c6 100644 --- a/rebar.config +++ b/rebar.config @@ -28,7 +28,7 @@ {deps, [ {prometheus, "4.11.0"}, {prometheus_cowboy, "0.1.9"}, - {damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.0"}}}, + {damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.11"}}}, {limiter_proto, {git, "https://github.com/valitydev/limiter-proto.git", {branch, "master"}}}, {liminator_proto, {git, "https://github.com/valitydev/liminator-proto.git", {branch, "master"}}}, {xrates_proto, {git, "https://github.com/valitydev/xrates-proto.git", {branch, "master"}}}, @@ -37,7 +37,7 @@ {genlib, {git, "https://github.com/valitydev/genlib.git", {tag, "v1.1.0"}}}, {scoper, {git, "https://github.com/valitydev/scoper.git", {tag, "v1.1.0"}}}, {woody, {git, "https://github.com/valitydev/woody_erlang.git", {tag, "v1.1.0"}}}, - {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {tag, "v2.0.0"}}}, + {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {tag, "v2.0.2"}}}, {opentelemetry_api, "1.4.0"}, {opentelemetry, "1.5.0"}, {opentelemetry_exporter, "1.8.0"} diff --git a/rebar.lock b/rebar.lock index 87977e6..91906d8 100644 --- a/rebar.lock +++ b/rebar.lock @@ -19,16 +19,12 @@ {<<"ctx">>,{pkg,<<"ctx">>,<<"0.6.0">>},2}, {<<"damsel">>, {git,"https://github.com/valitydev/damsel.git", - {ref,"ba7414811590859d058817b8f22d2e9c22f627f8"}}, + {ref,"ff9b01f552f922ce4a16710827aa872325dbe5a9"}}, 0}, {<<"dmt_client">>, {git,"https://github.com/valitydev/dmt_client.git", - {ref,"fcfb028a041149caeebec8d9cef469c8cdbbc63e"}}, + {ref,"fff521d3d50b48e3c6b628fe4796b3628aedc6b7"}}, 0}, - {<<"dmt_core">>, - {git,"https://github.com/valitydev/dmt-core.git", - {ref,"19d8f57198f2cbe5b64aa4a923ba32774e505503"}}, - 1}, {<<"epg_connector">>, {git,"https://github.com/valitydev/epg_connector.git", {ref,"dd93e27c00d492169e8a7bfc38976b911c6e7d05"}},