Add/update ability to work with meat features

Replace `intervals`, `number_of_items`, `number_of_lots` and `meat` with `params` in arguments of corresponding functions/keywords Add test_feature_data function

Add/update ability to work with meat features
Replace `intervals`, `number_of_items`, `number_of_lots` and `meat` with `params` in arguments of corresponding functions/keywords Add test_feature_data function
Leits · mykhaly
1 parent b3d83111
Showing 5 changed files with 87 additions and 62 deletions
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/keywords.robot
op_robot_tests/tests_files/openProcedure.robot
op_robot_tests/tests_files/service_keywords.py
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @92a01ee
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @92a01ee
@@ -9,8 +9,17 @@ Resource           resource.robot
 Можливість оголосити тендер
   ${number_of_lots}=  Convert To Integer  ${number_of_lots}
   ${number_of_items}=  Convert To Integer  ${number_of_items}
-  ${meat}=  Convert To Integer  ${meat}
-  ${tender_data}=  Підготувати дані для створення тендера  ${number_of_items}  ${number_of_lots}  ${meat}
+  ${tender_meat}=  Convert To Integer  ${tender_meat}
+  ${lot_meat}=  Convert To Integer  ${lot_meat}
+  ${item_meat}=  Convert To Integer  ${item_meat}
+  ${tender_parameters}=  Create Dictionary
+  ...      mode=${mode}
+  ...      number_of_items=${number_of_items}
+  ...      number_of_lots=${number_of_lots}
+  ...      tender_meat=${tender_meat}
+  ...      lot_meat=${lot_meat}
+  ...      item_meat=${item_meat}
+  ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_owner}  ${tender_data}
   ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
--- a/op_robot_tests/tests_files/initial_data.py
View file @92a01ee
+++ b/op_robot_tests/tests_files/initial_data.py
View file @92a01ee
@@ -47,7 +47,7 @@ def create_fake_doc():
     return tf.name
-def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_items=1, number_of_lots=0, meat=False):
+def test_tender_data(params, periods=("enquiry", "tender")):
     now = get_now()
     value_amount = round(random.uniform(3000, 99999999999.99), 2)  # max value equals to budget of Ukraine in hryvnias
     data = {
@@ -69,7 +69,8 @@ def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_items=1
             "amount": round(random.uniform(0.005, 0.03) * value_amount, 2),
             "currency": u"UAH"
         },
-        "items": []
+        "items": [],
+        "features": []
     }
     data["procuringEntity"]["kind"] = "other"
     if data.get("mode") == "test":
@@ -81,19 +82,18 @@ def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_items=1
     for period_name in periods:
         period_dict[period_name + "Period"] = {}
         for i, j in zip(range(2), ("start", "end")):
-            inc_dt += timedelta(minutes=intervals[period_name][i])
+            inc_dt += timedelta(minutes=params['intervals'][period_name][i])
             period_dict[period_name + "Period"][j + "Date"] = inc_dt.isoformat()
     data.update(period_dict)
-    number_of_lots = int(number_of_lots)
     cpv_group = fake.cpv()[:3]
-    if number_of_lots:
+    if params['number_of_lots']:
         data['lots'] = []
-        for lot_number in range(number_of_lots):
+        for lot_number in range(params['number_of_lots']):
             lot_id = uuid4().hex
             new_lot = test_lot_data(data['value']['amount'])
             data['lots'].append(new_lot)
             data['lots'][lot_number]['id'] = lot_id
-            for i in range(number_of_items):
+            for i in range(params['number_of_items']):
                 new_item = test_item_data(cpv_group)
                 data['items'].append(new_item)
                 data['items'][lot_number]['relatedLot'] = lot_id
@@ -102,48 +102,37 @@ def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_items=1
         data['value']['amount'] = value_amount
         data['minimalStep']['amount'] = minimalStep
     else:
-        for i in range(number_of_items):
+        for i in range(params['number_of_items']):
             new_item = test_item_data(cpv_group)
             data['items'].append(new_item)
