Merge pull request #191 from ProzorroUKR/dev_prozorro

fix data generatin/tender create

@@ -14,6 +14,8 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_uaid}
+  Log  ${ARTIFACT.tender_id}
+  Log  ${ARTIFACT.tender_owner_access_token}
   ${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}
@@ -42,7 +44,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   Log  ${plan_data}
   ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}  ${plan_data}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}  ${ARTIFACT.tender_id}  ${ARTIFACT.tender_owner_access_token}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
 

@@ -189,15 +189,15 @@ Library  openprocurement_client.utils
 
 
 Створити тендер
-  [Arguments]  ${username}  ${tender_data}
-  ${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}
+  [Arguments]  ${username}  ${tender_data}  ${plan_id}  ${plan_access_token}
+  #${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}
   ${tender}=  Call Method  ${USERS.users['${username}'].tender_create_client}  create_tender
-  ...      ${ARTIFACT.tender_id}
+  ...      ${plan_id}
   ...      ${tender_data}
-  ...      access_token=${ARTIFACT.tender_owner_access_token}
+  ...      access_token=${plan_access_token}
   Log  ${tender}
   ${access_token}=  Get Variable Value  ${tender.access.token}
   ${status}=  Set Variable If  'open' in '${MODE}'  active.tendering  ${EMPTY}

@@ -178,6 +178,7 @@ def test_tender_data(params,
         "title_en": fake_en.catch_phrase(),
         "title_ru": fake_ru.catch_phrase(),
         "procuringEntity": fake.procuringEntity(),
+        "procurementMethodType": "belowThreshold",
         "value": {
             "amount": value_amount,
             "currency": u"UAH",
@@ -294,7 +295,11 @@ 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": []
+            "breakdown": [],
+            "period": {
+                "startDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat(),
+                "endDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
+            }
         },
         "procuringEntity": {
             "identifier": {

@@ -326,6 +326,7 @@ Get Broker Property By Username
 Підготувати дані для подання пропозиції для другого етапу
   [Arguments]  ${username}
   ${value}=  Evaluate  ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value.amount}*0.95
+  ${value}=  Convert To Number  ${value}  2
   Set To Dictionary  ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value}  amount=${value}
   [Return]  ${USERS.users['${username}'].bidresponses.bid}
 
@@ -1195,7 +1196,7 @@ Require Failure
 Дочекатись можливості зареєструвати угоди
   [Arguments]  ${username}
   ${username}=  Отримати користувача з доступом до поля за пріорітетом  contractPeriod  ${tender_owner}  ${viewer}
-  Дочекатись дати  ${USERS.users['${tender_owner}'].tender_data.data.contractPeriod.clarificationsUntil}
+  Дочекатись дати  ${USERS.users['${username}'].tender_data.data.contractPeriod.clarificationsUntil}
   Оновити LAST_MODIFICATION_DATE
   Дочекатись синхронізації з майданчиком  ${username}