Merge pull request #143 from ProzorroUKR/plan_tender

plan tender for monitorings and validations

Merge pull request #143 from ProzorroUKR/plan_tender
plan tender for monitorings and validations
alexdiatlov · GitHub
2 parents ba9524db 13a9a4e0
Showing 4 changed files with 26 additions and 8 deletions
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/monitoring.robot
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @7203b85
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @7203b85
@@ -68,6 +68,9 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status": 
 Можливість оголосити тендер з використанням валідації для MNN
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
+  ${ARTIFACT}=  load_data_from  ${file_path}
+  Log  ${ARTIFACT.tender_uaid}
   [Arguments]  ${data_version}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
@@ -84,11 +87,14 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status": 
   ...      moz_integration=${${MOZ_INTEGRATION}}
   ...      road_index=${${ROAD_INDEX}}
   ...      gmdn_index=${${GMDN_INDEX}}
+  ...      plan_tender=${${PLAN_TENDER}}
   ${DIALOGUE_TYPE}=  Get Variable Value  ${DIALOGUE_TYPE}
   ${FUNDING_KIND}=  Get Variable Value  ${FUNDING_KIND}
   Run keyword if  '${DIALOGUE_TYPE}' != '${None}'  Set to dictionary  ${tender_parameters}  dialogue_type=${DIALOGUE_TYPE}
   Run keyword if  '${FUNDING_KIND}' != '${None}'  Set to dictionary  ${tender_parameters}  fundingKind=${FUNDING_KIND}
-  ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}
+  ${plan_data}=  Run as  ${tender_owner}  Пошук плану по ідентифікатору  ${ARTIFACT.tender_uaid}
+  Log  ${plan_data}
+  ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}  ${plan_data}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_mnn}=  edit_tender_data_for_mnn  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_mnn}
@@ -99,6 +105,9 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status": 
 Можливість оголосити тендер з використанням валідації Індекс автомобільних доріг
   [Arguments]  ${data_version}
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
+  ${ARTIFACT}=  load_data_from  ${file_path}
+  Log  ${ARTIFACT.tender_uaid}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
   ${NUMBER_OF_MILESTONES}=  Convert To Integer  ${NUMBER_OF_MILESTONES}
@@ -114,11 +123,14 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status": 
   ...      moz_integration=${${MOZ_INTEGRATION}}
   ...      road_index=${${ROAD_INDEX}}
   ...      gmdn_index=${${GMDN_INDEX}}
+  ...      plan_tender=${${PLAN_TENDER}}
   ${DIALOGUE_TYPE}=  Get Variable Value  ${DIALOGUE_TYPE}
   ${FUNDING_KIND}=  Get Variable Value  ${FUNDING_KIND}
   Run keyword if  '${DIALOGUE_TYPE}' != '${None}'  Set to dictionary  ${tender_parameters}  dialogue_type=${DIALOGUE_TYPE}
   Run keyword if  '${FUNDING_KIND}' != '${None}'  Set to dictionary  ${tender_parameters}  fundingKind=${FUNDING_KIND}
-  ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}
+  ${plan_data}=  Run as  ${tender_owner}  Пошук плану по ідентифікатору  ${ARTIFACT.tender_uaid}
+  Log  ${plan_data}
+  ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}  ${plan_data}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_cost}=  edit_tender_data_for_cost  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_cost}
@@ -129,6 +141,9 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status": 
 Можливість оголосити тендер з використанням валідації класифікатор медичних виробів
   [Arguments]  ${data_version}
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
+  ${ARTIFACT}=  load_data_from  ${file_path}
+  Log  ${ARTIFACT.tender_uaid}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
   ${NUMBER_OF_MILESTONES}=  Convert To Integer  ${NUMBER_OF_MILESTONES}
@@ -144,11 +159,14 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status": 
   ...      moz_integration=${${MOZ_INTEGRATION}}
   ...      road_index=${${ROAD_INDEX}}
   ...      gmdn_index=${${GMDN_INDEX}}
+  ...      plan_tender=${${PLAN_TENDER}}
   ${DIALOGUE_TYPE}=  Get Variable Value  ${DIALOGUE_TYPE}
   ${FUNDING_KIND}=  Get Variable Value  ${FUNDING_KIND}
   Run keyword if  '${DIALOGUE_TYPE}' != '${None}'  Set to dictionary  ${tender_parameters}  dialogue_type=${DIALOGUE_TYPE}
   Run keyword if  '${FUNDING_KIND}' != '${None}'  Set to dictionary  ${tender_parameters}  fundingKind=${FUNDING_KIND}
-  ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}
+  ${plan_data}=  Run as  ${tender_owner}  Пошук плану по ідентифікатору  ${ARTIFACT.tender_uaid}
+  Log  ${plan_data}
+  ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}  ${plan_data}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_gmdn}=  edit_tender_data_for_gmdn  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_gmdn}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @7203b85
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @7203b85
@@ -198,7 +198,6 @@ Library  openprocurement_client.utils
   ...      ${ARTIFACT.tender_id}
   ...      ${tender_data}
   ...      access_token=${ARTIFACT.tender_owner_access_token}
-  #${tender}=  Call Method  ${USERS.users['${username}'].client}  create_tender  ${tender_data}
   Log  ${tender}
   ${access_token}=  Get Variable Value  ${tender.access.token}
   ${status}=  Set Variable If  'open' in '${MODE}'  active.tendering  ${EMPTY}
--- a/op_robot_tests/tests_files/initial_data.py
View file @7203b85
+++ b/op_robot_tests/tests_files/initial_data.py
View file @7203b85
@@ -323,9 +323,9 @@ def test_tender_data_planning(params):
     if params.get('moz_integration'):
         id_cpv = 336
     elif params.get('road_index'):
-        id_cpv = 'road'
+        id_cpv = fake.road_cpv()[:4]
     elif params.get('gmdn_index'):
-        id_cpv = 'gmdn'
+        id_cpv = fake.gmdn_cpv()[:4]
     else:
         id_cpv = fake.cpv()[:4]
     cpv_data = test_item_data(id_cpv)
@@ -339,7 +339,7 @@ def test_tender_data_planning(params):
     del data['quantity']
     del data['unit']
     for i in range(params['number_of_items']):
-        item_data=test_item_data(id_cpv)
+        item_data = test_item_data(id_cpv)
         del item_data['deliveryAddress']
         del item_data['deliveryLocation']
         item_data['deliveryDate']['endDate'] = (get_now() + timedelta(days=10)).replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
@@ -862,7 +862,7 @@ def test_elimination_report(corruption, relatedParty_id):
 def test_tender_data_esco(params, submissionMethodDetails, plan_data):
-    data = test_tender_data(params, ('tender',), submissionMethodDetails, plan_data)
+    data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     data['procurementMethodType'] = 'esco'
     data['title_en'] = "[TESTING]"
     for item_number, item in enumerate(data['items']):
--- a/op_robot_tests/tests_files/monitoring.robot
View file @7203b85
+++ b/op_robot_tests/tests_files/monitoring.robot
View file @7203b85
@@ -19,6 +19,7 @@ ${MOZ_INTEGRATION}   ${False}
 ${VAT_INCLUDED}     ${True}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${PLAN_TENDER}      ${True}
 *** Test Cases ***
 Можливість оголосити тендер