Merge pull request #141 from ProzorroUKR/plan_tender

Plan tender

@@ -9,6 +9,9 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status":
 
 *** Keywords ***
 Можливість оголосити тендер
+  ${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}
@@ -25,11 +28,14 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status":
   ...      vat_included=${${VAT_INCLUDED}}
   ...      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}
   ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
@@ -182,6 +188,9 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status":
   ...      number_of_items=${NUMBER_OF_ITEMS}
   ...      tender_meat=${${TENDER_MEAT}}
   ...      item_meat=${${ITEM_MEAT}}
+  ...      moz_integration=${${MOZ_INTEGRATION}}
+  ...      road_index=${${ROAD_INDEX}}
+  ...      gmdn_index=${${GMDN_INDEX}}
   ${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}
@@ -191,6 +200,26 @@ ${ERROR_MESSAGE}=  Calling method 'get_tender' failed: ResourceGone: {"status":
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
 
 
+Можливість створити план закупівлі з використанням валідації для buyers
+  [Arguments]  ${data_version}
+  ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
+  ${tender_parameters}=  Create Dictionary
+  ...      mode=${MODE}
+  ...      number_of_items=${NUMBER_OF_ITEMS}
+  ...      tender_meat=${${TENDER_MEAT}}
+  ...      item_meat=${${ITEM_MEAT}}
+  ...      moz_integration=${${MOZ_INTEGRATION}}
+  ${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}
+  ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
+  ${adapted_data_buyers}=  edit_plan_buyers  ${adapted_data}  ${data_version}
+  Log  ${adapted_data_buyers}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити план  ${adapted_data_buyers}
+  Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_buyers}
+  Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
+
+
 Можливість знайти тендер по ідентифікатору для усіх користувачів
   :FOR  ${username}  IN  ${tender_owner}  ${provider}  ${provider1}  ${provider2}  ${viewer}
   \  Можливість знайти тендер по ідентифікатору для користувача ${username}

@@ -24,8 +24,8 @@ Library  openprocurement_client.utils
   Log Many  ${USERS.users['${username}'].id_map}
   ${status}=  Run Keyword And Return Status  Dictionary Should Contain Key  ${USERS.users['${username}'].id_map}  ${tender_uaid}
   Run Keyword And Return If  ${status}  Get From Dictionary  ${USERS.users['${username}'].id_map}  ${tender_uaid}
-  Call Method  ${USERS.users['${username}'].client}  get_plans
-  ${tender_id}=  Wait Until Keyword Succeeds  5x  30 sec  get_plan_id_by_uaid  ${tender_uaid}  ${USERS.users['${username}'].client}
+  Call Method  ${USERS.users['${username}'].plan_client}  get_plans
+  ${tender_id}=  Wait Until Keyword Succeeds  5x  30 sec  get_plan_id_by_uaid  ${tender_uaid}  ${USERS.users['${username}'].plan_client}
   Set To Dictionary  ${USERS.users['${username}'].id_map}  ${tender_uaid}  ${tender_id}
   [return]  ${tender_id}
 
@@ -69,9 +69,14 @@ Library  openprocurement_client.utils
   Log  ${auth_ds}
 
   ${ds_config}=  Create Dictionary  host_url=${ds_host_url}  auth_ds=${auth_ds}
-  ${api_wrapper}=  Run Keyword If  '${RESOURCE}' == 'plans'
-  ...     prepare_plan_api_wrapper  ${USERS.users['${username}'].api_key}  PLANS  ${API_HOST_URL}  ${API_VERSION}
-  ...                     ELSE  prepare_api_wrapper  ${USERS.users['${username}'].api_key}  ${RESOURCE}  ${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
+  ...  ${API_HOST_URL}
+  ...  ${API_VERSION}
+  ...  ${ds_config}
   ${dasu_api_wraper}=  prepare_dasu_api_wrapper
   ...  ${DASU_RESOURCE}
   ...  ${DASU_API_HOST_URL}
@@ -80,7 +85,9 @@ Library  openprocurement_client.utils
   ...  ${USERS.users['${username}'].auth_dasu[1]}
   ...  ${ds_config}
   ${agreement_wrapper}=  prepare_agreement_api_wrapper  ${USERS.users['${username}'].api_key}  AGREEMENTS  ${API_HOST_URL}  ${API_VERSION}  ${ds_config}
-  Set To Dictionary  ${USERS.users['${username}']}  client=${api_wrapper}
+  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}
   Set To Dictionary  ${USERS.users['${username}']}  agreement_client=${agreement_wrapper}
   Set To Dictionary  ${USERS.users['${username}']}  dasu_client=${dasu_api_wraper}
   Set To Dictionary  ${USERS.users['${username}']}  access_token=${EMPTY}
