valitydev/holmes
14
0
Fork 0
mirror of https://github.com/valitydev/holmes.git synced 2024-11-06 09:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HG-262: Specify payments provision terms (#33)

Browse Source 
* DC-54: Provide a couple of reasonable defaults in script envs

* HG-262: Bind battle-ready providers to their categories (#31)
This commit is contained in:
Andrew Mayorov 2017-09-12 12:58:02 +03:00 committed by GitHub
parent 38f7579773
commit 77bfbbf66c
4 changed files with 218 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
damsel

@ -1 +1 @@
Subproject commit 44afec3edcf10c00899f2686efd8273c48106059
Subproject commit 49773b2cc328be0986ded97ed3f6fd24f2818454

517
scripts/dominant/base-fixture.commit.json.tpl
View File

@ -122,15 +122,13 @@
]}
}
]},
"hold_lifetime": {"decisions": [
{
"if_": {"any_of": [
{"condition": {"payment_tool": {"bank_card": {"payment_system_is": "visa"}}}},
{"condition": {"payment_tool": {"bank_card": {"payment_system_is": "mastercard"}}}}
"holds": {
"payment_methods": {"value": [
{"id": {"bank_card": "visa"}},
{"id": {"bank_card": "mastercard"}}
]},
"then_": {"value": {"seconds": 3}}
"lifetime": {"value": {"seconds": 3}}
}
]}
}
}
}
@ -263,18 +261,86 @@
"name": "Mocketbank",
"description": "Mocketbank",
"terminal": {"value": [
{"id": 1},
{"id": 2},
{"id": 3},
{"id": 4},
{"id": 5},
{"id": 6}
{"id": 1}
]},
"proxy": {
"ref": {"id": 1},
"additional": {}
},
"abs_account": "0000000001"
"abs_account": "0000000001",
"terms": {
"currencies": {"value": [
{"symbolic_code": "RUB"}
]},
"categories": {"value": [
{"id": 1},
{"id": 2}
]},
"payment_methods": {"value": [
{"id": {"bank_card": "visa"}},
{"id": {"bank_card": "mastercard"}},
{"id": {"bank_card": "maestro"}},
]},
"cash_limit": {"value": {
"lower": {"inclusive": {"amount": 1000, "currency": {"symbolic_code": "RUB"}}},
"upper": {"exclusive": {"amount": 10000000, "currency": {"symbolic_code": "RUB"}}}
}},
"cash_flow": {"decisions": [
{
"if_": {"condition": {"payment_tool": {"bank_card": {"payment_system_is": "visa"}}}},
"then_": {"value": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 15, "q": 1000}, "of": "payment_amount"}}
}
]}
},
{
"if_": {"condition": {"payment_tool": {"bank_card": {"payment_system_is": "mastercard"}}}},
"then_": {"value": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 18, "q": 1000}, "of": "payment_amount"}}
}
]}
},
{
"if_": {"condition": {"payment_tool": {"bank_card": {"payment_system_is": "maestro"}}}},
"then_": {"value": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 19, "q": 1000}, "of": "payment_amount"}}
}
]}
}
]},
"holds": {
"lifetime": {"value": {"seconds": 3600}}
}
},
"accounts": [
{"key": {"symbolic_code": "RUB"}, "value": {
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}}
]
}
}}}},
@ -284,227 +350,32 @@
"name": "Tinkoff Credit Systems",
"description": "Tinkoff Credit Systems",
"terminal": {"value": [
{"id": 7},
{"id": 8}
{"id": 2}
]},
"proxy": {
"ref": {"id": 2},
"additional": {}
},
"abs_account": "1000000001"
}
}}}},
{"insert": {"object": {"provider": {
"ref": {"id": 3},
"data": {
"name": "VTB24",
"description": "VTB24",
"terminal": {"value": [
{"id": 9}
"abs_account": "1000000001",
"terms": {
"currencies": {"value": [
{"symbolic_code": "RUB"}
]},
"proxy": {
"ref": {"id": 3},
"additional": {}
},
"abs_account": "1000000002"
}
}}}},
{"insert": {"object": {"provider": {
"ref": {"id": 4},
"data": {
"name": "Euroset",
"description": "Euroset",
"terminal": {"value": [
{"id": 10}
"categories": {"value": [
{"id": 4}
]},
"proxy": {
"ref": {"id": 4},
"additional": {}
},
"abs_account": "1000000042"
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 1},
"data": {
"name": "Mocketbank Visa Test",
"description": "Mocketbank Visa Test",
"payment_method": {"id": {"bank_card": "visa"}},
"category": {"id": 1},
"risk_coverage": "high",
"cash_flow": [
"payment_methods": {"value": [
{"id": {"bank_card": "visa"}},
{"id": {"bank_card": "mastercard"}}
]},
"cash_limit": {"value": {
"lower": {"inclusive": {"amount": 1000, "currency": {"symbolic_code": "RUB"}}},
"upper": {"exclusive": {"amount": 10000000, "currency": {"symbolic_code": "RUB"}}}
}},
"cash_flow": {"decisions": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 15, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
},
"payment_flow":
{"hold": {"hold_lifetime": {"seconds": 3}}
}
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 2},
"data": {
"name": "Mocketbank MC Test",
"description": "Mocketbank MC Test",
"payment_method": {"id": {"bank_card": "mastercard"}},
"category": {"id": 1},
"risk_coverage": "high",
"cash_flow": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 18, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
},
"payment_flow":
{"hold": {"hold_lifetime": {"seconds": 3}}
}
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 3},
"data": {
"name": "Mocketbank Maestro Test",
"description": "Mocketbank Maestro Test",
"payment_method": {"id": {"bank_card": "maestro"}},
"category": {"id": 1},
"risk_coverage": "high",
"cash_flow": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 19, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 4},
"data": {
"name": "Mocketbank Visa Live",
"description": "Mocketbank Visa Live",
"payment_method": {"id": {"bank_card": "visa"}},
"category": {"id": 2},
"risk_coverage": "high",
"cash_flow": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 15, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 5},
"data": {
"name": "Mocketbank MC Live",
"description": "Mocketbank MC Live",
"payment_method": {"id": {"bank_card": "mastercard"}},
"category": {"id": 2},
"risk_coverage": "high",
"cash_flow": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 18, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 6},
"data": {
"name": "Mocketbank Maestro Live",
"description": "Mocketbank Maestro Live",
"payment_method": {"id": {"bank_card": "maestro"}},
"category": {"id": 2},
"risk_coverage": "high",
"cash_flow": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 19, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 7},
"data": {
"name": "TCS Visa",
"description": "TCS Visa",
"payment_method": {"id": {"bank_card": "visa"}},
"category": {"id": 2},
"risk_coverage": "high",
"cash_flow": [
"if_": {"condition": {"payment_tool": {"bank_card": {"payment_system_is": "visa"}}}},
"then_": {"value": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
@ -515,23 +386,11 @@
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 14, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 8},
"data": {
"name": "TCS MC",
"description": "TCS MC",
"payment_method": {"id": {"bank_card": "mastercard"}},
"category": {"id": 2},
"risk_coverage": "high",
"cash_flow": [
]}
},
{
"if_": {"condition": {"payment_tool": {"bank_card": {"payment_system_is": "mastercard"}}}},
"then_": {"value": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
@ -542,65 +401,147 @@
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 17, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
]}
}
]}
},
"accounts": [
{"key": {"symbolic_code": "RUB"}, "value": {
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}}
]
}
}}}},
{"insert": {"object": {"provider": {
"ref": {"id": 3},
"data": {
"name": "VTB24",
"description": "VTB24",
"terminal": {"value": [
{"id": 3}
]},
"proxy": {
"ref": {"id": 3},
"additional": {}
},
"abs_account": "1000000002",
"terms": {
"currencies": {"value": [
{"symbolic_code": "RUB"}
]},
"categories": {"value": [
{"id": 3}
]},
"payment_methods": {"value": [
{"id": {"bank_card": "nspkmir"}}
]},
"cash_limit": {"value": {
"lower": {"inclusive": {"amount": 1000, "currency": {"symbolic_code": "RUB"}}},
"upper": {"exclusive": {"amount": 10000000, "currency": {"symbolic_code": "RUB"}}}
}},
"cash_flow": {"value": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 23, "q": 1000}, "of": "payment_amount"}}
}
]}
},
"accounts": [
{"key": {"symbolic_code": "RUB"}, "value": {
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}}
]
}
}}}},
{"insert": {"object": {"provider": {
"ref": {"id": 4},
"data": {
"name": "Euroset",
"description": "Euroset",
"terminal": {"value": [
{"id": 4}
]},
"proxy": {
"ref": {"id": 4},
"additional": {}
},
"abs_account": "1000000042",
"terms": {
"currencies": {"value": [
{"symbolic_code": "RUB"}
]},
"categories": {"value": [
{"id": 2}
]},
"payment_methods": {"value": [
{"id": {"payment_terminal": "euroset"}}
]},
"cash_limit": {"value": {
"lower": {"inclusive": {"amount": 10000, "currency": {"symbolic_code": "RUB"}}},
"upper": {"exclusive": {"amount": 1000000, "currency": {"symbolic_code": "RUB"}}}
}},
"cash_flow": {"value": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 23, "q": 1000}, "of": "payment_amount"}}
}
]}
},
"accounts": [
{"key": {"symbolic_code": "RUB"}, "value": {
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}}
]
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 9},
"ref": {"id": 1},
"data": {
"name": "Mocketbank Test Acquiring",
"description": "Mocketbank Test Acquiring",
"risk_coverage": "high"
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 2},
"data": {
"name": "TCS Acquiring",
"description": "TCS Acquiring",
"risk_coverage": "high"
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 3},
"data": {
"name": "VTB24 НСПК Мир",
"description": "VTB24 НСПК Мир",
"payment_method": {"id": {"bank_card": "nspkmir"}},
"category": {"id": 2},
"risk_coverage": "high",
"cash_flow": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 23, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}
"risk_coverage": "high"
}
}}}},
{"insert": {"object": {"terminal": {
"ref": {"id": 10},
"ref": {"id": 4},
"data": {
"name": "Euroset",
"description": "Терминал Евросеть для магазинов с боевой категорией",
"payment_method": {"id": {"payment_terminal": "euroset"}},
"category": {"id": 2},
"risk_coverage": "high",
"cash_flow": [
{
"source": {"provider": "settlement"},
"destination": {"merchant": "settlement"},
"volume": {"share": {"parts": {"p": 1, "q": 1}, "of": "payment_amount"}}
},
{
"source": {"system": "settlement"},
"destination": {"provider": "settlement"},
"volume": {"share": {"parts": {"p": 23, "q": 1000}, "of": "payment_amount"}}
}
],
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
}
"risk_coverage": "high"
}
}}}},

2
scripts/dominant/commit-base-fixture.sh
View File

@ -23,6 +23,6 @@ case "$1" in
FIXTURE="$(${LIBDIR}/template.sh ${CURDIR}/base-fixture.commit.json.tpl $*)"
woorl $* \
-s damsel/proto/domain_config.thrift \
http://dominant:8022/v1/domain/repository \
http://${DOMINANT:-dominant}:${THRIFT_PORT:-8022}/v1/domain/repository \
Repository Commit 0 "${FIXTURE}"
esac

2
scripts/dominant/create-account.sh
View File

@ -7,5 +7,5 @@ shift 1
woorl $* \
-s damsel/proto/accounter.thrift \
http://${SHUMWAY}:${THRIFT_PORT}/accounter \
http://${SHUMWAY:-shumway}:${THRIFT_PORT:-8022}/accounter \
Accounter CreateAccount "{\"currency_sym_code\":\"${CURRENCY}\"}"