Merge pull request #167 from ProzorroUKR/plan_status/breakdown

Plan status/breakdown

Merge pull request #167 from ProzorroUKR/plan_status/breakdown
Plan status/breakdown
alexdiatlov · GitHub
2 parents 6c745e90 b72ed52e
Showing 16 changed files with 258 additions and 24 deletions
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/data/brokers.yaml
op_robot_tests/tests_files/data/users.yaml
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/keywords.robot
op_robot_tests/tests_files/openProcedure.robot
op_robot_tests/tests_files/planning.robot
op_robot_tests/tests_files/service_keywords.py
robot_tests_arguments/below.txt
robot_tests_arguments/below_simple.txt
robot_tests_arguments/negotiation_full.txt
robot_tests_arguments/negotiation_quick_full.txt
robot_tests_arguments/negotiation_quick_testing.txt
robot_tests_arguments/negotiation_testing.txt
robot_tests_arguments/planning.txt
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @b419665
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @b419665
@@ -11,7 +11,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
 *** Keywords ***
 Можливість оголосити тендер
-  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_uaid}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
@@ -242,6 +242,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
 Можливість створити план закупівлі
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
+  ${NUMBER_OF_BREAKDOWN}=  Convert To Integer  ${NUMBER_OF_BREAKDOWN}
   ${tender_parameters}=  Create Dictionary
   ...      mode=${MODE}
   ...      number_of_items=${NUMBER_OF_ITEMS}
@@ -250,6 +251,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ...      moz_integration=${${MOZ_INTEGRATION}}
   ...      road_index=${${ROAD_INDEX}}
   ...      gmdn_index=${${GMDN_INDEX}}
+  ...      number_of_breakdown=${NUMBER_OF_BREAKDOWN}
   ${DIALOGUE_TYPE}=  Get Variable Value  ${DIALOGUE_TYPE}
   Run keyword if  '${DIALOGUE_TYPE}' != '${None}'  Set to dictionary  ${tender_parameters}  dialogue_type=${DIALOGUE_TYPE}
   ${tender_data}=  Підготувати дані для створення плану  ${tender_parameters}
@@ -378,6 +380,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
 Перевірити неможливість зміни поля ${field_name} тендера на значення ${field_value} для користувача ${username}
   Require Failure  ${username}  Внести зміни в тендер  ${TENDER['TENDER_UAID']}  ${field_name}  ${field_value}
+
 Можливість змінити поле ${field_name} плану на ${field_value}
   Run As  ${tender_owner}  Внести зміни в план  ${TENDER['TENDER_UAID']}  ${field_name}  ${field_value}
@@ -1708,3 +1711,28 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${document}=  openprocurement_client.Отримати останній документ кваліфікації з типом registerExtract  ${username}  ${tender_uaid}  ${award_id}
   Порівняти об'єкти  ${document['title']}  edr_identification.yaml
+##############################################################################################
+#             PLAN
+##############################################################################################
+
+Можливість скасувати план
+  ${cancellation_data}=  Підготувати дані про скасування плану
+  Run As  ${tender_owner}
+  ...      Скасувати план
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${cancellation_data}
+  Set To Dictionary  ${USERS.users['${tender_owner}']}  plan_cancellation_data=${cancellation_data}
+
+
+Можливість перевірити статус плану після публікації тендера
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
+  ${ARTIFACT}=  load_data_from  ${file_path}
+  Log  ${ARTIFACT.tender_uaid}
+  Звірити статус плану  ${tender_owner}  ${ARTIFACT.tender_uaid}  complete
+
+
+Можливість змінити на ${percent} відсотки бюджет плану
+  ${percent}=  Convert To Number  ${percent}
+  ${divider}=  Convert To Number  0.01
+  ${value}=  mult_and_round  ${USERS.users['${tender_owner}'].tender_data.data.budget.amount}  ${percent}  ${divider}  precision=${2}
+  Можливість змінити поле budget.amount плану на ${value}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @b419665
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @b419665
@@ -190,7 +190,7 @@ Library  openprocurement_client.utils
 Створити тендер
   [Arguments]  ${username}  ${tender_data}
-  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_owner_access_token}
   Log  ${ARTIFACT.tender_id}
