Use munch in ${USERS.users['${username}'].tender_data}

Rename `Get_From_Object` -> `get_from_object` Make small changes to generate_test_bid_data

Use munch in ${USERS.users['${username}'].tender_data}
Rename `Get_From_Object` -> `get_from_object` Make small changes to generate_test_bid_data
Leits · mykhaly
1 parent 9555514f
Showing 4 changed files with 22 additions and 19 deletions
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/keywords.robot
op_robot_tests/tests_files/service_keywords.py
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @deb1a7e
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @deb1a7e
@@ -380,9 +380,8 @@ Resource           resource.robot
 Можливість змінити пропозицію до ${amount} користувачем ${username}
-  ${field}=  Set Variable If  ${number_of_lots} == 0  value.amount  lotValues.0.value.amount
+  ${field}=  Set Variable If  ${number_of_lots} == 0  value.amount  lotValues[0].value.amount
   ${fixbidto10resp}=  Run As  ${username}  Змінити цінову пропозицію  ${TENDER['TENDER_UAID']}  ${field}  ${amount}
-  Set To Dictionary  ${USERS.users['${username}'].bidresponses}  fixbidto10resp=${fixbidto10resp}
 Можливість завантажити документ в пропозицію користувачем ${username}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @deb1a7e
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @deb1a7e
@@ -82,6 +82,7 @@ Library  openprocurement_client_helper.py
   ${tender}=  Call Method  ${USERS.users['${username}'].client}  get_tender  ${internalid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].access_token}
   Set To Dictionary  ${USERS.users['${username}']}  tender_data=${tender}
+  ${tender}=  munch_dict  arg=${tender}
   Log  ${tender}
   [return]   ${tender}
--- a/op_robot_tests/tests_files/keywords.robot
View file @deb1a7e
+++ b/op_robot_tests/tests_files/keywords.robot
View file @deb1a7e
@@ -247,7 +247,7 @@ Get Broker Property By Username
 Підготувати дані для подання пропозиції
   [Arguments]  ${username}
-  ${bid}=  generate_test_bid_data  ${USERS.users['${username}'].tender_data}
+  ${bid}=  generate_test_bid_data  ${USERS.users['${username}'].tender_data.data}
   [Return]  ${bid}
@@ -370,7 +370,7 @@ Get Broker Property By Username
 Звірити поле тендера
   [Arguments]  ${username}  ${tender_uaid}  ${tender_data}  ${field}
-  ${left}=  Get_From_Object  ${tender_data.data}  ${field}
+  ${left}=  get_from_object  ${tender_data.data}  ${field}
   Звірити поле тендера із значенням  ${username}  ${tender_uaid}  ${left}  ${field}
@@ -391,7 +391,7 @@ Get Broker Property By Username
 Звірити дату тендера
   [Arguments]  ${username}  ${tender_uaid}  ${tender_data}  ${field}  ${accuracy}=60  ${absolute_delta}=${False}
-  ${left}=  Get_From_Object  ${tender_data.data}  ${field}
+  ${left}=  get_from_object  ${tender_data.data}  ${field}
   Звірити дату тендера із значенням  ${username}  ${tender_uaid}  ${left}  ${field}  accuracy=${accuracy}  absolute_delta=${absolute_delta}
@@ -420,8 +420,8 @@ Get Broker Property By Username
 Звірити координати доставки тендера
   [Arguments]  ${username}  ${tender_uaid}  ${tender_data}  ${field}  ${object_id}=${Empty}
-  ${left_lat}=  Get_From_Object  ${tender_data.data}  ${field}.deliveryLocation.latitude
-  ${left_lon}=  Get_From_Object  ${tender_data.data}  ${field}.deliveryLocation.longitude
+  ${left_lat}=  get_from_object  ${tender_data.data}  ${field}.deliveryLocation.latitude
+  ${left_lon}=  get_from_object  ${tender_data.data}  ${field}.deliveryLocation.longitude
   ${right_lat}=  Отримати дані із тендера  ${username}  ${tender_uaid}  ${field}.deliveryLocation.latitude  ${object_id}
   ${right_lon}=  Отримати дані із тендера  ${username}  ${tender_uaid}  ${field}.deliveryLocation.longitude  ${object_id}
   Порівняти координати  ${left_lat}  ${left_lon}  ${right_lat}  ${right_lon}