-    if meat:
-        data['features'] = [
-            {
-                "code": uuid4().hex,
-                "featureOf": "tenderer",
-                "title": field_with_id("f", fake.title()),
-                "description": fake.description(),
-                "enum": [
-                    {
-                        "value": 0.15,
-                        "title": fake.word()
-                    },
-                    {
-                        "value": 0.10,
-                        "title": fake.word()
-                    },
-                    {
-                        "value": 0.05,
-                        "title": fake.word()
-                    },
-                    {
-                        "value": 0,
-                        "title": fake.word()
-                    }
-                ]
-            }
-        ]
+    if params['tender_meat']:
+        new_feature = test_feature_data()
+        new_feature.featureOf = "tenderer"
+        data['features'].append(new_feature)
+    if params['lot_meat'] and params['number_of_lots']:
+        new_feature = test_feature_data()
+        new_feature['featureOf'] = "lot"
+        data['lots'][0]['id'] =  data['lots'][0].get('id', uuid4().hex)
+        new_feature['relatedItem'] = data['lots'][0]['id']
+        data['features'].append(new_feature)
+    if params['item_meat'] and params['number_of_items']:
+        new_feature = test_feature_data()
+        new_feature['featureOf'] = "item"
+        data['items'][0]['id'] =  data['items'][0].get('id', uuid4().hex)
+        new_feature['relatedItem'] = data['items'][0]['id']
+        data['features'].append(new_feature)
     return munchify(data)
-def test_tender_data_limited(intervals, procurement_method_type):
-    data = test_tender_data(intervals)
+def test_tender_data_limited(params):
+    data = test_tender_data(params)
     del data["submissionMethodDetails"]
     del data["minimalStep"]
     del data["enquiryPeriod"]
     del data["tenderPeriod"]
     data["procuringEntity"]["kind"] = "general"
-    data.update({"procurementMethodType": procurement_method_type, "procurementMethod": "limited"})
-    if procurement_method_type == "negotiation":
+    data.update({"procurementMethodType": params['mode'], "procurementMethod": "limited"})
+    if params['mode'] == "negotiation":
         cause_variants = (
             "artContestIP",
             "noCompetition",
@@ -154,11 +143,11 @@ def test_tender_data_limited(intervals, procurement_method_type):
         )
         cause = fake.random_element(cause_variants)
         data.update({"cause": cause})
-    if procurement_method_type == "negotiation.quick":
+    if params['mode'] == "negotiation.quick":
         cause_variants = ('quick',)
         cause = fake.random_element(cause_variants)
         data.update({"cause": cause})