@@ -1681,6 +1681,36 @@ Library  openprocurement_client.utils
   ${filename}=  download_file_from_url  ${document.url}  ${OUTPUT_DIR}${/}${document.title}
   [return]  ${filename}
+
+Скасувати план
+  [Arguments]  ${username}  ${tender_uaid}  ${cancellation_reason}
+  ${tender}=  openprocurement_client.Пошук плану по ідентифікатору  ${username}  ${tender_uaid}
+  ${data}=  Create dictionary  cancellation=${cancellation_reason}
+  ${cancellation_data}=  Create dictionary  data=${data}
+  ${cancellation_data}=  munch_dict  arg=${cancellation_data}
+  ${cancel_reply}=  Call Method  ${USERS.users['${username}'].plan_client}  patch_plan
+  ...      ${tender.data.id}
+  ...      ${cancellation_data}
+  ...      access_token=${tender.access.token}
+  ${cancellation_id}=  Set variable  ${cancel_reply.data.id}
+  openprocurement_client.Підтвердити скасування плану  ${username}  ${tender_uaid}  ${cancellation_id}
+
+
+Підтвердити скасування плану
+  [Documentation]
+  ...      [Arguments] Username, tender uaid
+  ...      Find plan using uaid, get cancellation test_confirmation data and call patch_plan
+  ...      [Return] Nothing
+  [Arguments]  ${username}  ${tender_uaid}  ${cancellation_id}
+  ${tender}=  openprocurement_client.Пошук плану по ідентифікатору  ${username}  ${tender_uaid}
+  ${data}=  test_confirm_plan_cancel_data
+  Log  ${data}
+  ${reply}=  Call Method  ${USERS.users['${username}'].plan_client}  patch_plan
+  ...      ${tender.data.id}
+  ...      ${data}
+  ...      access_token=${tender.access.token}
+  Log  ${reply}
+
 ##############################################################################
 #             OpenUA procedure
 ##############################################################################
--- a/op_robot_tests/tests_files/data/brokers.yaml
View file @b419665
+++ b/op_robot_tests/tests_files/data/brokers.yaml
View file @b419665
@@ -65,7 +65,7 @@ Quinta:
         openeu:
             tender:  [1, 35]
         openua_defense:
-            tender:  [0, 30]
+            tender:  [0, 20]
         open_competitive_dialogue:
             accelerator: 1440
             tender:  [0, 30]
@@ -90,14 +90,27 @@ Quinta:
 Etender:
     intervals:
         default:
-            enquiry: [0, 5]
+            enquiry: [0, 7]
+            tender:  [0, 7]
+        belowThreshold:
+            enquiry: [0, 20]
+            tender:  [0, 20]
+            accelerator: 1440
+        openua:
+            tender:  [1, 17]
+        openeu:
+            tender:  [1, 35]
+        openua_defense:
+            tender:  [0, 38]
+        open_competitive_dialogue:
+            tender:  [0,  35]
     keywords_file: etender
     roles:
         provider:       Etender_Provider1
         provider1:      Etender_Provider2
         tender_owner:   Etender_Owner
         viewer:         Etender_Viewer
-    timeout_on_wait: 60
+    timeout_on_wait: 30
 DZO:
     intervals:
         default:
--- a/op_robot_tests/tests_files/data/users.yaml
View file @b419665
+++ b/op_robot_tests/tests_files/data/users.yaml
View file @b419665
@@ -74,31 +74,31 @@ users:
         size:     [1400, 900]
     Etender_Owner:
         broker:   Etender
-        homepage: "http://bid.uat.e-tender.biz/#/"
-        login:    Misha2
-        password: Password1
+        homepage: "https://qa-prozorro.e-tender.ua/#/"
+        login:    auto_owner
+        password: Qq123456
         browser:  chrome
         position: [0, 0]
         size:     [1366, 800]
     Etender_Provider1:
         broker:   Etender
-        homepage: "http://bid.uat.e-tender.biz/#/"
-        login:    st_org
-        password: 12345678
+        homepage: "https://qa-prozorro.e-tender.ua/#/"
+        login:    auto_provider1
+        password: Qq123456
         browser:  chrome
         position: [0, 0]
         size:     [1366, 800]
     Etender_Provider2:
         broker:   Etender
