Merge branch 'dev_prozorro_2' into amcu

alexdiatlov · GitHub
2 parents d690c617 61666928
Showing 12 changed files with 705 additions and 105 deletions
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/cancellation.robot
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/keywords.robot
op_robot_tests/tests_files/service_keywords.py
robot_tests_arguments/cancellation.txt
robot_tests_arguments/competitive_dialogue_UA_dfs.txt
robot_tests_arguments/competitive_dialogue_dfs.txt
robot_tests_arguments/esco_dfs.txt
robot_tests_arguments/openeu_dfs.txt
robot_tests_arguments/openua_dfs.txt
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @4ee0bcb
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @4ee0bcb
@@ -221,7 +221,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${period_intervals}=  compute_intrs  ${BROKERS}  ${used_brokers}
   ${accelerator}=  Get Variable Value  ${accelerator}
   ${accelerator}=  Set Variable If  '${accelerator}' != '${None}'  ${accelerator}  ${period_intervals.default.accelerator}
-  ${monitoring_data}=  tets_monitoring_data  ${USERS.users['${dasu_user}'].tender_data.data.id}  ${accelerator}
+  ${monitoring_data}=  test_monitoring_data  ${USERS.users['${dasu_user}'].tender_data.data.id}  ${accelerator}
   Log  ${monitoring_data}
   ${MNITORING_UAID}=  Run As  ${dasu_user}  Створити об'єкт моніторингу  ${monitoring_data}
   ${MONITORING}=  Create Dictionary
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @4ee0bcb
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @4ee0bcb
@@ -729,12 +729,13 @@ Library  openprocurement_client.utils
 Скасувати лот
-  [Arguments]  ${username}  ${tender_uaid}  ${lot_id}  ${cancellation_reason}  ${document}  ${new_description}
+  [Arguments]  ${username}  ${tender_uaid}  ${lot_id}  ${cancellation_reason}  ${cancellation_reasonType}  ${document}  ${new_description}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${lot_index}=  get_object_index_by_id  ${tender.data.lots}  ${lot_id}
   ${lot_id}=  Get Variable Value  ${tender.data.lots[${lot_index}].id}
   ${data}=  Create dictionary
   ...      reason=${cancellation_reason}
+  ...      reasonType=${cancellation_reasonType}
   ...      cancellationOf=lot
   ...      relatedLot=${lot_id}
   ${cancellation_data}=  Create dictionary  data=${data}
@@ -1430,6 +1431,16 @@ Library  openprocurement_client.utils
   ${filename}=  download_file_from_url  ${document.url}  ${OUTPUT_DIR}${/}${document.title}
   [return]  ${filename}
+
+Отримати інформацію із cancellation
+  [Arguments]  ${username}  ${tender_uaid}  ${field_name}  ${cancellation_index}
+  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
+  ${cancellations}=  Get Variable Value  ${USERS.users['${username}'].tender_data.data.cancellations[${cancellation_index}]}   ${USERS.users['${username}'].tender_data.data.cancellations}
+  Log  ${cancellations}
+  ${field_value}=  Get Variable Value  ${USERS.users['${username}'].tender_data.data.cancellations[${cancellation_index}]['${field_name}']}
+  Log  ${field_value}
+  [Return]  ${field_value}
+
 ##############################################################################
 #             Bid operations
 ##############################################################################
@@ -1742,28 +1753,41 @@ Library  openprocurement_client.utils
 Скасувати закупівлю
   [Documentation]
-  ...      [Arguments] Username, tender uaid, cancellation reason,
+  ...      [Arguments] Username, tender uaid, cancellation reason, cancellation reasonType
   ...      document and new description of document
   ...      [Description] Find tender using uaid, set cancellation reason, get data from cancel_tender
   ...      and call create_cancellation
   ...      After that add document to cancellation and change description of document
   ...      [Return] Nothing
-  [Arguments]  ${username}  ${tender_uaid}  ${cancellation_reason}  ${document}  ${new_description}
+  [Arguments]  ${username}  ${tender_uaid}  ${cancellation_reason}  ${cancellation_reasonType}  ${document}  ${new_description}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
-  ${data}=  Create dictionary  reason=${cancellation_reason}
+  ${procurementMethodType}=  set variable  ${USERS.users['${tender_owner}'].initial_data.data.procurementMethodType}
+  Log  ${procurementMethodType}
+  ${data}=  Create dictionary
+  ...   reason=${cancellation_reason}
+  ...   reasonType=${cancellation_reasonType}
   ${cancellation_data}=  Create dictionary  data=${data}
   ${cancellation_data}=  munch_dict  arg=${cancellation_data}
+  Log  ${cancellation_data}
   ${cancel_reply}=  Call Method  ${USERS.users['${username}'].client}  create_cancellation
   ...      ${tender.data.id}
   ...      ${cancellation_data}
   ...      access_token=${tender.access.token}
   ${cancellation_id}=  Set variable  ${cancel_reply.data.id}
