MSPF-562: Add bank card category, condition category_is (#448)

This commit is contained in:
Boris 2020-06-11 17:17:05 +03:00 committed by GitHub
parent bddf397e8b
commit 1e57bd4674
4 changed files with 13 additions and 5 deletions

6
Jenkinsfile vendored
View File

@ -32,6 +32,9 @@ build('hellgate', 'docker-host', finalHook) {
runStage('xref') { runStage('xref') {
sh 'make wc_xref' sh 'make wc_xref'
} }
runStage('test') {
sh "make wdeps_test"
}
runStage('pre-dialyze') { runStage('pre-dialyze') {
withWsCache("_build/default/rebar3_22.3.1_plt") { withWsCache("_build/default/rebar3_22.3.1_plt") {
sh 'make wc_plt_update' sh 'make wc_plt_update'
@ -40,9 +43,6 @@ build('hellgate', 'docker-host', finalHook) {
runStage('dialyze') { runStage('dialyze') {
sh 'make wc_dialyze' sh 'make wc_dialyze'
} }
runStage('test') {
sh "make wdeps_test"
}
} }
runStage('make release') { runStage('make release') {
withGithubPrivkey { withGithubPrivkey {

View File

@ -91,6 +91,8 @@ test_bank_card_condition_def({issuer_country_is, IssuerCountry}, V, Rev) ->
test_issuer_country_condition(IssuerCountry, V, Rev); test_issuer_country_condition(IssuerCountry, V, Rev);
test_bank_card_condition_def({issuer_bank_is, BankRef}, V, Rev) -> test_bank_card_condition_def({issuer_bank_is, BankRef}, V, Rev) ->
test_issuer_bank_condition(BankRef, V, Rev); test_issuer_bank_condition(BankRef, V, Rev);
test_bank_card_condition_def({category_is, CategoryRef}, V, Rev) ->
test_bank_card_category_condition(CategoryRef, V, Rev);
test_bank_card_condition_def( test_bank_card_condition_def(
{empty_cvv_is, Val}, {empty_cvv_is, Val},
#domain_BankCard{is_cvv_empty = Val}, #domain_BankCard{is_cvv_empty = Val},
@ -131,6 +133,12 @@ test_issuer_bank_condition(BankRef, #domain_BankCard{bank_name = BankName, bin =
{_, _} -> test_bank_card_bins(BIN, BINs) {_, _} -> test_bank_card_bins(BIN, BINs)
end. end.
test_bank_card_category_condition(CategoryRef, #domain_BankCard{category = Category}, Rev) ->
#domain_BankCardCategory{
category_patterns = Patterns
} = pm_domain:get(Rev, {bank_card_category, CategoryRef}),
test_bank_card_patterns(Patterns, Category).
test_bank_card_bins(BIN, BINs) -> test_bank_card_bins(BIN, BINs) ->
ordsets:is_element(BIN, BINs). ordsets:is_element(BIN, BINs).

View File

@ -18,7 +18,7 @@ services:
mem_limit: 256M mem_limit: 256M
dominant: dominant:
image: dr2.rbkmoney.com/rbkmoney/dominant:4c86d3f4292f33782cbeb3642cce7cbabbe9063b image: dr2.rbkmoney.com/rbkmoney/dominant:2b6ee3d9900f4d8b5230cbd08d8292f3ad8c0ea6
command: /opt/dominant/bin/dominant foreground command: /opt/dominant/bin/dominant foreground
depends_on: depends_on:
machinegun: machinegun:

View File

@ -10,7 +10,7 @@
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.8.0">>},2}, {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.8.0">>},2},
{<<"damsel">>, {<<"damsel">>,
{git,"git@github.com:rbkmoney/damsel.git", {git,"git@github.com:rbkmoney/damsel.git",
{ref,"bb9560362cfcce69ae91ae56fa6f0453b3530047"}}, {ref,"a6c9401d85b856df783ed715f70304e7e104f052"}},
0}, 0},
{<<"dmt_client">>, {<<"dmt_client">>,
{git,"git@github.com:rbkmoney/dmt_client.git", {git,"git@github.com:rbkmoney/dmt_client.git",