Merge pull request #2 from ProzorroUKR/master

prozorro master merge to izi trade master

@@ -96,3 +96,4 @@ zc.recipe.egg = 2.0.3
 cryptography = 2.3.1
 pyOpenSSL = 18.0.0
 python-dateutil = 2.7.5
+Pillow = 6.2.2
\ No newline at end of file

@@ -14,8 +14,6 @@ ${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}
@@ -44,7 +42,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}  ${ARTIFACT.tender_id}  ${ARTIFACT.tender_owner_access_token}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
 
@@ -105,7 +103,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_mnn}=  edit_tender_data_for_mnn  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_mnn}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_mnn}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_mnn}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_mnn}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
 
@@ -141,7 +139,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_cost}=  edit_tender_data_for_cost  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_cost}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_cost}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_cost}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_cost}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
 
@@ -177,7 +175,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_gmdn}=  edit_tender_data_for_gmdn  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_gmdn}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_gmdn}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_gmdn}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_gmdn}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
 
@@ -213,7 +211,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_plan_tender}=  edit_tender_data_for_plan_tender  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_plan_tender}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_plan_tender}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_plan_tender}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_plan_tender}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
 

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

@@ -261,14 +261,34 @@ PrivatMarket:
 Prom:
     intervals:
         default:
+            accelerator: 1440
             enquiry: [4, 4]
             tender:  [0,  30]
+        abovethresholdeu:
+            accelerator: 1440
+            tender:  [0, 50]
+        openeu:
+            accelerator: 1440
+            tender:  [0, 50]
+        openua:
+            accelerator: 1440
+            tender:  [0, 65]
+        belowThreshold:
+            accelerator: 1440
+            enquiry: [0, 75]
+            tender:  [0, 65]
+        negotiation:
+            accelerator: 360
+            enquiry: [0, 20]
+            tender:  [0, 20]
+        openua_defense:
+            tender:  [0, 110]
     keywords_file: prom
     roles:
         tender_owner:   Prom_Owner
         viewer:         Prom_Viewer
-        provider:       Prom_Provider1
-    timeout_on_wait: 10
+        provider:       Prom_Provider
+    timeout_on_wait: 300
 Publicbid:
     intervals:
         default:
@@ -303,6 +323,7 @@ SmartTender:
             enquiry: [0, 10]
             tender:  [0, 30]
         belowThreshold:
+            accelerator: 1440
             enquiry: [0, 25]
             tender:  [0, 20]
         openua:
@@ -648,4 +669,4 @@ avi:
         provider2:      avi_Provider3
         tender_owner:   avi_Owner
         viewer:         avi_Viewer
-    timeout_on_wait: 120
+    timeout_on_wait: 120
\ No newline at end of file

@@ -310,31 +310,34 @@ users:
         size: [1920, 1080]
     Prom_Owner:
         broker:   Prom
-        homepage: "http://zakupki.dz-test.net/"
-        default_page: "https://my.zakupki.dz-test.net/cabinet/purchases/state_purchase/list"
-        login:    test@test12.com
-        password: 12345678
+        homepage: "https://zakupki.company"
+        default_page: "https://my.zakupki.company/cabinet/purchases/state_purchase/list?mode=all_prozorro"
+        state_plan_page: "https://my.zakupki.company/cabinet/purchases/state_plan/list?mode=all_prozorro"
+        login:    test@test1.com
+        password: 123456
         browser:  chrome
         position: [0, 0]
-        size:     [1280, 1024]
+        size:     [1920, 1080]
     Prom_Viewer:
         broker:   Prom
-        homepage: "http://zakupki.dz-test.net/"
-        default_page: "https://my.zakupki.dz-test.net/cabinet/purchases/state_purchase/list"
-        login:    test@test13.com
-        password: 12345678
+        homepage: "https://zakupki.company"
+        default_page: "https://my.zakupki.company/cabinet/purchases/state_purchase/list?mode=all_prozorro"
+        state_plan_page: "https://my.zakupki.company/cabinet/purchases/state_plan/list?mode=all_prozorro"
+        login:    test@test2.com
+        password: 123456
         browser:  chrome
         position: [640, 0]
-        size:     [1280, 1024]
+        size:     [1920, 1080]
     Prom_Provider:
         broker:   Prom