-
-  ${document_id}=  openprocurement_client.Завантажити документацію до запиту на скасування  ${username}  ${tender_uaid}  ${cancellation_id}  ${document}
-
-  openprocurement_client.Змінити опис документа в скасуванні  ${username}  ${tender_uaid}  ${cancellation_id}  ${document_id}  ${new_description}
-
-  openprocurement_client.Підтвердити скасування закупівлі  ${username}  ${tender_uaid}  ${cancellation_id}
+  ${document_id}=  openprocurement_client.Завантажити документацію до запиту на скасування
+  ...  ${username}
+  ...  ${tender_uaid}
+  ...  ${cancellation_id}
+  ...  ${document}
+  openprocurement_client.Змінити опис документа в скасуванні
+  ...  ${username}
+  ...  ${tender_uaid}
+  ...  ${cancellation_id}
+  ...  ${document_id}
+  ...  ${new_description}
+  run keyword if  '${procurementMethodType}' in ['belowThreshold', 'reporting', 'closeFrameworkAgreementUA']
+  ...  openprocurement_client.Підтвердити скасування закупівлі  ${username}  ${tender_uaid}  ${cancellation_id}
+  ...  ELSE  openprocurement_client.Перевести скасування закупівлі в період очікування  ${username}  ${tender_uaid}  ${cancellation_id}
 Завантажити документацію до запиту на скасування
@@ -1819,6 +1843,23 @@ Library  openprocurement_client.utils
   Log  ${reply}
+Перевести скасування закупівлі в період очікування
+  [Documentation]
+  ...      [Arguments] Username, tender uaid, cancellation number
+  ...      Find tender using uaid, get cancellation test_confirmation data and call patch_cancellation
+  ...      [Return] Nothing
+  [Arguments]  ${username}  ${tender_uaid}  ${cancel_id}
+  ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
+  ${data}=  test_cancel_pending_data  ${cancel_id}
+  Log  ${data}
+  ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_cancellation
+  ...      ${tender.data.id}
+  ...      ${data}
+  ...      ${data.data.id}
+  ...      access_token=${tender.access.token}
+  Log  ${reply}
+
+
 Отримати інформацію із документа до скасування
   [Arguments]  ${username}  ${tender_uaid}  ${cancel_id}  ${doc_id}  ${field_name}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
--- a/op_robot_tests/tests_files/cancellation.robot
View file @4ee0bcb
+++ b/op_robot_tests/tests_files/cancellation.robot
View file @4ee0bcb
@@ -103,23 +103,22 @@ ${PLAN_TENDER}      ${True}
   Можливість скасувати тендер