-    if procurement_method_type in ("negotiation", "negotiation.quick"):
+    if params['mode'] in ("negotiation", "negotiation.quick"):
         data.update({
             "procurementMethodDetails": "quick, accelerator=1440",
             "causeDescription": fake.description()
@@ -166,6 +155,28 @@ def test_tender_data_limited(intervals, procurement_method_type):
     return munchify(data)
+def test_feature_data():
+    return munchify({
+        "code": uuid4().hex,
+        "title": field_with_id("f", fake.title()),
+        "description": fake.description(),
+        "enum": [
+            {
+                "value": 0.05,
+                "title": fake.word()
+            },
+            {
+                "value": 0.01,
+                "title": fake.word()
+            },
+            {
+                "value": 0,
+                "title": fake.word()
+            }
+        ]
+    })
+
+
 def test_question_data():
     return munchify({
         "data": {
@@ -341,15 +352,15 @@ def test_lot_complaint_data(complaint, lot_id):
     return munchify(complaint)
-def test_tender_data_openua(intervals, number_of_items, number_of_lots, meat):
-    accelerator = intervals['accelerator']
+def test_tender_data_openua(params):
+    accelerator = params['intervals']['accelerator']
     # Since `accelerator` field is not really a list containing timings
     # for a period called `acceleratorPeriod`, let's remove it :)
-    del intervals['accelerator']
+    del params['intervals']['accelerator']
     # 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(intervals, ('tender',), number_of_items, number_of_lots, meat)
+    data = test_tender_data(params, ('tender',))
     data['procurementMethodType'] = 'aboveThresholdUA'
     data['procurementMethodDetails'] = 'quick, ' \
         'accelerator={}'.format(accelerator)
@@ -357,15 +368,15 @@ def test_tender_data_openua(intervals, number_of_items, number_of_lots, meat):
     return data
-def test_tender_data_openeu(intervals, number_of_items, number_of_lots, meat):
-    accelerator = intervals['accelerator']
+def test_tender_data_openeu(params):
+    accelerator = params['intervals']['accelerator']
     # Since `accelerator` field is not really a list containing timings
     # for a period called `acceleratorPeriod`, let's remove it :)
-    del intervals['accelerator']
+    del params['intervals']['accelerator']
     # 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(intervals, ('tender',), number_of_items, number_of_lots, meat)
+    data = test_tender_data(params, ('tender',))
     data['procurementMethodType'] = 'aboveThresholdEU'
     data['procurementMethodDetails'] = 'quick, ' \
         'accelerator={}'.format(accelerator)
--- a/op_robot_tests/tests_files/keywords.robot
View file @92a01ee
+++ b/op_robot_tests/tests_files/keywords.robot
View file @92a01ee
@@ -197,9 +197,9 @@ Get Broker Property By Username
 Підготувати дані для створення тендера
-  [Arguments]  ${number_of_items}=1  ${number_of_lots}=0  ${meat}=${False}
+  [Arguments]  ${tender_parameters}
   ${period_intervals}=  compute_intrs  ${BROKERS}  ${used_brokers}
-  ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${mode}  ${number_of_items}  ${number_of_lots}  ${meat}
+  ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${tender_parameters}
   ${TENDER}=  Create Dictionary
   Set Global Variable  ${TENDER}
   Log  ${tender_data}
--- a/op_robot_tests/tests_files/openProcedure.robot
View file @92a01ee
+++ b/op_robot_tests/tests_files/openProcedure.robot
View file @92a01ee
@@ -11,7 +11,9 @@ ${mode}             openeu
 ${number_of_items}  ${1}
 ${number_of_lots}   ${1}
-${meat}             ${1}
+${tender_meat}      ${1}
+${lot_meat}         ${1}
+${item_meat}        ${1}
 *** Test Cases ***
--- a/op_robot_tests/tests_files/service_keywords.py
View file @92a01ee
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @92a01ee
@@ -258,13 +258,15 @@ def compute_intrs(brokers_data, used_brokers):
     return result
-def prepare_test_tender_data(procedure_intervals, mode, number_of_items=1, number_of_lots=0, meat=False):
+def prepare_test_tender_data(procedure_intervals, tender_parameters):
     # Get actual intervals by mode name
+    mode = tender_parameters['mode']
     if mode in procedure_intervals:
         intervals = procedure_intervals[mode]
     else:
         intervals = procedure_intervals['default']
     LOGGER.log_message(Message(intervals))
+    tender_parameters['intervals'] = intervals
     # Set acceleration value for certain modes
     if mode in ['openua', 'openeu']:
@@ -276,18 +278,19 @@ def prepare_test_tender_data(procedure_intervals, mode, number_of_items=1, numbe
     else:
         assert 'accelerator' not in intervals.keys(), \
                "Accelerator is not available for mode '{0}'".format(mode)
+
     if mode == 'negotiation':
-        return munchify({'data': test_tender_data_limited(intervals, 'negotiation')})
+        return munchify({'data': test_tender_data_limited(tender_parameters)})
     elif mode == 'negotiation.quick':
-        return munchify({'data': test_tender_data_limited(intervals, 'negotiation.quick')})
+        return munchify({'data': test_tender_data_limited(tender_parameters)})
     elif mode == 'openeu':
-        return munchify({'data': test_tender_data_openeu(intervals, number_of_items, number_of_lots, meat)})
+        return munchify({'data': test_tender_data_openeu(tender_parameters)})
     elif mode == 'openua':
-        return munchify({'data': test_tender_data_openua(intervals, number_of_items, number_of_lots, meat)})
+        return munchify({'data': test_tender_data_openua(tender_parameters)})
     elif mode == 'reporting':
-        return munchify({'data': test_tender_data_limited(intervals, 'reporting')})
+        return munchify({'data': test_tender_data_limited(tender_parameters)})
     elif mode == 'belowThreshold':
-        return munchify({'data': test_tender_data(intervals, number_of_items=number_of_items, number_of_lots=number_of_lots, meat=meat)})
+        return munchify({'data': test_tender_data(tender_parameters)})
     raise ValueError("Invalid mode for prepare_test_tender_data")
@@ -456,7 +459,7 @@ def generate_test_bid_data(tender_data):
     if 'features' in tender_data:
         bid.data.parameters = []
         for feature in tender_data['features']:
-            parameter = {"value": fake.random_element(elements=(0.15, 0.1, 0.05, 0)), "code": feature.get('code', '')}
+            parameter = {"value": fake.random_element(elements=(0.05, 0.01, 0)), "code": feature.get('code', '')}
             bid.data.parameters.append(parameter)
     return bid