-        homepage: "http://zakupki.dz-test.net/"
-        default_page: "https://my.zakupki.dz-test.net/cabinet/purchases/state_purchase/list"
-        login:    test@test14.com
-        password: 12345678
+        homepage: "https://zakupki.company"
+        default_page: "https://my.zakupki.company/cabinet/purchases/state_purchase/search/all"
+        state_plan_page: "https://my.zakupki.company/cabinet/purchases/state_plan/list?mode=all_prozorro"
+        login:    test@test3.com
+        password: 123456
         browser:  chrome
         position: [640, 0]
-        size:     [1280, 1024]
+        size:     [1920, 1080]
     Publicbid_Owner:
         broker:   Publicbid
         homepage: "http://217.76.194.185:56034/"

@@ -286,14 +286,14 @@ def test_tender_data(params,
 def test_tender_data_planning(params):
     data = {
         "budget": {
-            "amountNet": round(random.uniform(3000, 999999999.99), 2),
+            "amountNet": round(random.uniform(3000, 999999.99), 2),
             "description": fake.description(),
             "project": {
                 "id": str(fake.random_int(min=1, max=999)),
                 "name": fake.description(),
             },
             "currency": "UAH",
-            "amount": round(random.uniform(3000, 99999999999.99), 2),
+            "amount": round(random.uniform(3000, 99999999.99), 2),
             "id": str(fake.random_int(min=1, max=99999999999)) + "-" + str(fake.random_int(min=1, max=9)),
             "breakdown": [],
             "period": {
@@ -315,6 +315,7 @@ def test_tender_data_planning(params):
                 "startDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
             }
         },
+        "mode": "test",
         "items": [],
         "buyers": []
         }

@@ -1268,14 +1268,14 @@ Require Failure
 
 Розрахувати ціну для ${contract_number} контракту
   ${username}=  Отримати користувача з доступом до поля за пріорітетом  agreements  ${tender_owner}  ${viewer}
-  ${contract_data}=  Create Dictionary  data=${USERS.users['${tender_owner}'].tender_data.data.agreements[0].contracts[${contract_number}]}
+  ${contract_data}=  Create Dictionary  data=${USERS.users['${username}'].tender_data.data.agreements[0].contracts[${contract_number}]}
   ${quantity}=  Set Variable  ${0}
   :FOR  ${index}  IN RANGE  ${NUMBER_OF_ITEMS}
-  \  ${quantity}=  Evaluate  ${quantity}+${USERS.users['${tender_owner}'].tender_data.data['items'][${index}]['quantity']}
-  ${value}=  Evaluate  ${USERS.users['${tender_owner}'].tender_data.data.awards[${contract_number}+1].value.amount}/${quantity}
+  \  ${quantity}=  Evaluate  ${quantity}+${USERS.users['${username}'].tender_data.data['items'][${index}]['quantity']}
+  ${value}=  Evaluate  ${USERS.users['${username}'].tender_data.data.awards[${contract_number}+1].value.amount}/${quantity}
   ${value}=  Convert To Integer  ${value}
   :FOR  ${index}  IN RANGE  ${NUMBER_OF_ITEMS}
   \  Set To Dictionary  ${contract_data.data.unitPrices[${index}].value}  amount=${value}
   ${contract_data}=  munch_dict  arg=${contract_data}
   Log  ${contract_data}
-  [Return]  ${contract_data}
+  [Return]  ${contract_data}
\ No newline at end of file

@@ -218,7 +218,7 @@ ${NUMBER_OF_BREAKDOWN}  ${2}
   [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних плану
   ...      viewer
   ...      ${USERS.users['${viewer}'].broker}
-  ...      plan_view
+  ...      plan_view_unit_code
   ...      non-critical
   Звірити відображення unit.code усіх предметів плану для користувача ${viewer}
 

 *** Variables ***
 ${RESOURCE}      tenders   # possible values: tenders, auctions
-${API_HOST_URL}  https://lb-api-sandbox.prozorro.gov.ua
+${API_HOST_URL}  https://lb-api-staging.prozorro.gov.ua
 ${API_VERSION}   2.4
 ${BROKER}        Quinta
-${DS_HOST_URL}   https://upload-docs-sandbox.prozorro.gov.ua
+${DS_HOST_URL}   https://upload-docs-staging.prozorro.gov.ua
 ${ROLE}          viewer
-${EDR_HOST_URL}  https://lb-edr-sandbox.prozorro.gov.ua
+${EDR_HOST_URL}  https://lb-edr-staging.prozorro.gov.ua
 ${EDR_VERSION}   0
 
 ${DASU_RESOURCE}      monitorings
-${DASU_API_HOST_URL}  https://audit-api-sandbox.prozorro.gov.ua
+${DASU_API_HOST_URL}  https://audit-api-staging.prozorro.gov.ua
 ${DASU_API_VERSION}   2.4
 
-${DS_REGEXP}        ^https?:\\/\\/public-docs(?:-sandbox)?\\.prozorro\\.gov\\.ua\\/get\\/([0-9A-Fa-f]{32})
-${AUCTION_REGEXP}   ^https?:\\/\\/auction(?:-sandbox)?\\.prozorro\\.gov\\.ua\\/(esco-)?tenders\\/([0-9A-Fa-f]{32})
+${DS_REGEXP}        ^https?:\/\/public-docs(?:-staging)?\.prozorro\.gov\.ua\/get\/([0-9A-Fa-f]{32})
+${AUCTION_REGEXP}   ^https?:\/\/auction(?:-staging)?\.prozorro\.gov\.ua\/(esco-)?tenders\/([0-9A-Fa-f]{32})

@@ -17,7 +17,6 @@
 -i tender_view_minimalStep
 -i tender_view_deliveryDate
 -i tender_view_quantity
--i tender_view_coordinates
 -i lot_view
 -i lot_view_value
 -i lot_view_minimalStep

+-v MODE:open_competitive_dialogue
+
+-v DIALOGUE_TYPE:UA
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:False
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i tender_view_unit_code
+-i tender_view_coordinates
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+-i make_bid_by_provider2
+
+-i open_tender_view
+
+#-i pre-qualifications_check_by_edrpou
+
+-i pre-qualification_approve_first_bid
+-i pre-qualification_approve_second_bid
+-i pre-qualification_approve_third_bid
+
+-i pre-qualification_approve_qualifications
+
+-i stage2_pending_status_view
+
+-i wait_bridge_for_work
+
+-i get_second_stage
+
+-i compare_stages
+
+-i save_tender_second_stage
+
+-i activate_second_stage
+
+-i make_bid_by_provider_second_stage
+-i make_bid_by_provider1_second_stage
+
+#-i auction
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i qualification_cancel_first_award_qualification
+-i qualification_add_doc_to_second_award
+-i qualification_approve_second_award
+
+-i contract_stand_still
+-i contract_view
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
\ No newline at end of file

+-v MODE:open_competitive_dialogue
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:False
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+-i make_bid_by_provider2
+
+-i open_tender_view
+
+#-i pre-qualifications_check_by_edrpou
+
+-i pre-qualification_approve_first_bid
+-i pre-qualification_approve_second_bid
+-i pre-qualification_approve_third_bid
+
+-i pre-qualification_approve_qualifications
+
+-i stage2_pending_status_view
+
+-i wait_bridge_for_work
+
+-i get_second_stage
+
+-i compare_stages
+
+-i save_tender_second_stage
+
+-i activate_second_stage
+
+-i make_bid_by_provider_second_stage
+-i make_bid_by_provider1_second_stage
+
+#-i qualifications_check_by_edrpou
+
+-i pre-qualification_approve_first_bid_second_stage
+-i pre-qualification_approve_second_bid_second_stage
+
+-i pre-qualification_approve_qualifications_second_stage
+
+#-i auction
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i qualification_cancel_first_award_qualification
+-i qualification_add_doc_to_second_award
+-i qualification_approve_second_award
+
+-i contract_stand_still
+-i contract_view
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
\ No newline at end of file

+-v MODE:framework_selection
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:False
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+-i modify_item
+-i modify_lot
+
+-i add_tender_doc
+
+-i extend_tendering_period
+
+-i make_bid_by_provider
+  -i modify_bid_by_provider
+-i make_bid_by_provider1
+  -i modify_bid_by_provider1
+
+-i auction_url
+-i auction
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+-i qualification_cancel_first_award_qualification
+-i qualification_add_doc_to_second_award
+-i qualification_approve_second_award
+
+-i contract_view
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
\ No newline at end of file