-Відображення активного статусу скасування тендера
-  [Tags]  ${USERS.users['${viewer}'].broker}: Відображення скасування тендера
-  ...  viewer
-  ...  ${USERS.users['${viewer}'].broker}
-  ...  tender_cancellation
-  [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
-  ${cancellation_index}=  Отримати останній індекс  cancellations  ${tender_owner}  ${viewer}
-  Звірити поле тендера із значенням  ${viewer}  ${TENDER['TENDER_UAID']}
-  ...      active
-  ...      cancellations[${cancellation_index}].status
+Дочекатися закічення complait періоду
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Скасування тендера
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      tender_cancellation_stand_still
+  ...      critical
+  Log  ${TENDER['TENDER_UAID']}
+  ${cancellation_index}=  Отримати останній індекс  cancellations  ${tender_owner}
+  Дочекатись зміни статусу cancellations  ${tender_owner}  ${TENDER['TENDER_UAID']}  active  ${cancellation_index}
 Відображення причини скасування тендера
   [Tags]  ${USERS.users['${viewer}'].broker}: Відображення скасування тендера
   ...  viewer
   ...  ${USERS.users['${viewer}'].broker}
-  ...  tender_cancellation
+  ...  tender_cancellation_view
   ${cancellation_index}=  Отримати останній індекс  cancellations  ${tender_owner}  ${viewer}
   Звірити поле тендера із значенням  ${viewer}  ${TENDER['TENDER_UAID']}
   ...      ${USERS.users['${tender_owner}']['tender_cancellation_data']['cancellation_reason']}
@@ -130,7 +129,7 @@ ${PLAN_TENDER}      ${True}
   [Tags]  ${USERS.users['${viewer}'].broker}: Відображення скасування тендера
   ...  viewer
   ...  ${USERS.users['${viewer}'].broker}
-  ...  tender_cancellation
+  ...  tender_cancellation_view
   Звірити відображення поля description документа ${USERS.users['${tender_owner}']['tender_cancellation_data']['document']['doc_id']} до скасування ${USERS.users['${tender_owner}']['tender_cancellation_data']['cancellation_id']} із ${USERS.users['${tender_owner}']['tender_cancellation_data']['description']} для користувача ${viewer}
@@ -138,7 +137,7 @@ ${PLAN_TENDER}      ${True}
   [Tags]  ${USERS.users['${viewer}'].broker}: Відображення скасування тендера
   ...  viewer
   ...  ${USERS.users['${viewer}'].broker}
-  ...  tender_cancellation
+  ...  tender_cancellation_view
   Звірити відображення поля title документа ${USERS.users['${tender_owner}']['tender_cancellation_data']['document']['doc_id']} до скасування ${USERS.users['${tender_owner}']['tender_cancellation_data']['cancellation_id']} із ${USERS.users['${tender_owner}']['tender_cancellation_data']['document']['doc_name']} для користувача ${viewer}
@@ -146,9 +145,21 @@ ${PLAN_TENDER}      ${True}
   [Tags]  ${USERS.users['${viewer}'].broker}: Відображення скасування тендера
   ...  viewer
   ...  ${USERS.users['${viewer}'].broker}
-  ...  tender_cancellation
+  ...  tender_cancellation_view
   Звірити відображення вмісту документа ${USERS.users['${tender_owner}']['tender_cancellation_data']['document']['doc_id']} до скасування ${USERS.users['${tender_owner}']['tender_cancellation_data']['cancellation_id']} з ${USERS.users['${tender_owner}']['tender_cancellation_data']['document']['doc_content']} для користувача ${viewer}
+
+Відображення активного статусу скасування тендера
+  [Tags]  ${USERS.users['${viewer}'].broker}: Відображення скасування тендера
+  ...  viewer
+  ...  ${USERS.users['${viewer}'].broker}
+  ...  tender_cancellation_view
+  [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
+  ${cancellation_index}=  Отримати останній індекс  cancellations  ${tender_owner}  ${viewer}
+  Звірити поле тендера із значенням  ${viewer}  ${TENDER['TENDER_UAID']}
+  ...      active
+  ...      cancellations[${cancellation_index}].status
+
 ##############################################################################################
 #             DELETING LOT
 ##############################################################################################
@@ -164,24 +175,26 @@ ${PLAN_TENDER}      ${True}
 *** Keywords ***
 Можливість скасувати тендер
-  ${cancellation_data}=  Підготувати дані про скасування
+  ${cancellation_data}=  Підготувати дані про скасування  ${USERS.users['${tender_owner}'].initial_data.data.procurementMethodType}
   Run As  ${tender_owner}
   ...      Скасувати закупівлю
   ...      ${TENDER['TENDER_UAID']}
   ...      ${cancellation_data['cancellation_reason']}
+  ...      ${cancellation_data['cancellation_reasonType']}
   ...      ${cancellation_data['document']['doc_path']}
   ...      ${cancellation_data['description']}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  tender_cancellation_data=${cancellation_data}
 Можливість скасувати ${index} лот
-  ${cancellation_data}=  Підготувати дані про скасування
+  ${cancellation_data}=  Підготувати дані про скасування  ${USERS.users['${tender_owner}'].initial_data.data.procurementMethodType}
   ${lot_id}=  get_id_from_object  ${USERS.users['${tender_owner}'].initial_data.data.lots[${index}]}
   Run As  ${tender_owner}
   ...      Скасувати лот
   ...      ${TENDER['TENDER_UAID']}
   ...      ${lot_id}
   ...      ${cancellation_data['cancellation_reason']}
+  ...      ${cancellation_data['cancellation_reasonType']}
   ...      ${cancellation_data['document']['doc_path']}
   ...      ${cancellation_data['description']}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  lot_cancellation_data=${cancellation_data}
--- a/op_robot_tests/tests_files/initial_data.py
View file @4ee0bcb
+++ b/op_robot_tests/tests_files/initial_data.py
View file @4ee0bcb
@@ -12,19 +12,19 @@ from munch import munchify
 from op_faker import OP_Provider
 from .local_time import get_now, TZ
-
 fake_en = Factory.create(locale='en_US')
 fake_ru = Factory.create(locale='ru_RU')
 fake_uk = Factory.create(locale='uk_UA')
 fake_uk.add_provider(OP_Provider)
 fake = fake_uk
 used_identifier_id = []
-mode_open =     ["belowThreshold", "aboveThresholdUA", "aboveThresholdEU",
-                "aboveThresholdUA.defense", "competitiveDialogueUA", "competitiveDialogueEU", "esco", "closeFrameworkAgreementUA"]
-mode_limited =  ["reporting", "negotiation.quick", "negotiation"]
+mode_open = ["belowThreshold", "aboveThresholdUA", "aboveThresholdEU",
+             "aboveThresholdUA.defense", "competitiveDialogueUA", "competitiveDialogueEU", "esco",
+             "closeFrameworkAgreementUA"]
+mode_limited = ["reporting", "negotiation.quick", "negotiation"]
 violationType = ["corruptionDescription", "corruptionProcurementMethodType", "corruptionChanges",
-                "corruptionPublicDisclosure", "corruptionBiddingDocuments", "documentsForm",
-                "corruptionAwarded", "corruptionCancelled", "corruptionContracting"]
+                 "corruptionPublicDisclosure", "corruptionBiddingDocuments", "documentsForm",
+                 "corruptionAwarded", "corruptionCancelled", "corruptionContracting"]
 # This workaround fixes an error caused by missing "catch_phrase" class method
 # for the "ru_RU" locale in Faker >= 0.7.4
@@ -106,10 +106,10 @@ def create_fake_period(days=0, hours=0, minutes=0):
 def subtraction(value1, value2):
-    if "." in str (value1) or "." in str (value2):
-        return (float (value1) - float (value2))
+    if "." in str(value1) or "." in str(value2):
+        return (float(value1) - float(value2))
     else:
-        return (int (value1) - int (value2))
+        return (int(value1) - int(value2))
 def create_fake_value_amount():
@@ -132,7 +132,7 @@ def translate_country_en(country):
 def convert_amount(amount):
-    return  (("{:,}".format(float (amount))).replace(',',' ').replace('.',','))
+    return ("{:,}".format(float(amount))).replace(',', ' ').replace('.', ',')
 def translate_country_ru(country):
@@ -201,7 +201,7 @@ def test_tender_data(params,
     accelerator = accelerator \
         if accelerator else params['intervals']['accelerator']
     data['procurementMethodDetails'] = 'quick, ' \
-        'accelerator={}'.format(accelerator)
+                                       'accelerator={}'.format(accelerator)
     data["procuringEntity"]["kind"] = "other"
     if data.get("mode") == "test":
         data["title"] = u"[ТЕСТУВАННЯ] {}".format(data["title"])
@@ -318,7 +318,7 @@ def test_tender_data_planning(params):
         "mode": "test",
         "items": [],
         "buyers": []
-        }
+    }
     data["procuringEntity"]["name"] = data["procuringEntity"]["identifier"]["legalName"]
     buyers = test_buyers_data()
     buyers["name"] = buyers["identifier"]["legalName"]