-        homepage: "http://bid.uat.e-tender.biz/#/"
-        login:    provider2
-        password: Qa123456
+        homepage: "https://qa-prozorro.e-tender.ua/#/"
+        login:    auto_provider2
+        password: Qq123456
         browser:  chrome
         position: [0, 0]
         size:     [1366, 800]
     Etender_Viewer:
         broker:   Etender
-        homepage: "http://bid.uat.e-tender.biz/#/"
+        homepage: "https://qa-prozorro.e-tender.ua/#/"
         browser:  chrome
         position: [0, 0]
         size:     [1366, 800]
--- a/op_robot_tests/tests_files/initial_data.py
View file @b419665
+++ b/op_robot_tests/tests_files/initial_data.py
View file @b419665
@@ -298,6 +298,7 @@ def test_tender_data_planning(params):
             "currency": "UAH",
             "amount": round(random.uniform(3000, 99999999999.99), 2),
             "id": str(fake.random_int(min=1, max=99999999999)) + "-" + str(fake.random_int(min=1, max=9)),
+            "breakdown": []
         },
         "procuringEntity": {
             "identifier": {
@@ -349,6 +350,12 @@ def test_tender_data_planning(params):
         data["tender"]["procurementMethod"] = "open"
     if params['mode'] in mode_limited:
         data["tender"]["procurementMethod"] = "limited"
+    if params.get('number_of_breakdown'):
+        value_data = breakdown_value_generation(params['number_of_breakdown'], data['budget']['amount'])
+        for value in value_data:
+            breakdown_element = test_breakdown_data()
+            breakdown_element['value']['amount'] = value
+            data['budget']['breakdown'].append(breakdown_element)
     return munchify(data)
@@ -784,7 +791,6 @@ def test_modification_data(item_id, field_name, field_value):
     return munchify({'data':data})
-
 def get_hash(file_contents):
     return ("md5:"+hashlib.md5(file_contents).hexdigest())
@@ -970,3 +976,39 @@ def invalid_buyers_data():
         "name": "Київський Тестовий Ліцей"
         }
     return munchify(buyers)
+
+
+def test_plan_cancel_data():
+    plan_cancel = {
+        "cancellation": {
+            "reason": "Підстава для скасування",
+            "reason_en": "Reason of the cancellation"
+        }
+    }
+    return munchify(plan_cancel)
+
+
+def test_confirm_plan_cancel_data():
+    return munchify({
+        "data": {
+            "cancellation": {
+                "status": "active"
+            }
+        }
+    })
+
+
+def test_breakdown_data():
+    return munchify({
+        "title": random.choice(["state", "local"]),
+        "description": fake.description(),
+        "value": {
+            "currency": "UAH"
+        }
+    })
+
+
+def breakdown_value_generation(number_of_breakdown, plan_value):
+    value_data = [round(random.uniform(1, plan_value / number_of_breakdown), 2) for _ in range(number_of_breakdown - 1)]
+    value_data.append(plan_value - sum(value_data))
+    return value_data
--- a/op_robot_tests/tests_files/keywords.robot
View file @b419665
+++ b/op_robot_tests/tests_files/keywords.robot
View file @b419665
@@ -28,6 +28,11 @@ Test Suite Teardown
   Run Keyword And Ignore Error  Створити артефакт
+Test Suite Teardown Plan
+  Close all browsers
+  Run Keyword And Ignore Error  Створити артефакт план
+
+
 Set Suite Variable With Default Value
   [Arguments]  ${suite_var}  ${def_value}
   ${tmp}=  Get Variable Value  ${${suite_var}}  ${def_value}
@@ -188,6 +193,23 @@ Get Broker Property By Username
   log_object_data  ${artifact}  file_name=artifact  update=${True}  artifact=${True}
+Створити артефакт план
+  ${artifact}=  Create Dictionary
+  ...      api_version=${API_VERSION}
+  ...      tender_uaid=${TENDER['TENDER_UAID']}
+  ...      last_modification_date=${TENDER['LAST_MODIFICATION_DATE']}
+  ...      mode=${MODE}
+  Run Keyword And Ignore Error  Set To Dictionary  ${artifact}
+  ...          tender_owner=${USERS.users['${tender_owner}'].broker}
+  ...          access_token=${USERS.users['${tender_owner}'].access_token}
+  ...          tender_id=${USERS.users['${tender_owner}'].tender_data.data.id}
+  ...          tender_owner_access_token=${USERS.users['${tender_owner}'].access_token}
+  Run Keyword And Ignore Error  Set To Dictionary  ${artifact}
+  ...      tender_file_properties=${USERS.users['${tender_owner}'].tender_document.file_properties}
+  Log   ${artifact}
+  log_object_data  ${artifact}  file_name=artifact_plan  update=${True}  artifact=${True}
+
+
 Завантажити дані про тендер
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
@@ -336,6 +358,19 @@ Get Broker Property By Username
   ...      document=${document}
   ...      description=${new_description}
   ${cancellation_data}=  munchify  ${cancellation_data}
+  Log  ${cancellation_data}
+  [Return]  ${cancellation_data}
+
+
+Підготувати дані про скасування плану
+  ${cancellation_reason}=  create_fake_sentence
+  ${cancellation_reason_en}=  create_fake_sentence
+  ${cancellation_data}=  Create Dictionary
+  ...       reason=${cancellation_reason}
+  ...       reason_en=${cancellation_reason_en}
+  ${cancellation_data}=  munchify  ${cancellation_data}
+  #${cancellation_data}=  test_plan_cancel_data
+  Log  ${cancellation_data}
   [Return]  ${cancellation_data}
@@ -951,6 +986,12 @@ Require Failure
   [Arguments]  ${username}  ${tender_uaid}  ${left}
   ${right}=  Run as  ${username}  Отримати інформацію із тендера  ${tender_uaid}  status
   Порівняти об'єкти  ${left}  ${right}
+  Порівняти об'єкти  ${left}  ${right}
+
+
+Звірити статус плану
+  [Arguments]  ${username}  ${tender_uaid}  ${left}
+  ${right}=  Run as  ${username}  Отримати інформацію із плану  ${tender_uaid}  status
 Звірити статус об'єкта моніторингу
--- a/op_robot_tests/tests_files/openProcedure.robot
View file @b419665
+++ b/op_robot_tests/tests_files/openProcedure.robot
View file @b419665
@@ -263,6 +263,15 @@ ${PLAN_TENDER}      ${True}
   Run Keyword And Expect Error  *  Можливість оголосити тендер з використанням валідації план-тендер  ${4}
+Перевірити статус плану - завершено
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Відображення основних даних плану
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      plan_status_complete_view
+  ...      critical
+  Можливість перевірити статус плану після публікації тендера
+
+
 Можливість знайти тендер по ідентифікатору
   [Tags]   ${USERS.users['${viewer}'].broker}: Пошук тендера
   ...      viewer  tender_owner  provider  provider1
--- a/op_robot_tests/tests_files/planning.robot
View file @b419665
+++ b/op_robot_tests/tests_files/planning.robot
View file @b419665
 *** Settings ***
 Resource        base_keywords.robot
 Suite Setup     Test Suite Setup
-Suite Teardown  Test Suite Teardown
+Suite Teardown  Test Suite Teardown Plan
 *** Variables ***
 ${RESOURCE}     plans
@@ -14,6 +14,7 @@ ${ITEM_MEAT}        ${False}
 ${MOZ_INTEGRATION}  ${False}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${NUMBER_OF_BREAKDOWN}  ${2}
 *** Test Cases ***
 Неможливість створити план закупівлі з двома buyers
@@ -55,6 +56,16 @@ ${GMDN_INDEX}       ${False}
   Можливість знайти план по ідентифікатору
+Відображення статусу плану - заплановано
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Відображення основних даних плану
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      status_sheduled_view
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  Звірити статус плану  ${tender_owner}  ${TENDER['TENDER_UAID']}  scheduled
+
+
 Відображення типу запланованого тендера
   [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних плану
   ...      viewer
@@ -265,8 +276,7 @@ ${GMDN_INDEX}       ${False}
   ...      critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
   [Teardown]  Оновити LAST_MODIFICATION_DATE
-  ${new_amount}=  create_fake_value_amount
-  Можливість змінити поле budget.amount плану на ${new_amount}
+  Можливість змінити на 150 відсотки бюджет плану
 Можливість змінити кінцеву дату доставки
@@ -337,3 +347,22 @@ ${GMDN_INDEX}       ${False}
   [Teardown]  Оновити LAST_MODIFICATION_DATE
   ${new_period}=   create_fake_period  days=${1460}
   Можливість змінити поле budget.period плану на ${new_period}
+
+
+Можливість скасувати план
+  [Tags]  ${USERS.users['${tender_owner}'].broker}: Скасування плану
+  ...  tender_owner
+  ...  ${USERS.users['${tender_owner}'].broker}
+  ...  plan_cancellation
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  Можливість скасувати план
+
+
+Відображення статусу плану - скасовано
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Відображення основних даних плану
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      status_cancelled_view
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  Звірити статус плану  ${tender_owner}  ${TENDER['TENDER_UAID']}  cancelled
--- a/op_robot_tests/tests_files/service_keywords.py
View file @b419665
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @b419665
@@ -78,7 +78,9 @@ from .initial_data import (
     invalid_INN_data,
     invalid_cost_data,
     invalid_gmdn_data,
-    invalid_buyers_data
+    invalid_buyers_data,
+    test_plan_cancel_data,
+    test_confirm_plan_cancel_data
 )
 from barbecue import chef
 from restkit import request
--- a/robot_tests_arguments/below.txt
View file @b419665
+++ b/robot_tests_arguments/below.txt
View file @b419665
@@ -9,6 +9,7 @@
 -i create_tender
+-i plan_status_complete_view
 -i find_tender
 -i tender_view
 -i tender_view_milestone
--- a/robot_tests_arguments/below_simple.txt
View file @b419665
+++ b/robot_tests_arguments/below_simple.txt
View file @b419665
@@ -9,6 +9,7 @@
 -i create_tender
+-i plan_status_complete_view
 -i find_tender
 -i tender_view
 -i tender_view_milestone
--- a/robot_tests_arguments/negotiation_full.txt deleted 100644 → 0
View file @6c745e9
+++ b/robot_tests_arguments/negotiation_full.txt deleted 100644 → 0
View file @6c745e9
--s negotiation
-
--- a/robot_tests_arguments/negotiation_quick_full.txt deleted 100644 → 0
View file @6c745e9
+++ b/robot_tests_arguments/negotiation_quick_full.txt deleted 100644 → 0
View file @6c745e9
--s negotiation.quick
-
--- a/robot_tests_arguments/negotiation_quick_testing.txt 0 → 100644
View file @b419665
+++ b/robot_tests_arguments/negotiation_quick_testing.txt 0 → 100644
View file @b419665
+-v MODE:negotiation
+
+-v NUMBER_OF_ITEMS:2
+-v NUMBER_OF_LOTS:0
+
+-i create_tender
+-i add_tender_doc
+-i add_award
+-i find_tender
+-i tender_view_milestone
+-i tender_view
+-i add_tender_doc
+-i award_view
+-i add_contract
+-i modify_contract_amount_net
+-i modify_contract_value
+
--- a/robot_tests_arguments/negotiation_testing.txt 0 → 100644
View file @b419665
+++ b/robot_tests_arguments/negotiation_testing.txt 0 → 100644
View file @b419665
+-v MODE:negotiation
+
+-v NUMBER_OF_ITEMS:2
+-v NUMBER_OF_LOTS:0
+
+-i create_tender
+-i add_tender_doc
+-i add_award
+-i find_tender
+-i tender_view_title
+-i tender_view
+-i tender_view_description
+-i tender_view_cause_description
+-i tender_view_cause
+-i tender_view_milestone
+-i tender_view_contactPoint_url
+-i tender_view_unit_code
+-i tender_view_delivery_address
+-i add_tender_doc
+-i award_view
+-i add_contract
+-i modify_contract_amount_net
+-i modify_contract_value
+
--- a/robot_tests_arguments/planning.txt
View file @b419665
+++ b/robot_tests_arguments/planning.txt
View file @b419665
@@ -8,6 +8,7 @@
 -i create_plan
 -i find_plan
+-i status_sheduled_view
 -i plan_view