update planning.robot

@@ -46,7 +46,7 @@ Resource           resource.robot
   ...      item_meat=${${ITEM_MEAT}}
   ${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}
+  ${tender_data}=  Підготувати дані для створення плану  ${tender_parameters}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${TENDER_UAID}=  Run As  ${tender_owner}  Створити план  ${adapted_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}

@@ -45,7 +45,7 @@ Library  openprocurement_client.utils
 #  Uncomment this line if there is need to process files operations without DS.
 #  ${ds_api_wraper}=  set variable  ${None}
   ${ds_api_wraper}=  prepare_ds_api_wrapper  ${DS_HOST_URL}  ${auth_ds}
-  ${api_wrapper}=  Run Keyword If  '${MODE}' == 'planning'
+  ${api_wrapper}=  Run Keyword If  '${RESOURCE}' == 'plans'
   ...     prepare_plan_api_wrapper  ${USERS.users['${username}'].api_key}  ${API_HOST_URL}  ${API_VERSION}
   ...                     ELSE  prepare_api_wrapper  ${USERS.users['${username}'].api_key}  ${RESOURCE}  ${API_HOST_URL}  ${API_VERSION}  ${ds_api_wraper}
   Set To Dictionary  ${USERS.users['${username}']}  client=${api_wrapper}

@@ -2,6 +2,7 @@ users:
     Tender_Owner:
         auth_ds:
             tenders:  [test.quintagroup.com, test.quintagroup.com]
+            plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
@@ -12,6 +13,7 @@ users:
     Tender_User:
         auth_ds:
             tenders:  [test.quintagroup.com, test.quintagroup.com]
+            plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
@@ -22,6 +24,7 @@ users:
     Tender_User1:
         auth_ds:
             tenders:  [test.quintagroup.com, test.quintagroup.com]
+            plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
@@ -32,6 +35,7 @@ users:
     Tender_User2:
         auth_ds:
             tenders:  [test.quintagroup.com, test.quintagroup.com]
+            plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
@@ -42,6 +46,7 @@ users:
     Tender_Viewer:
         auth_ds:
             tenders:  [test.quintagroup.com, test.quintagroup.com]
+            plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  ""
         broker:   Quinta

@@ -19,6 +19,10 @@ 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"]
+mode_limited = ["reporting", "negotiation.quick", "negotiation"]
+
 # This workaround fixes an error caused by missing "catch_phrase" class method
 # for the "ru_RU" locale in Faker >= 0.7.4
 fake_ru.add_provider(CompanyProviderEnUs)
@@ -197,8 +201,8 @@ def test_tender_data_planning(params):
             "name": fake.description(),
         },
         "tender": {
-            "procurementMethod": "open",
-            "procurementMethodType": "belowThreshold",
+            "procurementMethod": "",
+            "procurementMethodType": params['mode'],
             "tenderPeriod": {
                 "startDate": (get_now().isoformat())
             }
@@ -222,6 +226,10 @@ def test_tender_data_planning(params):
         del item_data['deliveryLocation']
         del item_data['deliveryDate']['startDate']
         data['items'].append(item_data)
+    if params['mode'] in mode_open:
+        data["tender"]["procurementMethod"] = "open"
+    if params['mode'] in mode_limited:
+        data["tender"]["procurementMethod"] = "limited"
     return munchify(data)
 
 

@@ -222,6 +222,16 @@ Get Broker Property By Username
   [return]  ${tender_data}
 
 
+Підготувати дані для створення плану
+  [Arguments]  ${tender_parameters}
+  ${data}=  test_tender_data_planning  ${tender_parameters}
+  ${tender_data}=  Create Dictionary  data=${data}
+  ${TENDER}=  Create Dictionary
+  Set Global Variable  ${TENDER}
+  Log  ${tender_data}
+  [return]  ${tender_data}
+
+
 Підготувати дані для створення предмету закупівлі
   [Arguments]  ${cpv}
   ${item}=  test_item_data  ${cpv[0:4]}
@@ -439,7 +449,7 @@ Log differences between dicts
 
 Оновити сторінку
   [Arguments]  ${username}
-  Run Keyword If  '${MODE}' == 'planning'  Run As  ${username}  Оновити сторінку з планом  ${TENDER['TENDER_UAID']}
+  Run Keyword If  '${RESOURCE}' == 'plans'  Run As  ${username}  Оновити сторінку з планом  ${TENDER['TENDER_UAID']}
   ...      ELSE  Run As  ${username}  Оновити сторінку з тендером  ${TENDER['TENDER_UAID']}
 
 

@@ -4,7 +4,8 @@ Suite Setup     Test Suite Setup
 Suite Teardown  Test Suite Teardown
 
 *** Variables ***
-${MODE}         planning
+${RESOURCE}     plans
+${MODE}         belowThreshold
 @{USED_ROLES}   tender_owner  viewer
 
 ${NUMBER_OF_ITEMS}  ${2}

@@ -333,9 +333,6 @@ def prepare_test_tender_data(procedure_intervals,
             tender_parameters,
             submissionMethodDetails=submissionMethodDetails,
             accelerator=accelerator)})
-    elif mode == 'planning':
-        return munchify({'data': test_tender_data_planning(
-            tender_parameters)})
         # 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")