@@ -345,7 +345,8 @@ def test_tender_data_planning(params):
         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()
+        item_data['deliveryDate']['endDate'] = (get_now() + timedelta(days=10)).replace(hour=0, minute=0, second=0,
+                                                                                        microsecond=0).isoformat()
         del item_data['deliveryDate']['startDate']
         data['items'].append(item_data)
     if params['mode'] in mode_open:
@@ -510,6 +511,15 @@ def test_confirm_data(id):
     })
+def test_cancel_pending_data(id):
+    return munchify({
+        "data": {
+            "status": "pending",
+            "id": id
+        }
+    })
+
+
 def test_submit_claim_data(claim_id):
     return munchify({
         "data": {
@@ -581,12 +591,12 @@ def test_bid_value(max_value_amount, vat_included):
 def test_bid_value_esco(tender_data):
     annual_cost = []
     for i in range(0, 21):
-        cost=round(random.uniform(1, 100), 2)
+        cost = round(random.uniform(1, 100), 2)
         annual_cost.append(cost)
     if tender_data['fundingKind'] == "budget":
-        yearly_percentage=round(random.uniform(0.01, float(tender_data['yearlyPaymentsPercentageRange'])), 5)
+        yearly_percentage = round(random.uniform(0.01, float(tender_data['yearlyPaymentsPercentageRange'])), 5)
     else:
-        yearly_percentage= 0.8
+        yearly_percentage = 0.8
     # when tender fundingKind is budget, yearlyPaymentsPercentageRange should be less or equal 0.8, and more or equal 0
     # when tender fundingKind is other, yearlyPaymentsPercentageRange should be equal 0.8
     return munchify({
@@ -613,7 +623,9 @@ def test_bid_data_selection(data, index):
     })
     bid.data['status'] = 'draft'
     bid.data['parameters'] = data['agreements'][0]['contracts'][index]['parameters']
-    bid.data['lotValues'] = [test_bid_value(data['agreements'][0]['contracts'][index]['value']['amount'], data['agreements'][0]['contracts'][index]['value']['valueAddedTaxIncluded'])]
+    bid.data['lotValues'] = [test_bid_value(data['agreements'][0]['contracts'][index]['value']['amount'],
+                                            data['agreements'][0]['contracts'][index]['value'][
+                                                'valueAddedTaxIncluded'])]
     return bid
@@ -641,8 +653,10 @@ def test_item_data(cpv=None):
     startDate = fake.random_int(min=1, max=30)
     endDate = startDate + fake.random_int(min=1, max=7)
     data["deliveryDate"] = {
-        "startDate": (get_now() + timedelta(days=startDate)).astimezone(TZ).replace(hour=0, minute=0, second=0, microsecond=0).isoformat(),
-        "endDate": (get_now() + timedelta(days=endDate)).astimezone(TZ).replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
+        "startDate": (get_now() + timedelta(days=startDate)).astimezone(TZ).replace(hour=0, minute=0, second=0,
+                                                                                    microsecond=0).isoformat(),
+        "endDate": (get_now() + timedelta(days=endDate)).astimezone(TZ).replace(hour=0, minute=0, second=0,
+                                                                                microsecond=0).isoformat()
     }
     data["deliveryAddress"]["countryName_en"] = translate_country_en(data["deliveryAddress"]["countryName"])
     data["deliveryAddress"]["countryName_ru"] = translate_country_ru(data["deliveryAddress"]["countryName"])
@@ -734,7 +748,8 @@ def test_tender_data_openeu(params, submissionMethodDetails, plan_data):
     data['procuringEntity']['name_en'] = fake_en.name()
     data['procuringEntity']['contactPoint']['name_en'] = fake_en.name()
     data['procuringEntity']['contactPoint']['availableLanguage'] = "en"
-    data['procuringEntity']['identifier']['legalName_en'] = u"Institution \"Vinnytsia City Council primary and secondary general school № 10\""
+    data['procuringEntity']['identifier'][
+        'legalName_en'] = u"Institution \"Vinnytsia City Council primary and secondary general school № 10\""
     data['procuringEntity']['kind'] = 'general'
     return data
@@ -784,34 +799,34 @@ def test_tender_data_selection(procedure_intervals, params, submissionMethodDeta
     data['agreements'] = [{'id': tender_data['data']['agreements'][0]['id']}]
     del data['value']
     del data['minimalStep']
-    return munchify({'data':data})
+    return munchify({'data': data})
 def test_change_data():
     return munchify(
-    {
-        "data":
         {
-            "rationale": fake.description(),
-            "rationale_en": fake_en.sentence(nb_words=10, variable_nb_words=True),
-            "rationale_ru": fake_ru.sentence(nb_words=10, variable_nb_words=True),
-            "rationaleTypes": fake.rationaleTypes(amount=3), 
-            "status": "pending"
-        }
-    })
+            "data":
+                {
+                    "rationale": fake.description(),
+                    "rationale_en": fake_en.sentence(nb_words=10, variable_nb_words=True),
+                    "rationale_ru": fake_ru.sentence(nb_words=10, variable_nb_words=True),
+                    "rationaleTypes": fake.rationaleTypes(amount=3),
+                    "status": "pending"
+                }
+        })
 def test_agreement_change_data(rationaleType):
     return munchify(
-    {
-        "data":
         {
-            "rationale": fake.description(),
-            "rationale_en": fake_en.sentence(nb_words=10, variable_nb_words=True),
-            "rationale_ru": fake_ru.sentence(nb_words=10, variable_nb_words=True),
-            "rationaleType": rationaleType,
-        }
-    })
+            "data":
+                {
+                    "rationale": fake.description(),
+                    "rationale_en": fake_en.sentence(nb_words=10, variable_nb_words=True),
+                    "rationale_ru": fake_ru.sentence(nb_words=10, variable_nb_words=True),
+                    "rationaleType": rationaleType,
+                }
+        })
 def test_modification_data(item_id, field_name, field_value):