@@ -446,7 +446,7 @@ Get Broker Property By Username
 Звірити поля предметів закупівлі багатопредметного тендера
   [Arguments]  ${username}  ${tender_data}  ${field}
-  @{items}=  Get_From_Object  ${tender_data.data}  items
+  @{items}=  get_from_object  ${tender_data.data}  items
   ${len_of_items}=  Get Length  ${items}
   :FOR  ${index}  IN RANGE  ${len_of_items}
   \  Звірити поле тендера  ${viewer}  ${tender_data}  items[${index}].${field}
@@ -454,14 +454,14 @@ Get Broker Property By Username
 Звірити дату предметів закупівлі багатопредметного тендера
   [Arguments]  ${username}  ${tender_data}  ${field}  ${accuracy}=60  ${absolute_delta}=${False}
-  @{items}=  Get_From_Object  ${tender_data.data}  items
+  @{items}=  get_from_object  ${tender_data.data}  items
   :FOR  ${index}  ${_}  IN ENUMERATE  @{items}
   \  Звірити дату тендера  ${viewer}  ${tender_data}  items[${index}].${field}  accuracy=${accuracy}  absolute_delta=${absolute_delta}
 Звірити координати доставки предметів закупівлі багатопредметного тендера
   [Arguments]  ${username}  ${tender_data}
-  @{items}=  Get_From_Object  ${tender_data.data}  items
+  @{items}=  get_from_object  ${tender_data.data}  items
   :FOR  ${index}  ${_}  IN ENUMERATE  @{items}
   \  Звірити координати тендера  ${viewer}  ${tender_data}  items[${index}]
@@ -471,7 +471,7 @@ Get Broker Property By Username
   ${field}=  Run Keyword If  '${object_id}'  Отримати шлях до поля об’єкта  ${username}  ${field_name}  ${object_id}
   ...             ELSE  Set Variable  ${field_name}
   ${status}  ${field_value}=  Run keyword and ignore error
-  ...      Get from object
+  ...      get_from_object
   ...      ${USERS.users['${username}'].tender_data.data}
   ...      ${field}
   # If field in cache, return its value
@@ -481,6 +481,9 @@ Get Broker Property By Username
   ...                          ELSE  Run As  ${username}  Отримати інформацію із тендера  ${tender_uaid}  ${field}
   # And caching its value before return
   Set_To_Object  ${USERS.users['${username}'].tender_data.data}  ${field}  ${field_value}
+  ${data}=  munch_dict  arg=${USERS.users['${username}'].tender_data.data}
+  Set To Dictionary  ${USERS.users['${username}'].tender_data}  data=${data}
+  Log  ${USERS.users['${username}'].tender_data.data}
   [return]  ${field_value}
--- a/op_robot_tests/tests_files/service_keywords.py
View file @deb1a7e
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @deb1a7e
@@ -442,21 +442,21 @@ def get_document_index_by_id(data, document_id):
 def generate_test_bid_data(tender_data):
     bid = test_bid_data()
-    if 'aboveThreshold' in tender_data['data']['procurementMethodType']:
+    if 'aboveThreshold' in tender_data['procurementMethodType']:
         bid.data.selfEligible = True
         bid.data.selfQualified = True
-    if 'lots' in tender_data['data']:
+    if 'lots' in tender_data:
         bid.data.lotValues = []
-        for lot in tender_data['data']['lots']:
+        for lot in tender_data['lots']:
             value = test_bid_value(lot['value']['amount'])
-            value['relatedLot'] = lot['id']
+            value['relatedLot'] = lot.get('id', '')
             bid.data.lotValues.append(value)
     else:
-        bid.data.update(test_bid_value(tender_data['data']['value']['amount']))
-    if 'features' in tender_data['data']:
+        bid.data.update(test_bid_value(tender_data['value']['amount']))
+    if 'features' in tender_data:
         bid.data.parameters = []
-        for feature in tender_data['data']['features']:
-            parameter = {"value": fake.random_element(elements=(0.15, 0.1, 0.05, 0)), "code": feature['code']}
+        for feature in tender_data['features']:
+            parameter = {"value": fake.random_element(elements=(0.15, 0.1, 0.05, 0)), "code": feature.get('code', '')}
             bid.data.parameters.append(parameter)
     return bid