@@ -183,7 +190,15 @@ Library  openprocurement_client.utils
 
 Створити тендер
   [Arguments]  ${username}  ${tender_data}
-  ${tender}=  Call Method  ${USERS.users['${username}'].client}  create_tender  ${tender_data}
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
+  ${ARTIFACT}=  load_data_from  ${file_path}
+  Log  ${ARTIFACT.tender_owner_access_token}
+  Log  ${ARTIFACT.tender_id}
+  ${tender}=  Call Method  ${USERS.users['${username}'].tender_create_client}  create_tender
+  ...      ${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}
@@ -232,10 +247,10 @@ Library  openprocurement_client.utils
 
 Створити план
   [Arguments]  ${username}  ${tender_data}
-  ${tender}=  Call Method  ${USERS.users['${username}'].client}  create_plan  ${tender_data}
+  ${tender}=  Call Method  ${USERS.users['${username}'].plan_client}  create_plan  ${tender_data}
   Log  ${tender}
   ${access_token}=  Get Variable Value  ${tender.access.token}
-  ${tender}=  Call Method  ${USERS.users['${username}'].client}  patch_plan
+  ${tender}=  Call Method  ${USERS.users['${username}'].plan_client}  patch_plan
   ...      ${tender.data.id}
   ...      ${tender}
   ...      access_token=${tender.access.token}
@@ -399,13 +414,13 @@ Library  openprocurement_client.utils
 
 Отримати список планів
   [Arguments]  ${username}
-  @{plans_feed}=  get_plans_feed  ${USERS.users['${username}'].client}
+  @{plans_feed}=  get_plans_feed  ${USERS.users['${username}'].plan_client}
   [return]  @{plans_feed}
 
 
 Отримати план по внутрішньому ідентифікатору
   [Arguments]  ${username}  ${internalid}  ${save_key}=tender_data
-  ${tender}=  Call Method  ${USERS.users['${username}'].client}  get_plan  ${internalid}
+  ${tender}=  Call Method  ${USERS.users['${username}'].plan_client}  get_plan  ${internalid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].access_token}
   Set To Dictionary  ${USERS.users['${username}']}  ${save_key}=${tender}
   ${tender}=  munch_dict  arg=${tender}
@@ -512,7 +527,7 @@ Library  openprocurement_client.utils
   ${tender}=  openprocurement_client.Пошук плану по ідентифікатору  ${username}  ${tender_uaid}
   Set_To_Object  ${tender.data}   ${fieldname}   ${fieldvalue}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].access_token}
-  ${tender}=  Call Method  ${USERS.users['${username}'].client}  patch_plan
+  ${tender}=  Call Method  ${USERS.users['${username}'].plan_client}  patch_plan
   ...      ${tender.data.id}
   ...      ${tender}
   ...      access_token=${tender.access.token}
@@ -536,11 +551,12 @@ Library  openprocurement_client.utils
   [Arguments]  ${username}  ${tender_uaid}  ${item}
   ${tender}=  openprocurement_client.Пошук плану по ідентифікатору  ${username}  ${tender_uaid}
   Append To List  ${tender.data['items']}  ${item}
-  Call Method  ${USERS.users['${username}'].client}  patch_plan
+  Call Method  ${USERS.users['${username}'].plan_client}  patch_plan
   ...      ${tender.data.id}
   ...      ${tender}
   ...      access_token=${tender.access.token}
 
+
 Отримати інформацію із предмету
   [Arguments]  ${username}  ${tender_uaid}  ${item_id}  ${field_name}
   ${field_name}=  Отримати шлях до поля об’єкта  ${username}  ${field_name}  ${item_id}