@@ -823,24 +838,21 @@ def test_modification_data(item_id, field_name, field_value):
             }
         ]
     }
-    return munchify({'data':data})
+    return munchify({'data': data})
 def get_hash(file_contents):
-    return ("md5:"+hashlib.md5(file_contents).hexdigest())
+    return ("md5:" + hashlib.md5(file_contents).hexdigest())
-def tets_monitoring_data( tender_id, accelerator=None):
-    data = {
-        "reasons": [random.choice(["public", "fiscal", "indicator", "authorities", "media"])],
-        "tender_id": tender_id,
-        "procuringStages": [random.choice(["awarding", "contracting", "planning"])],
-        "parties": [test_party()],
-        "mode": "test"
-    }
-    data['monitoringDetails'] = 'quick, ' \
-        'accelerator={}'.format(accelerator)
-    return munchify({'data':data})
+def test_monitoring_data(tender_id, accelerator=None):
+    data = {"reasons": [random.choice(["public", "fiscal", "indicator", "authorities", "media"])],
+            "tender_id": tender_id,
+            "procuringStages": [random.choice(["awarding", "contracting", "planning"])],
+            "parties": [test_party()],
+            "mode": "test",
+            'monitoringDetails': 'quick, ' 'accelerator={}'.format(accelerator)}
+    return munchify({'data': data})
 def test_party():
@@ -852,26 +864,26 @@ def test_party():
 def test_dialogue():
     return munchify(
-    {
-        "data":
         {
-            "title": fake_en.sentence(nb_words=10, variable_nb_words=True),
-            "description": fake_en.sentence(nb_words=10, variable_nb_words=True)
-        }
-    })
+            "data":
+                {
+                    "title": fake_en.sentence(nb_words=10, variable_nb_words=True),
+                    "description": fake_en.sentence(nb_words=10, variable_nb_words=True)
+                }
+        })
 def test_conclusion(violationOccurred, relatedParty_id):
     return munchify(
-    {
-       "data": {
-            "conclusion": {
-                "violationOccurred": violationOccurred,
-                "violationType": random.choice(violationType),
-                "relatedParty": relatedParty_id,
+        {
+            "data": {
+                "conclusion": {
+                    "violationOccurred": violationOccurred,
+                    "violationType": random.choice(violationType),
+                    "relatedParty": relatedParty_id,
+                }
             }
-        }
-    })
+        })
 def test_status_data(status, relatedParty_id=None):
@@ -926,7 +938,7 @@ def test_tender_data_esco(params, submissionMethodDetails, plan_data):
         if index == 0:
             data['lots'][index]['minimalStepPercentage'] = data['minimalStepPercentage']
         else:
-            data['lots'][index]['minimalStepPercentage'] = round((float(data['minimalStepPercentage'])-0.0002), 5)
+            data['lots'][index]['minimalStepPercentage'] = round((float(data['minimalStepPercentage']) - 0.0002), 5)
         if data['fundingKind'] == "budget":
             data['lots'][index]['yearlyPaymentsPercentageRange'] = float(round(random.uniform(0.01, 0.8), 5))
         else:
@@ -968,25 +980,25 @@ def percentage_generation(number_of_milestones):
 def invalid_INN_data():
     return munchify({
-            "scheme": "INN",
-            "description": "Insulin (human)",
-            "id": "insulin (human)"
+        "scheme": "INN",
+        "description": "Insulin (human)",
+        "id": "insulin (human)"
     })
 def invalid_cost_data():
     return munchify({
-            "scheme": "UA-ROAD",
-            "id": "H-08",
-            "description": "Бориспіль - Дніпро - Запоріжжя (через м. Кременчук) - Маріуполь"
+        "scheme": "UA-ROAD",
+        "id": "H-08",
+        "description": "Бориспіль - Дніпро - Запоріжжя (через м. Кременчук) - Маріуполь"
     })
 def invalid_gmdn_data():
     return munchify({
-            "scheme": "GMDN",
-            "id": "10082",
-            "description": "Змішувач амальгами для стоматології"
+        "scheme": "GMDN",
+        "id": "10082",
+        "description": "Змішувач амальгами для стоматології"
     })
@@ -1009,7 +1021,7 @@ def invalid_buyers_data():
             "legalName": "Київський Тестовий Ліцей",
         },
         "name": "Київський Тестовий Ліцей"
-        }
+    }
     return munchify(buyers)
@@ -1047,3 +1059,15 @@ 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(round(plan_value - sum(value_data), 2))
     return value_data
+
+
+def test_cancellation_data(procurement_method_type):
+    if procurement_method_type == "aboveThresholdUA.defense":
+        result = random.choice(["noDemand", "unFixable", "expensesCut"])
+    elif procurement_method_type in ["negotiation", "negotiation.quick"]:
+        result = random.choice(["noObjectiveness", "unFixable", "noDemand", "expensesCut", "dateViolation"])
+    elif procurement_method_type == "belowThreshold":
+        result = random.choice(["noDemand", "unFixable", "expensesCut"])
+    else:
+        result = random.choice(["noDemand", "unFixable", "forceMajeure", "expensesCut"])
+    return munchify({"reasonType": result})
--- a/op_robot_tests/tests_files/keywords.robot
View file @4ee0bcb
+++ b/op_robot_tests/tests_files/keywords.robot
View file @4ee0bcb
@@ -353,6 +353,8 @@ Get Broker Property By Username
 Підготувати дані про скасування
+  [Arguments]  ${procurementMethodType}
+  ${cancellation_data}=  test_cancellation_data  ${procurementMethodType}
   ${cancellation_reason}=  create_fake_sentence
   ${cancellation_reason}=  field_with_id  c  ${cancellation_reason}
   ${cancellation_id}=  get_id_from_string  ${cancellation_reason}
@@ -366,6 +368,7 @@ Get Broker Property By Username
   ${new_description}=  create_fake_sentence
   ${cancellation_data}=  Create Dictionary
   ...      cancellation_reason=${cancellation_reason}
+  ...      cancellation_reasonType=${cancellation_data.reasonType}
   ...      cancellation_id=${cancellation_id}
   ...      document=${document}
   ...      description=${new_description}
@@ -1018,6 +1021,12 @@ Require Failure
   Порівняти об'єкти  ${left}  ${right}
+Звірити статус cancellations
+  [Arguments]  ${username}  ${tender_uaid}  ${left}  ${cancellation_index}
+  ${right}=  Run as  ${username}  Отримати інформацію із cancellation  ${tender_uaid}  status  ${cancellation_index}
+  Порівняти об'єкти  ${left}  ${right}
+
+
 Дочекатись дати початку періоду уточнення
   [Arguments]  ${username}  ${tender_uaid}
   Оновити LAST_MODIFICATION_DATE
@@ -1226,6 +1235,19 @@ Require Failure
   ...      ${award_index}
+Дочекатись зміни статусу cancellations
+  [Arguments]  ${username}  ${tender_uaid}  ${status}  ${cancellation_index}
+  Дочекатись синхронізації з майданчиком  ${username}
+  Wait until keyword succeeds
+  ...      12 min
+  ...      60 sec
+  ...      Звірити статус cancellations
+  ...      ${username}
+  ...      ${tender_uaid}
+  ...      ${status}
+  ...      ${cancellation_index}
+
+
 Оновити LAST_MODIFICATION_DATE
   [Documentation]
   ...      Variable ``${TEST_STATUS}`` is only available in test case teardown.
