Skip to content

Feature/smartpay_actions #222

Open
Dan1lD wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Feature/smartpay_actions #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49b470a
add SmartPayAction
Dan1lD Mar 10, 2022
a012c65
add actions for SmartPay
Dan1lD Mar 21, 2022
6427a2e
smartpay refactoring
Dan1lD Mar 30, 2022
6cd52a4
smartpay refactoring
Dan1lD Apr 1, 2022
b224cb1
smartpay refactoring and unittests
Dan1lD Apr 4, 2022
2a34f51
add examples for smartpay
Dan1lD Apr 8, 2022
c5e680b
add examples for smartpay
Dan1lD Apr 8, 2022
a21fa41
refactoring
Dan1lD Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
327 changes: 327 additions & 0 deletions core/basic_models/actions/smartpay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,327 @@
from typing import Optional, Dict, Union, List

from core.basic_models.actions.command import Command
from core.model.base_user import BaseUser
from core.text_preprocessing.base import BaseTextPreprocessingResult
from smart_kit.action.http import HTTPRequestAction


class SmartPayAction(HTTPRequestAction):
url = None
method = None
store = None

def __init__(self, items, id=None):
request_params = items.get("request_params")
smartpay_params = items.get("smartpay_params")

items = {
"params": {"method": self.method, "url": self.url},
"store": self.store,
"behavior": items["behavior"]
}
if request_params:
items["params"]["params"] = request_params
if smartpay_params:
items["params"]["json"] = smartpay_params

super().__init__(items, id)

def run(self, user: BaseUser, text_preprocessing_result: BaseTextPreprocessingResult,
params: Optional[Dict[str, Union[str, float, int]]] = None) -> Optional[List[Command]]:
self.http_action.method_params["url"] = \
user.settings["template_settings"]["smartpay_url"] + self.http_action.method_params["url"]
return super().run(user, text_preprocessing_result, params)


class SmartPayCreateAction(SmartPayAction):

"""
Example::
{
"type": "smartpay_create",
"behavior": "some_behavior", // обязательный параметр
"smartpay_params": { // обязательноый параметр
"ptype": 1,
"invoice": {
"purchaser": {
"email": "test@test.ru",
"phone": "71111111111",
"contact": "phone"
},
"delivery_info": {
"address": {
"country": "RU",
"city": "Москва",
"address": "Кутузовский проспект, 32"
},
"delivery_type": "courier",
"description": "Спросить '\''Где тут Сбердевайсы?'\''"
},
"invoice_params": [
{
"key": "packageName",
"value": "SbERdeVICEs"
},
{
"key": "packageKey",
"value": "ru.sberdevices.test"
}
],
"order": {
"order_id": "a952b7ee-c928-4586-bd05-d932c21f749",
"order_number": "1952",
"order_date": "2021-04-07T08:24:37.729Z",
"service_id": "13",
"amount": 79900,
"currency": "RUB",
"purpose": "Покупка продуктов",
"description": "Заказ № 22-1952. Покупка продуктов",
"language": "ru-RU",
"tax_system": 0,
"order_bundle": [
{
"position_id": 1,
"name": "Транзистор",
"item_params": [
{
"key": "_itemAttributes_supplier_info.name",
"value": "ООО Ромашка"
},
{
"key": "_itemAttributes_supplier_info.inn",
"value": "5009053292"
},
{
"key": "_itemAttributes_nomenclature",
"value": "Å\u001e13622200005881"
},
{
"key": "_itemAttributes_agent_info.type",
"value": "7"
}

],
"quantity": {
"value": 1,
"measure": "шт."
},
"item_amount": 79801,
"currency": "RUB",
"item_code": "21ff407a-fa98-11e8-80c5-0cc47a817926",
"item_price": 79801,
"discount_type": "amount",
"discount_value": 17687,
"tax_type": 6
},
{
"position_id": 2,
"name": "Тиристор",
"item_params": [
{
"key": "code",
"value": "123значение321"
},
{
"key": "pack",
"value": "100"
},
{
"key": "_itemAttributes_supplier_info.name",
"value": "ООО Платежи"
},
{
"key": "_itemAttributes_supplier_info.inn",
"value": "7730253720"
}
],
"quantity": {
"value": 1,
"measure": "шт."
},
"item_amount": 99,
"currency": "RUB",
"item_code": "21ff407c-fa98-11e8-80c5-0cc47a817926",
"item_price": 99,
"discount_type": "amount",
"discount_value": 21,
"tax_type": 6,
}
]
}
}
}
}
"""

def __init__(self, items, id=None):
self.url = "/invoices"
Comment thread
Dan1lD marked this conversation as resolved.
self.method = self.POST
self.store = "smartpay_create_answer"
super().__init__(items, id)


class SmartPayPerformAction(SmartPayAction):

"""
Example::
{
"type": "smartpay_perform",
"behavior": "some_behavior", // обязательный параметр
"invoice_id": "0", // обязательный параметр
"smartpay_params": { // обязательынй параметр
"user_id": {
"partner_client_id": "2223"
},
"operations": [
{
"operation": "payment",
"code": "invoice",
"value": "167900"
}
],
"device_info": {
"device_platform_type": "iOS",
"device_platform_version": "13.6.1",
"device_model": "iPhone 7",
"device_manufacturer": "Apple",
"device_id": "83c3f257-46d8-41fe-951b-f79d04e288c2",
"surface": "SBOL",
"surface_version": "11.5.0"
},
"return_url": "https://ok",
"fail_url": "https://fail"
}
}
"""

def __init__(self, items, id=None):
self.url = f"/invoices/{items['invoice_id']}"
self.method = self.POST
self.store = "smartpay_perform_answer"
super().__init__(items, id)


class SmartPayGetStatusAction(SmartPayAction):

"""
Example::
{
"type": "smartpay_get_status",
"behavior": "some_behavior", // обязательный параметр
"invoice_id": "0", // обязательный параметр
"inv_status": "executed", // опциональный параметр
"wait": 50 // опциональный параметр
}
"""

def __init__(self, items, id=None):
items["request_params"] = {}
inv_status = items.get("inv_status")
wait = items.get("wait")
if inv_status:
del items["inv_status"]
items["request_params"]["inv_status"] = inv_status
if wait:
del items["wait"]
items["request_params"]["wait"] = wait

self.url = f"/invoices/{items['invoice_id']}"
self.method = self.GET
self.store = "smartpay_get_status_answer"
super().__init__(items, id)


class SmartPayConfirmAction(SmartPayAction):

"""
Example::
{
"type": "smartpay_confirm",
"invoice_id": "0", // обязательный параметр
"smartpay_params": { // опциональный параметр, задаётся для неполной суммы (см. доку SmartPay API)
"invoice": {
"order": {
"amount": 79801,
"currency": "RUB",
"order_bundle": [
{
"position_id": 1,
"name": "Транзистор",
"quantity": {
"value": 1,
"measure": "шт."
},
"item_amount": 79801,
"currency": "RUB",
"item_code": "21ff407a-fa98-11e8-80c5-0cc47a817926",
"item_price": 79801
}
]
}
}
}
}
"""

def __init__(self, items, id=None):
self.url = f"/invoices/{items['invoice_id']}"
self.method = self.PUT
self.store = "smartpay_confirm_answer"
super().__init__(items, id)


class SmartPayDeleteAction(SmartPayAction):

"""
Example::
{
"type": "smartpay_delete",
"behavior": "my_behavior", // обязательынй параметр
"invoice_id": "0" // обязательынй параметр
}
"""

def __init__(self, items, id=None):
self.url = f"/invoices/{items['invoice_id']}"
self.method = self.DELETE
self.store = "smartpay_delete_answer"
super().__init__(items, id)