@@ -563,7 +579,7 @@ Library  openprocurement_client.utils
   ${tender}=  openprocurement_client.Пошук плану по ідентифікатору  ${username}  ${tender_uaid}
   ${item_index}=  get_object_index_by_id  ${tender.data['items']}  ${item_id}
   Remove From List  ${tender.data['items']}  ${item_index}
-  Call Method  ${USERS.users['${username}'].client}  patch_plan
+  Call Method  ${USERS.users['${username}'].plan_client}  patch_plan
   ...      ${tender.data.id}
   ...      ${tender}
   ...      access_token=${tender.access.token}

@@ -11,6 +11,7 @@ from retrying import retry
 from time import sleep
 import os
 import urllib
+from openprocurement_client.resources.tenders import TenderCreateClient
 
 
 def retry_if_request_failed(exception):
@@ -182,4 +183,16 @@ class StableClient_dasu(DasuClient):
 
 
 def prepare_dasu_api_wrapper(resource, host_url, api_version, username, password, ds_config=None):
-    return StableClient_dasu(resource, host_url, api_version, username, password, ds_config=ds_config)
\ No newline at end of file
+    return StableClient_dasu(resource, host_url, api_version, username, password, ds_config=ds_config)
+
+
+class StableTenderCreateClient(TenderCreateClient):
+    @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(StableTenderCreateClient, self).request(*args, **kwargs)
+
+
+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)
\ No newline at end of file

@@ -10,6 +10,7 @@ ${VAT_INCLUDED}     ${True}
 ${NUMBER_OF_MILESTONES}  ${1}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${PLAN_TENDER}      ${True}
 
 *** Test Cases ***
 Можливість оголосити тендер

@@ -19,6 +19,7 @@ ${lot_index}        ${0}
 ${award_index}      ${0}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${PLAN_TENDER}      ${True}
 
 *** Test Cases ***
 

@@ -115,9 +115,11 @@ def subtraction(value1, value2):
 def create_fake_value_amount():
     return fake.random_int(min=1)
 
+
 def get_number_of_minutes(days, accelerator):
     return 1440 * int(days) / accelerator
 
+
 def field_with_id(prefix, sentence):
     return u"{}-{}: {}".format(prefix, fake.uuid4()[:8], sentence)
 
@@ -160,6 +162,7 @@ def create_fake_IsoDurationType(
 
 
 def test_tender_data(params,
+                     plan_data,
                      periods=("enquiry", "tender"),
                      submissionMethodDetails=None,
                      funders=None,
@@ -215,7 +218,11 @@ def test_tender_data(params,
             inc_dt += timedelta(minutes=params['intervals'][period_name][i])
             period_dict[period_name + "Period"][j + "Date"] = inc_dt.astimezone(TZ).isoformat()
     data.update(period_dict)
-    if params.get('moz_integration'):
+    if params.get('plan_tender'):
+        data["procuringEntity"]["name"] = plan_data["data"]["procuringEntity"]["name"]
+        data["procuringEntity"]["identifier"] = plan_data["data"]["procuringEntity"]["identifier"]
+        cpv_group = plan_data["data"]["classification"]["id"]
+    elif params.get('moz_integration'):
         cpv_group = 336
     elif params.get('road_index'):
         cpv_group = 'road'
@@ -295,10 +302,9 @@ def test_tender_data_planning(params):
         "procuringEntity": {
             "identifier": {
                 "scheme": "UA-EDR",
-                "id": str(fake.random_int(min=1, max=999)),
-                "legalName": fake.description(),
+                "id": random.choice(["13313462", "00037256"]),
+                "legalName": random.choice([u"Київський Тестовий Ліцей", u"Київська Тестова міська клінічна лікарня"]),
             },
-            "name": fake.description(),
         },
         "tender": {
             "procurementMethod": "",
@@ -307,10 +313,22 @@ def test_tender_data_planning(params):
                 "startDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
             }
         },
-        "items": []
+        "items": [],
+        "buyers": []
         }
-    id_cpv=fake.cpv()[:4]
-    cpv_data=test_item_data(id_cpv)
+    data["procuringEntity"]["name"] = data["procuringEntity"]["identifier"]["legalName"]
+    buyers = test_buyers_data()
+    buyers["name"] = buyers["identifier"]["legalName"]
+    data['buyers'].append(buyers)
+    if params.get('moz_integration'):
+        id_cpv = 336
+    elif params.get('road_index'):
+        id_cpv = 'road'
+    elif params.get('gmdn_index'):
+        id_cpv = 'gmdn'
+    else:
+        id_cpv = fake.cpv()[:4]
+    cpv_data = test_item_data(id_cpv)
     data.update(cpv_data)
     del data['deliveryDate']
     del data['description']
@@ -334,8 +352,8 @@ def test_tender_data_planning(params):
     return munchify(data)
 
 
-def test_tender_data_limited(params):
-    data = test_tender_data(params)
+def test_tender_data_limited(params, plan_data):
+    data = test_tender_data(params, plan_data)
     del data["submissionMethodDetails"]
     del data["minimalStep"]
     del data["enquiryPeriod"]
@@ -639,31 +657,31 @@ def test_change_document_data(document, change_id):
     return munchify(document)
 
 
-def test_tender_data_openua(params, submissionMethodDetails):
+def test_tender_data_openua(params, submissionMethodDetails, plan_data):
     # We should not provide any values for `enquiryPeriod` when creating
     # an openUA or openEU procedure. That field should not be present at all.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
-    data = test_tender_data(params, ('tender',), submissionMethodDetails)
+    data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     data['procurementMethodType'] = 'aboveThresholdUA'
     data['procuringEntity']['kind'] = 'general'
     return data
 
 
-def test_tender_data_openua_defense(params, submissionMethodDetails):
+def test_tender_data_openua_defense(params, submissionMethodDetails, plan_data):
     """We should not provide any values for `enquiryPeriod` when creating
     an openUA, openEU or openUA_defense procedure. That field should not be present at all.
     Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
-    data = test_tender_data(params, ('tender',), submissionMethodDetails)
+    data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     data['procurementMethodType'] = 'aboveThresholdUA.defense'
     data['procuringEntity']['kind'] = 'defense'
     return data
 
 
-def test_tender_data_openeu(params, submissionMethodDetails):
+def test_tender_data_openeu(params, submissionMethodDetails, plan_data):
     # We should not provide any values for `enquiryPeriod` when creating
     # an openUA or openEU procedure. That field should not be present at all.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
-    data = test_tender_data(params, ('tender',), submissionMethodDetails)
+    data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     data['procurementMethodType'] = 'aboveThresholdEU'
     data['title_en'] = "[TESTING]"
     for item_number, item in enumerate(data['items']):
@@ -676,8 +694,8 @@ def test_tender_data_openeu(params, submissionMethodDetails):
     return data
 
 
-def test_tender_data_framework_agreement(params, submissionMethodDetails):
-    data = test_tender_data_openeu(params, submissionMethodDetails)
+def test_tender_data_framework_agreement(params, submissionMethodDetails, plan_data):
+    data = test_tender_data_openeu(params, submissionMethodDetails, plan_data)
     data['procurementMethodType'] = 'closeFrameworkAgreementUA'
     data['maxAwardsCount'] = fake.random_int(min=3, max=5)
     data['agreementDuration'] = create_fake_IsoDurationType(
@@ -691,11 +709,11 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails):
     return data
 
 
-def test_tender_data_competitive_dialogue(params, submissionMethodDetails):
+def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_data):
     # We should not provide any values for `enquiryPeriod` when creating
     # an openUA or openEU procedure. That field should not be present at all.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
-    data = test_tender_data(params, ('tender',), submissionMethodDetails)
+    data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     if params.get('dialogue_type') == 'UA':
         data['procurementMethodType'] = 'competitiveDialogueUA'
     else:
@@ -843,8 +861,8 @@ def test_elimination_report(corruption, relatedParty_id):
     })
 
 
-def test_tender_data_esco(params, submissionMethodDetails):
-    data = test_tender_data(params, ('tender',), submissionMethodDetails)
+def test_tender_data_esco(params, submissionMethodDetails, plan_data):
+    data = test_tender_data(params, ('tender',), submissionMethodDetails, plan_data)
     data['procurementMethodType'] = 'esco'
     data['title_en'] = "[TESTING]"
     for item_number, item in enumerate(data['items']):
@@ -931,3 +949,24 @@ def invalid_gmdn_data():
     })
 
 
+def test_buyers_data():
+    buyers = {
+        "identifier": {
+            "scheme": "UA-EDR",
+            "id": random.choice(["13313462", "00037256"]),
+            "legalName": random.choice([u"Київський Тестовий Ліцей", u"Київська Тестова міська клінічна лікарня"]),
+        }
+    }
+    return munchify(buyers)
+
+
+def invalid_buyers_data():
+    buyers = {
+        "identifier": {
+            "scheme": "UA-EDR",
+            "id": "13313462",
+            "legalName": "Київський Тестовий Ліцей",
+        },
+        "name": "Київський Тестовий Ліцей"
+        }
+    return munchify(buyers)

@@ -213,12 +213,12 @@ Get Broker Property By Username
 
 
 Підготувати дані для створення тендера
-  [Arguments]  ${tender_parameters}
+  [Arguments]  ${tender_parameters}  ${plan_data}
   ${period_intervals}=  compute_intrs  ${BROKERS}  ${used_brokers}
   ${submissionMethodDetails}=  Get Variable Value  ${submissionMethodDetails}
   ${accelerator}=  Get Variable Value  ${accelerator}
   ${funders}=  Get Variable Value  ${FUNDERS}
-  ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${tender_parameters}  ${submissionMethodDetails}  ${accelerator}  ${funders}
+  ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${tender_parameters}  ${submissionMethodDetails}  ${accelerator}  ${funders}  ${plan_data}
   ${TENDER}=  Create Dictionary
   Set Global Variable  ${TENDER}
   Log  ${tender_data}

@@ -18,6 +18,7 @@ ${MOZ_INTEGRATION}  ${False}
 ${VAT_INCLUDED}     ${True}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${PLAN_TENDER}      ${True}
 
 *** Test Cases ***
 ##############################################################################################

@@ -18,6 +18,7 @@ ${MOZ_INTEGRATION}  ${False}
 ${VAT_INCLUDED}     ${True}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${PLAN_TENDER}      ${True}
 
 *** Test Cases ***
 ##############################################################################################

@@ -167,6 +167,10 @@ class OP_Provider(BaseProvider):
             for cpv_element in self.cpvs:
                 if cpv_element.startswith(cpv_group):
                     similar_cpvs.append(cpv_element)
+                else:
+                    for cpv_element in self.moz_cpvs:
+                        if cpv_element.startswith(cpv_group):
+                            similar_cpvs.append(cpv_element)
             cpv = self.random_element(similar_cpvs)
         for entity in self.items_base_data:
             if entity["cpv_id"] == cpv:

@@ -20,6 +20,7 @@ ${MOZ_INTEGRATION}  ${False}
 ${VAT_INCLUDED}     ${True}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${PLAN_TENDER}      ${True}
 
 *** Test Cases ***
 Можливість оголосити тендер

@@ -11,6 +11,9 @@ ${MODE}         belowThreshold
 ${NUMBER_OF_ITEMS}  ${2}
 ${TENDER_MEAT}      ${False}
 ${ITEM_MEAT}        ${False}
+${MOZ_INTEGRATION}  ${False}
+${ROAD_INDEX}       ${False}
+${GMDN_INDEX}       ${False}
 
 *** Test Cases ***
 Можливість створити план закупівлі
@@ -23,6 +26,24 @@ ${ITEM_MEAT}        ${False}
   Можливість створити план закупівлі
 
 
+Можливість створити план закупівлі з двома buyers
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Оголошення плану
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      create_plan_two_buyers
+  ...      critical
+  Run Keyword And Expect Error  *  Можливість створити план закупівлі з використанням валідації для buyers  ${1}
+
+
+Можливість створити план закупівлі з порожнім buyers
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Оголошення плану
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      create_plan_no_buyers
+  ...      critical
+  Run Keyword And Expect Error  *  Можливість створити план закупівлі з використанням валідації для buyers  ${2}
+
+
 Можливість знайти план по ідентифікатору
   [Tags]   ${USERS.users['${viewer}'].broker}: Пошук плану
   ...      viewer  tender_owner

@@ -18,6 +18,7 @@ ${MOZ_INTEGRATION}  ${False}
 ${VAT_INCLUDED}     ${True}
 ${ROAD_INDEX}       ${False}
 ${GMDN_INDEX}       ${False}
+${PLAN_TENDER}      ${True}
 
 *** Test Cases ***
 ##############################################################################################

@@ -77,7 +77,8 @@ from .initial_data import (
     get_hash,
     invalid_INN_data,
     invalid_cost_data,
-    invalid_gmdn_data
+    invalid_gmdn_data,
+    invalid_buyers_data
 )
 from barbecue import chef
 from restkit import request
@@ -320,7 +321,8 @@ def prepare_test_tender_data(procedure_intervals,
                              tender_parameters,
                              submissionMethodDetails,
                              accelerator,
-                             funders):
+                             funders,
+                             plan_data):
     # Get actual intervals by mode name
     mode = tender_parameters['mode']
     if mode in procedure_intervals:
@@ -337,35 +339,37 @@ def prepare_test_tender_data(procedure_intervals,
     assert intervals['accelerator'] >= 0, \
         "Accelerator should not be less than 0"
     if mode == 'negotiation':
-        return munchify({'data': test_tender_data_limited(tender_parameters)})
+        return munchify({'data': test_tender_data_limited(tender_parameters, plan_data)})
     elif mode == 'negotiation.quick':
-        return munchify({'data': test_tender_data_limited(tender_parameters)})
+        return munchify({'data': test_tender_data_limited(tender_parameters, plan_data)})
     elif mode == 'openeu':
         return munchify({'data': test_tender_data_openeu(
-            tender_parameters, submissionMethodDetails)})
+            tender_parameters, submissionMethodDetails, plan_data)})
     elif mode == 'openua':
         return munchify({'data': test_tender_data_openua(
-            tender_parameters, submissionMethodDetails)})
+            tender_parameters, submissionMethodDetails, plan_data)})
     elif mode == 'openua_defense':
         return munchify({'data': test_tender_data_openua_defense(
-            tender_parameters, submissionMethodDetails)})
+            tender_parameters, submissionMethodDetails, plan_data)})
     elif mode == 'open_competitive_dialogue':
         return munchify({'data': test_tender_data_competitive_dialogue(
-            tender_parameters, submissionMethodDetails)})
+            tender_parameters, submissionMethodDetails, plan_data)})
     elif mode == 'reporting':
-        return munchify({'data': test_tender_data_limited(tender_parameters)})
+        return munchify({'data': test_tender_data_limited(tender_parameters, plan_data)})
     elif mode == 'open_framework':
         return munchify({'data': test_tender_data_framework_agreement(
-            tender_parameters, submissionMethodDetails)})
+            tender_parameters, submissionMethodDetails, plan_data)})
     elif mode == 'belowThreshold':
         return munchify({'data': test_tender_data(
             tender_parameters,
+            plan_data,
             submissionMethodDetails=submissionMethodDetails,
             funders=funders,
-            accelerator=accelerator)})
+            accelerator=accelerator,
+            )})
     elif mode == 'open_esco':
          return munchify({'data': test_tender_data_esco(
-            tender_parameters, submissionMethodDetails)})
+            tender_parameters, submissionMethodDetails, plan_data)})
         # The previous line needs an explicit keyword argument because,
         # unlike previous functions, this one has three arguments.
     raise ValueError("Invalid mode for prepare_test_tender_data")
@@ -750,3 +754,13 @@ def edit_tender_data_for_gmdn(data, mode, data_version):
     return munchify(dict_data)
 
 
+def edit_plan_buyers(data, data_version):
+    dict_data = unmunchify(data)
+    if data_version is 1:
+        add_buyer = invalid_buyers_data()
+        dict_data['data']['buyers'].append(add_buyer)
+
+    if data_version is 2:
+        dict_data['data'].pop('buyers')
+
+    return munchify(dict_data)

+-v MODE:belowThreshold
+
+-v NUMBER_OF_ITEMS:2
+
+-v TENDER_MEAT:False
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+-i create_plan
+-i find_plan
+
+-i plan_view
+
+-i modify_plan
+
+-i add_item
+-i delete_item
\ No newline at end of file