--- a/op_robot_tests/tests_files/service_keywords.py
View file @4ee0bcb
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @4ee0bcb
@@ -60,7 +60,7 @@ from .initial_data import (
     test_tender_data_framework_agreement,
     test_tender_data_selection,
     test_bid_competitive_data,
-    tets_monitoring_data,
+    test_monitoring_data,
     test_party,
     test_dialogue,
     test_conclusion,
@@ -82,7 +82,9 @@ from .initial_data import (
     test_plan_cancel_data,
     test_confirm_plan_cancel_data,
     test_accept_complaint_data,
-    test_reject_complaint_data
+    test_reject_complaint_data,
+    test_cancellation_data,
+    test_cancel_pending_data
 )
 from barbecue import chef
 from restkit import request
--- a/robot_tests_arguments/cancellation.txt
View file @4ee0bcb
+++ b/robot_tests_arguments/cancellation.txt
View file @4ee0bcb
@@ -9,6 +9,9 @@
 -i create_tender
 -i find_tender
+-i lot_cancellation
 -i tender_cancellation
+-i tender_cancellation_stand_still
+-i tender_cancellation_view
 -i lot_cancellation
 -i delete_lot
--- a/robot_tests_arguments/competitive_dialogue_UA_dfs.txt 0 → 100644
View file @4ee0bcb
+++ b/robot_tests_arguments/competitive_dialogue_UA_dfs.txt 0 → 100644
View file @4ee0bcb
+-v MODE:open_competitive_dialogue
+
+-v DIALOGUE_TYPE:UA
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:False
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i tender_view_unit_code
+-i tender_view_coordinates
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+-i make_bid_by_provider2
+
+-i open_tender_view
+
+-i pre-qualification_approve_first_bid
+-i pre-qualification_approve_second_bid
+-i pre-qualification_approve_third_bid
+
+-i pre-qualification_approve_qualifications
+
+-i stage2_pending_status_view
+
+-i wait_bridge_for_work
+
+-i get_second_stage
+
+-i compare_stages
+
+-i save_tender_second_stage
+
+-i activate_second_stage
+
+-i make_bid_by_provider_second_stage
+-i make_bid_by_provider1_second_stage
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i awards_check_by_dfs
+
+-i contract_stand_still
+-i contract_view
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
--- a/robot_tests_arguments/competitive_dialogue_dfs.txt 0 → 100644
View file @4ee0bcb
+++ b/robot_tests_arguments/competitive_dialogue_dfs.txt 0 → 100644
View file @4ee0bcb
+-v MODE:open_competitive_dialogue
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:True
+-v LOT_MEAT:True
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i tender_view_unit_code
+-i tender_view_coordinates
+-i meat_view
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+
+-i extend_tendering_period
+-i add_tender_doc
+-i add_lot_doc
+-i modify_lot_value_amount
+-i add_item
+  -i delete_item
+-i add_tender_meat
+  -i delete_tender_meat
+-i add_lot_meat
+  -i delete_lot_meat
+-i add_item_meat
+  -i delete_item_meat
+
+-i ask_question_to_tender
+  -i answer_question_to_tender
+-i ask_question_to_item
+  -i answer_question_to_item
+-i ask_question_to_lot
+  -i answer_question_to_lot
+-i modify_tender_after_questions
+-i modify_lot_after_questions
+
+-i make_bid_without_related_lot
+-i make_bid_by_provider
+  -i add_doc_to_bid_by_provider
+-i make_bid_by_provider1
+-i make_bid_by_provider2
+
+-i bid_view_in_tendering_period
+
+-i add_bid_doc_after_tendering_period_by_provider
+-i modify_bid_doc_after_tendering_period_by_provider
+-i modify_bid_after_tendering_period_by_provider1
+-i cancel_bid_after_tendering_period_by_provider1
+
+-i ask_question_to_tender_after_tendering_period
+-i ask_question_to_item_after_tendering_period
+-i ask_question_to_lot_after_tendering_period
+
+-i open_tender_view
+-i open_modify_tender_in_tendering_period
+  -i open_confirm_first_bid
+  -i open_confirm_second_bid
+  -i open_confirm_third_bid
+
+-i openeu_make_bid_doc_private_by_provider
+
+-i pre-qualification_add_doc_to_tender
+-i pre-qualification_add_doc_to_lot
+
+-i pre-qualification_view
+
+-i pre-qualification_approve_first_bid
+-i pre-qualification_approve_second_bid
+-i pre-qualification_approve_third_bid
+
+-i pre-qualification_approve_qualifications
+
+-i stage2_pending_status_view
+
+-i wait_bridge_for_work
+
+-i get_second_stage
+
+-i compare_stages
+
+-i save_tender_second_stage
+
+-i activate_second_stage
+
+-i make_bid_by_provider_second_stage
+-i make_bid_by_provider1_second_stage
+
+-i pre-qualification_approve_first_bid_second_stage
+-i pre-qualification_approve_second_bid_second_stage
+
+-i pre-qualification_approve_qualifications_second_stage
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i awards_check_by_dfs
+
+-i contract_stand_still
+-i contract_view
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
--- a/robot_tests_arguments/esco_dfs.txt 0 → 100644
View file @4ee0bcb
+++ b/robot_tests_arguments/esco_dfs.txt 0 → 100644
View file @4ee0bcb
+-v MODE:open_esco
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+-v FUNDING_KIND:budget
+
+-i create_tender
+-i find_tender
+-i tender_view
+  -i esco_tender_view
+  -i open_tender_view
+-i meat_view
+-i lot_view
+  -i esco_lot_view
+
+-i extend_tendering_period
+-i add_tender_doc
+-i ask_question_to_tender
+-i answer_question_to_tender
+-i modify_tender_after_questions
+
+-i make_bid_by_provider
+  -i add_doc_to_bid_by_provider
+-i make_bid_by_provider1
+
+-i open_modify_tender_in_tendering_period
+  -i open_confirm_first_bid
+  -i open_confirm_second_bid
+
+-i openeu_make_bid_doc_private_by_provider
+-i openeu_add_financial_bid_doc_by_provider
+-i openeu_add_qualification_bid_doc_by_provider
+-i openeu_add_eligibility_bid_doc_by_provider
+
+-i pre-qualification_view
+-i pre-qualification_approve_first_bid
+-i pre-qualification_approve_second_bid
+-i pre-qualification_approve_qualifications
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i awards_check_by_dfs
+
+-i contract_stand_still
+-i contract_view
+-i contract_view_dateSigned
+-i modify_contract_amount_net
+-i modify_contract
+-i add_doc_to_contract
+-i add_doc_to_contract_content
+-i contract_doc_documentOf
+-i add_doc_to_contract_title
+-i contract_sign
--- a/robot_tests_arguments/openeu_dfs.txt 0 → 100644
View file @4ee0bcb
+++ b/robot_tests_arguments/openeu_dfs.txt 0 → 100644
View file @4ee0bcb
+-v MODE:openeu
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:True
+-v LOT_MEAT:True
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i tender_view_unit_code
+-i tender_view_coordinates
+-i meat_view
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+
+-i extend_tendering_period
+-i add_tender_doc
+-i add_lot_doc
+-i modify_lot_value_amount
+-i add_lot
+  -i delete_lot
+-i add_item
+  -i delete_item
+-i add_tender_meat
+  -i delete_tender_meat
+-i add_lot_meat
+  -i delete_lot_meat
+-i add_item_meat
+  -i delete_item_meat
+
+-i ask_question_to_tender
+  -i answer_question_to_tender
+-i ask_question_to_item
+  -i answer_question_to_item
+-i ask_question_to_lot
+  -i answer_question_to_lot
+-i modify_tender_after_questions
+-i modify_lot_after_questions
+
+-i make_bid_without_related_lot
+-i make_bid_without_parameters
+-i make_bid_by_provider
+  -i modify_bid_by_provider
+  -i add_doc_to_bid_by_provider
+-i make_bid_by_provider1
+-i bid_view_in_tendering_period
+
+-i add_bid_doc_after_tendering_period_by_provider
+-i modify_bid_doc_after_tendering_period_by_provider
+-i modify_bid_after_tendering_period_by_provider1
+-i cancel_bid_after_tendering_period_by_provider1
+
+-i ask_question_to_tender_after_tendering_period
+-i ask_question_to_item_after_tendering_period
+-i ask_question_to_lot_after_tendering_period
+
+-i open_tender_view
+-i open_modify_tender_in_tendering_period
+  -i open_confirm_first_bid
+  -i open_confirm_second_bid
+
+-i openeu_make_bid_doc_private_by_provider
+-i openeu_add_financial_bid_doc_by_provider
+-i openeu_add_qualification_bid_doc_by_provider
+-i openeu_add_eligibility_bid_doc_by_provider
+
+-i pre-qualification_add_doc_to_tender
+-i pre-qualification_add_doc_to_lot
+
+-i pre-qualification_view
+
+-i pre-qualification_approve_first_bid
+-i pre-qualification_reject_second_bid
+-i pre-qualification_cancel_second_bid_qualification
+-i pre-qualification_approve_second_bid
+
+-i pre-qualification_approve_qualifications
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i awards_check_by_dfs
+
+-i contract_stand_still
+-i contract_view
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-i add_doc_to_contract_title
+-i add_doc_to_contract_content
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
--- a/robot_tests_arguments/openua_dfs.txt 0 → 100644
View file @4ee0bcb
+++ b/robot_tests_arguments/openua_dfs.txt 0 → 100644
View file @4ee0bcb
+-v MODE:openua
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:True
+-v LOT_MEAT:True
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i tender_view_unit_code
+-i tender_view_coordinates
+-i meat_view
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+
+-i extend_tendering_period
+-i add_tender_doc
+-i add_lot_doc
+-i modify_lot_value_amount
+-i add_lot
+  -i delete_lot
+-i add_item
+  -i delete_item
+-i add_tender_meat
+  -i delete_tender_meat
+-i add_lot_meat
+  -i delete_lot_meat
+-i add_item_meat
+  -i delete_item_meat
+
+-i ask_question_to_tender
+  -i answer_question_to_tender
+-i ask_question_to_item
+  -i answer_question_to_item
+-i ask_question_to_lot
+  -i answer_question_to_lot
+-i modify_tender_after_questions
+-i modify_lot_after_questions
+
+-i make_bid_without_related_lot
+-i make_bid_without_parameters
+-i make_bid_by_provider
+  -i modify_bid_by_provider
+  -i add_doc_to_bid_by_provider
+-i make_bid_by_provider1
+-i bid_view_in_tendering_period
+
+-i add_bid_doc_after_tendering_period_by_provider
+-i modify_bid_doc_after_tendering_period_by_provider
+-i modify_bid_after_tendering_period_by_provider1
+-i cancel_bid_after_tendering_period_by_provider1
+
+-i ask_question_to_tender_after_tendering_period
+-i ask_question_to_item_after_tendering_period
+-i ask_question_to_lot_after_tendering_period
+
+-i open_tender_view
+-i open_modify_tender_in_tendering_period
+  -i open_confirm_first_bid
+  -i open_confirm_second_bid
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i awards_check_by_dfs
+
+-i contract_stand_still
+-i contract_view
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-i add_doc_to_contract_title
+-i add_doc_to_contract_content
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination