add payment_wrapper/client, payment keyword, chahge output of complaint creation

AlexDiatlov
1 parent 17b763d0
Showing 2 changed files with 54 additions and 10 deletions
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/brokers/openprocurement_client_helper.py
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @e6cea6c
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @e6cea6c
@@ -70,8 +70,17 @@ Library  openprocurement_client.utils
   Log  ${auth_ds}
   ${ds_config}=  Create Dictionary  host_url=${ds_host_url}  auth_ds=${auth_ds}
-  ${plan_api_wrapper}=  prepare_plan_api_wrapper  ${USERS.users['${username}'].api_key}  PLANS  ${API_HOST_URL}  ${API_VERSION}
-  ${tender_api_wrapper}=  prepare_api_wrapper  ${USERS.users['${username}'].api_key}  TENDERS  ${API_HOST_URL}  ${API_VERSION}  ${ds_config}
+  ${plan_api_wrapper}=  prepare_plan_api_wrapper
+  ...  ${USERS.users['${username}'].api_key}
+  ...  PLANS
+  ...  ${API_HOST_URL}
+  ...  ${API_VERSION}
+  ${tender_api_wrapper}=  prepare_api_wrapper
+  ...  ${USERS.users['${username}'].api_key}
+  ...  TENDERS
+  ...  ${API_HOST_URL}
+  ...  ${API_VERSION}
+  ...  ${ds_config}
   ${tender_create_wrapper}=  prepare_tender_create_wrapper
   ...  ${USERS.users['${username}'].api_key}
   ...  PLANS
@@ -91,7 +100,17 @@ Library  openprocurement_client.utils
   ...  ${API_HOST_URL}
   ...  ${API_VERSION}
   ...  ${ds_config}
-  ${agreement_wrapper}=  prepare_agreement_api_wrapper  ${USERS.users['${username}'].api_key}  AGREEMENTS  ${API_HOST_URL}  ${API_VERSION}  ${ds_config}
+  ${agreement_wrapper}=  prepare_agreement_api_wrapper
+  ...  ${USERS.users['${username}'].api_key}
+  ...  AGREEMENTS
+  ...  ${API_HOST_URL}
+  ...  ${API_VERSION}
+  ...  ${ds_config}
+  ${payment_wrapper}=  prepare_payment_wrapper
+  ...  ${USERS.users['${username}'].api_key}
+  ...  PUSH
+  ...  ${PAYMENT_API}
+  ...  ${PAYMENT_API_VERSION}
   Set To Dictionary  ${USERS.users['${username}']}  client=${tender_api_wrapper}
   Set To Dictionary  ${USERS.users['${username}']}  plan_client=${plan_api_wrapper}
   Set To Dictionary  ${USERS.users['${username}']}  tender_create_client=${tender_create_wrapper}
@@ -99,11 +118,17 @@ Library  openprocurement_client.utils
   Set To Dictionary  ${USERS.users['${username}']}  dasu_client=${dasu_api_wraper}
   Set To Dictionary  ${USERS.users['${username}']}  access_token=${EMPTY}
   Set To Dictionary  ${USERS.users['${username}']}  amcu_client=${amcu_api_wrapper}
+  Set To Dictionary  ${USERS.users['${username}']}  payment_client=${payment_wrapper}
   ${id_map}=  Create Dictionary
   Set To Dictionary  ${USERS.users['${username}']}  id_map=${id_map}
   Log  ${EDR_HOST_URL}
   Log  ${EDR_VERSION}
-  ${edr_wrapper}=  prepare_edr_wrapper  ${EDR_HOST_URL}  ${EDR_VERSION}  ${USERS.users['${username}'].auth_edr[0]}  ${USERS.users['${username}'].auth_edr[1]}
+  ${edr_wrapper}=  prepare_edr_wrapper
+  ...  ${EDR_HOST_URL}
+  ...  ${EDR_VERSION}
+  ...  ${USERS.users['${username}'].auth_edr[0]}
+  ...  ${USERS.users['${username}'].auth_edr[1]}
+  Log  ${edr_wrapper}
   Set To Dictionary  ${USERS.users['${username}']}  edr_client=${edr_wrapper}
   #Variables for contracting_management module
   ${contract_api_wrapper}=  prepare_contract_api_wrapper  ${USERS.users['${username}'].api_key}  CONTRACTS  ${api_host_url}  ${api_version}  ${ds_config}
@@ -902,8 +927,8 @@ Library  openprocurement_client.utils
 Створити чернетку скарги про виправлення умов закупівлі
   [Documentation]  Створює скаргу у статусі "draft"
-  [Arguments]  ${username}  ${tender_uaid}  ${complaint}
-  Log  ${complaint}
+  [Arguments]  ${username}  ${tender_uaid}  ${complaint_data}
+  Log  ${complaint_data}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору
   ...      ${username}
   ...      ${tender_uaid}
@@ -911,11 +936,11 @@ Library  openprocurement_client.utils
   ...      ${USERS.users['${username}'].client}
   ...      create_complaint
   ...      ${tender.data.id}
-  ...      ${complaint}
+  ...      ${complaint_data}
   ...      access_token=${tender.access.token}
   Log  ${reply}
   Set To Dictionary  ${USERS.users['${username}']}  complaint_access_token=${reply.access.token}
-  [return]  ${reply.data.complaintID}
+  [return]  ${reply.data}
 Створити чернетку вимоги про виправлення умов лоту
@@ -1232,6 +1257,14 @@ Library  openprocurement_client.utils
   Log  ${reply}
+Виконати оплату скарги
+  [Documentation]  Виконує запит на push в liqpay
+  [Arguments]  ${username}  ${payment_data}
+  ${payment}=  Run Keyword And Ignore Error  call method  ${USERS.users['${username}'].payment_client}  create_payment
+  ...  ${payment_data}
+  Log  ${payment}
+
+
 Змінити статус скарги
   [Documentation]  Переводить скаргу в tender/lot в інший статус
   [Arguments]  ${username}  ${tender_uaid}  ${complaintID}  ${confirmation_data}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client_helper.py
View file @e6cea6c
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client_helper.py
View file @e6cea6c
@@ -12,6 +12,7 @@ from time import sleep
 import os
 import urllib
 from openprocurement_client.resources.tenders import TenderCreateClient
+from openprocurement_client.resources.tenders import PaymentClient
 def retry_if_request_failed(exception):
@@ -208,8 +209,7 @@ class StableTenderCreateClient(TenderCreateClient):
 def prepare_tender_create_wrapper(key, resource, host_url, api_version, ds_config=None):
-    return StableTenderCreateClient(key, resource, host_url, api_version,
-                                    ds_config=ds_config)
+    return StableTenderCreateClient(key, resource, host_url, api_version, ds_config=ds_config)
 class StableClientAmcu(Client):
@@ -221,3 +221,14 @@ class StableClientAmcu(Client):
 def prepare_amcu_api_wrapper(key, resource, host_url, api_version, ds_config=None):
     return StableClientAmcu(key, resource, host_url, api_version, ds_config=ds_config)
+
+
+class StableClientPayment(PaymentClient):
+    @retry(stop_max_attempt_number=100, wait_random_min=500,
+           wait_random_max=4000, retry_on_exception=retry_if_request_failed)
+    def request(self, *args, **kwargs):
+        return super(StableClientPayment, self).request(*args, **kwargs)
+
+
+def prepare_payment_wrapper(key, resource, host_url, api_version):
+    return StableClientPayment(key, resource, host_url, api_version)