class SmartPayRefundAction(SmartPayAction):

"""
Example::
{
"type": "smartpay_refund",
"behavior": "some_behavior", // обязательный параметр
"invoice_id": "0", // обязательный параметр
"smartpay_params": { // опциональный параметр, задаётся при частичном возврате (см. доку SmartPay API)
"invoice": {
"order": {
"current_amount": 79900,
"refund_amount": 79801,
"currency": "RUB",
"order_bundle": [
{
"position_id": 1,
"name": "Транзистор",
"quantity": {
"value": 1
},
"item_amount": 79801,
"item_code": "21ff407a-fa98-11e8-80c5-0cc47a817926"
}
]
}
}
}
}
"""

def __init__(self, items, id=None):
self.url = f"/invoices/{items['invoice_id']}"
self.method = self.PATCH
self.store = "smartpay_refund_answer"
super().__init__(items, id)
6 changes: 3 additions & 3 deletions smart_kit/action/base_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ def _make_response(self, request_parameters, user):
except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError):
self.error = self.CONNECTION

def _get_requst_params(self, user: BaseUser, text_preprocessing_result: BaseTextPreprocessingResult,
params: Optional[Dict[str, Union[str, float, int]]] = None):
def _get_request_params(self, user: BaseUser, text_preprocessing_result: BaseTextPreprocessingResult,
params: Optional[Dict[str, Union[str, float, int]]] = None):
collected = user.parametrizer.collect(text_preprocessing_result)
params.update(collected)

Expand Down Expand Up @@ -97,6 +97,6 @@ def _log_response(self, user, response, data):
def run(self, user: BaseUser, text_preprocessing_result: BaseTextPreprocessingResult,
params: Optional[Dict[str, Union[str, float, int]]] = None) -> Optional[List[Command]]:
params = params or {}
request_parameters = self._get_requst_params(user, text_preprocessing_result, params)
request_parameters = self._get_request_params(user, text_preprocessing_result, params)
self._log_request(user, request_parameters)
return self._make_response(request_parameters, user)
5 changes: 5 additions & 0 deletions smart_kit/action/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ class HTTPRequestAction(Action):
"""

HTTP_ACTION = BaseHttpRequestAction
POST = "POST"
GET = "GET"
PUT = "PUT"
DELETE = "DELETE"
PATCH = "PATCH"

def __init__(self, items, id=None):
self.http_action = self.HTTP_ACTION(items["params"], id)
Expand Down
8 changes: 8 additions & 0 deletions smart_kit/resources/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
from core.basic_models.actions.external_actions import ExternalAction
from core.basic_models.actions.external_actions import ExternalActions
from core.basic_models.actions.push_action import PushAction, PUSH_NOTIFY
from core.basic_models.actions.smartpay import SmartPayCreateAction, SmartPayPerformAction, SmartPayGetStatusAction, \
SmartPayConfirmAction, SmartPayDeleteAction, SmartPayRefundAction
from core.basic_models.actions.string_actions import StringAction, AfinaAnswerAction, SDKAnswer, \
SDKAnswerToUser
from core.basic_models.answer_items.answer_items import items_factory, SdkAnswerItem, answer_items, BubbleText, \
Expand Down Expand Up @@ -315,6 +317,12 @@ def init_actions(self):
actions["push"] = PushAction
actions["give_me_memory"] = GiveMeMemoryAction
actions["remember_this"] = RememberThisAction
actions["smartpay_create"] = SmartPayCreateAction
actions["smartpay_perform"] = SmartPayPerformAction
actions["smartpay_get_status"] = SmartPayGetStatusAction
actions["smartpay_confirm"] = SmartPayConfirmAction
actions["smartpay_delete"] = SmartPayDeleteAction
actions["smartpay_refund"] = SmartPayRefundAction

def init_requirements(self):
requirements[None] = Requirement
Expand Down
Loading