-
Notifications
You must be signed in to change notification settings - Fork 0
BG-834: Recurrent cascade #200
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ndiezel0
wants to merge
9
commits into
master
Choose a base branch
from
BG-834/customers
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
057c29d
BG-834: Recurrent cascade
ndiezel0 8b81aa7
Merge branch 'master' into BG-834/customers
ndiezel0 e871a93
Fixes
ndiezel0 c0d2fd0
Fixes
ndiezel0 04f5e64
Fix
ndiezel0 4b3bc8a
Fix
ndiezel0 7b28a62
Changes
ndiezel0 bbebb93
Review fixes
ndiezel0 7837aa1
Fix checks
ndiezel0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,3 +14,5 @@ tags | |
| /.image.* | ||
| Makefile.env | ||
| *.iml | ||
| CLAUDE.md | ||
| .claude/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| rebar 3.24.0 | ||
| erlang 27.3.4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| -module(hg_customer_client). | ||
|
|
||
| -include_lib("damsel/include/dmsl_customer_thrift.hrl"). | ||
| -include_lib("damsel/include/dmsl_domain_thrift.hrl"). | ||
|
|
||
| %% BankCard operations | ||
| -export([find_or_create_bank_card/2]). | ||
| -export([get_recurrent_tokens_by_card/2]). | ||
| -export([save_recurrent_token_by_card/3]). | ||
| -export([tokens_to_map/1]). | ||
|
|
||
| %% Customer operations | ||
| -export([create_customer/1]). | ||
| -export([get_by_parent_payment/2]). | ||
| -export([get_recurrent_tokens/2]). | ||
| -export([add_payment/3]). | ||
| -export([link_bank_card/2]). | ||
|
|
||
| -export_type([cascade_tokens/0]). | ||
|
|
||
| -type invoice_id() :: dmsl_domain_thrift:'InvoiceID'(). | ||
| -type payment_id() :: dmsl_domain_thrift:'InvoicePaymentID'(). | ||
| -type provider_terminal_key() :: dmsl_customer_thrift:'ProviderTerminalKey'(). | ||
| -type token() :: dmsl_domain_thrift:'Token'(). | ||
| -type recurrent_token() :: dmsl_customer_thrift:'RecurrentToken'(). | ||
| -type cascade_tokens() :: #{provider_terminal_key() => token()}. | ||
|
|
||
| %% BankCard operations | ||
|
|
||
| -spec find_or_create_bank_card(dmsl_domain_thrift:'PartyConfigRef'(), token()) -> | ||
| dmsl_customer_thrift:'BankCard'(). | ||
| find_or_create_bank_card(PartyConfigRef, BankCardToken) -> | ||
| case find_bank_card(PartyConfigRef, BankCardToken) of | ||
| {ok, BankCard} -> | ||
| BankCard; | ||
| {exception, #customer_BankCardNotFound{}} -> | ||
| {ok, BankCard} = call( | ||
| bank_card_storage, | ||
| 'Create', | ||
| {PartyConfigRef, #customer_BankCardParams{bank_card_token = BankCardToken}} | ||
| ), | ||
| BankCard | ||
| end. | ||
|
|
||
| -spec get_recurrent_tokens_by_card(dmsl_domain_thrift:'PartyConfigRef'(), token()) -> | ||
| [recurrent_token()]. | ||
| get_recurrent_tokens_by_card(PartyConfigRef, BankCardToken) -> | ||
| case find_bank_card(PartyConfigRef, BankCardToken) of | ||
| {ok, #customer_BankCard{id = BankCardID}} -> | ||
| {ok, Tokens} = call(bank_card_storage, 'GetRecurrentTokens', {BankCardID}), | ||
| Tokens; | ||
| {exception, #customer_BankCardNotFound{}} -> | ||
| [] | ||
| end. | ||
|
|
||
| -spec save_recurrent_token_by_card( | ||
| dmsl_domain_thrift:'PartyConfigRef'(), | ||
| token(), | ||
| {dmsl_domain_thrift:'PaymentRoute'(), token()} | ||
| ) -> recurrent_token(). | ||
| save_recurrent_token_by_card( | ||
| PartyConfigRef, | ||
| BankCardToken, | ||
| {#domain_PaymentRoute{provider = ProviderRef, terminal = TerminalRef}, RecToken} | ||
| ) -> | ||
| #customer_BankCard{id = BankCardID} = find_or_create_bank_card(PartyConfigRef, BankCardToken), | ||
| {ok, SavedToken} = call( | ||
| bank_card_storage, | ||
| 'AddRecurrentToken', | ||
| {#customer_RecurrentTokenParams{ | ||
| bank_card_id = BankCardID, | ||
| provider_ref = ProviderRef, | ||
| terminal_ref = TerminalRef, | ||
| token = RecToken | ||
| }} | ||
| ), | ||
| SavedToken. | ||
|
|
||
| -spec tokens_to_map([recurrent_token()]) -> cascade_tokens(). | ||
| tokens_to_map(Tokens) -> | ||
| lists:foldl(fun token_to_map_entry/2, #{}, Tokens). | ||
|
|
||
| %% Customer operations | ||
|
|
||
| -spec create_customer(dmsl_domain_thrift:'PartyConfigRef'()) -> dmsl_customer_thrift:'Customer'(). | ||
| create_customer(PartyConfigRef) -> | ||
| {ok, Customer} = call(customer_management, 'Create', {#customer_CustomerParams{party_ref = PartyConfigRef}}), | ||
| Customer. | ||
|
|
||
| -spec get_by_parent_payment(invoice_id(), payment_id()) -> | ||
| {ok, dmsl_customer_thrift:'CustomerState'()} | {exception, term()}. | ||
| get_by_parent_payment(InvoiceID, PaymentID) -> | ||
| call(customer_management, 'GetByParentPayment', {InvoiceID, PaymentID}). | ||
|
|
||
| -spec get_recurrent_tokens(invoice_id(), payment_id()) -> [recurrent_token()]. | ||
| get_recurrent_tokens(InvoiceID, PaymentID) -> | ||
| case call(customer_management, 'GetByParentPayment', {InvoiceID, PaymentID}) of | ||
| {ok, #customer_CustomerState{bank_card_refs = BankCardRefs}} -> | ||
| lists:flatmap(fun collect_bank_card_tokens/1, BankCardRefs); | ||
| {exception, #customer_CustomerNotFound{}} -> | ||
| []; | ||
| {exception, #customer_InvalidRecurrentParent{}} -> | ||
| [] | ||
| end. | ||
|
|
||
| -spec add_payment(dmsl_customer_thrift:'CustomerID'(), invoice_id(), payment_id()) -> ok. | ||
| add_payment(CustomerID, InvoiceID, PaymentID) -> | ||
| {ok, ok} = call(customer_management, 'AddPayment', {CustomerID, InvoiceID, PaymentID}), | ||
| ok. | ||
|
|
||
| -spec link_bank_card(dmsl_customer_thrift:'CustomerID'(), token()) -> ok. | ||
| link_bank_card(CustomerID, BankCardToken) -> | ||
| {ok, _} = call( | ||
| customer_management, | ||
| 'AddBankCard', | ||
| {CustomerID, #customer_BankCardParams{bank_card_token = BankCardToken}} | ||
| ), | ||
| ok. | ||
|
|
||
| %% Internal | ||
|
|
||
| find_bank_card(PartyConfigRef, BankCardToken) -> | ||
| SearchParams = #customer_BankCardSearchParams{ | ||
| bank_card_token = BankCardToken, | ||
| party_ref = PartyConfigRef | ||
| }, | ||
| call(bank_card_storage, 'Find', {SearchParams}). | ||
|
|
||
| collect_bank_card_tokens(#customer_BankCardRef{id = BankCardID}) -> | ||
| {ok, Tokens} = call(bank_card_storage, 'GetRecurrentTokens', {BankCardID}), | ||
| Tokens. | ||
|
|
||
| token_to_map_entry( | ||
| #customer_RecurrentToken{ | ||
| provider_ref = ProviderRef, | ||
| terminal_ref = TerminalRef, | ||
| token = Token | ||
| }, | ||
| Acc | ||
| ) -> | ||
| Key = #customer_ProviderTerminalKey{ | ||
| provider_ref = ProviderRef, | ||
| terminal_ref = TerminalRef | ||
| }, | ||
| Acc#{Key => Token}. | ||
|
|
||
| call(ServiceName, Function, Args) -> | ||
| Service = hg_proto:get_service(ServiceName), | ||
| Opts = hg_woody_wrapper:get_service_options(ServiceName), | ||
| WoodyContext = | ||
| try | ||
| hg_context:get_woody_context(hg_context:load()) | ||
| catch | ||
| error:badarg -> woody_context:new() | ||
| end, | ||
| Request = {Service, Function, Args}, | ||
| woody_client:call( | ||
| Request, | ||
| Opts#{ | ||
| event_handler => { | ||
| scoper_woody_event_handler, | ||
| genlib_app:env(hellgate, scoper_event_handler_options, #{}) | ||
| } | ||
| }, | ||
| WoodyContext | ||
| ). | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ключа идемпотентности нет, в параметрах создания нет привязки, значит если что то пойдет не так - у тебя будет миллиард пустых кастумеров
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Например создание и сразу привязка к платежу? А если платеж не успешен? Я думал чтобы список платежей в кастомере был списком успешных платежей
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
это все верно, но после создания может же быть проблема - а можно делать чтобы у тебя в случае если не было кастумера и нужно создать ты мог в рамках транзакции создать, добавить карту и добавить реккурент - при этом проверяя не было ли уже их - чтобы не было дублей?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Карты и токены добавляются идемпотентно, в этом плане проблем нет
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Идемпотентностью создания самого кастомера (это будет происходить в капи) займется бендер на основе ExternalID
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
а этот метод тут тогда нужен?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Это для тестов, не вижу смысла ради этого метода рожать отдельный модуль
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
может коммент тогда докинуть? или в иф деф обернуть ?