Merge pull request #561 from OrysiaDrabych/dialogue

Update Competitive Dialogue procedure

@@ -967,6 +967,7 @@ Resource           resource.robot
   ...     ELSE  Set Variable  ${None}
   ...     ELSE  Set Variable  ${None}
   Run As  ${username}  Подати цінову пропозицію  ${TENDER['TENDER_UAID']}  ${bid}  ${lots_ids}  ${features_ids}
   Run As  ${username}  Подати цінову пропозицію  ${TENDER['TENDER_UAID']}  ${bid}  ${lots_ids}  ${features_ids}
 
 
+
 Неможливість подати цінову пропозицію без прив’язки до лоту користувачем ${username}
 Неможливість подати цінову пропозицію без прив’язки до лоту користувачем ${username}
   ${bid}=  Підготувати дані для подання пропозиції
   ${bid}=  Підготувати дані для подання пропозиції
   ${values}=  Get Variable Value  ${bid.data.lotValues[0]}
   ${values}=  Get Variable Value  ${bid.data.lotValues[0]}

@@ -744,7 +744,10 @@ Library  openprocurement_client.utils
   \    Set To Dictionary  ${bid.data.parameters[${index}]}  code=${code}
   \    Set To Dictionary  ${bid.data.parameters[${index}]}  code=${code}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  create_bid  ${tender}  ${bid}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  create_bid  ${tender}  ${bid}
   Log  ${reply}
   Log  ${reply}
-  ${status}=  Set Variable If  '${MODE}'=='openeu'  pending  active
+  Set To Dictionary  ${USERS.users['${username}']}  bid_access_token=${reply.access.token}
+  ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].bid_access_token}
+  ${procurementMethodType}=  Get variable value  ${USERS.users['${username}'].tender_data.data.procurementMethodType}
+  ${status}=  Set Variable If  'EU' in '${procurementMethodType}' or '${procurementMethodType}'=='competitiveDialogueUA'  pending  active
   Set To Dictionary  ${reply['data']}  status=${status}
   Set To Dictionary  ${reply['data']}  status=${status}
   ${reply_active}=  Call Method  ${USERS.users['${username}'].client}  patch_bid  ${tender}  ${reply}
   ${reply_active}=  Call Method  ${USERS.users['${username}'].client}  patch_bid  ${tender}  ${reply}
   Set To Dictionary  ${USERS.users['${username}']}  access_token=${reply['access']['token']}
   Set To Dictionary  ${USERS.users['${username}']}  access_token=${reply['access']['token']}

@@ -266,7 +266,7 @@ Get Broker Property By Username
 
 
 Підготувати дані для подання пропозиції для другого етапу
 Підготувати дані для подання пропозиції для другого етапу
   [Arguments]  ${index}=0
   [Arguments]  ${index}=0
-  ${bid}=  generate_test_bid_data_second_stage  ${USERS.users['${tender_owner}'].initialdata.data}  ${index}
+  ${bid}=  generate_test_bid_data_second_stage  ${USERS.users['${tender_owner}'].tender_data.data}  ${index}
   [Return]  ${bid}
   [Return]  ${bid}
 
 
 
 

@@ -1364,7 +1364,7 @@ ${ITEM_MEAT}        ${True}
   [Tags]   ${USERS.users['${provider}'].broker}: Подання пропозиції
   [Tags]   ${USERS.users['${provider}'].broker}: Подання пропозиції
   ...      provider
   ...      provider
   ...      ${USERS.users['${provider}'].broker}
   ...      ${USERS.users['${provider}'].broker}
-  ...      modify_bid_by_provider
+  ...      add_doc_to_bid_by_provider
   ...      critical
   ...      critical
   [Teardown]  Оновити LAST_MODIFICATION_DATE
   [Teardown]  Оновити LAST_MODIFICATION_DATE
   Можливість завантажити документ в пропозицію користувачем ${provider}
   Можливість завантажити документ в пропозицію користувачем ${provider}

@@ -533,8 +533,8 @@ def generate_test_bid_data_second_stage(tender_data, index='0'):
     bid['data']['tenderers'][0]['identifier']['id'] = tender_data['shortlistedFirms'][index]['identifier']['id']
     bid['data']['tenderers'][0]['identifier']['id'] = tender_data['shortlistedFirms'][index]['identifier']['id']
     bid['data']['tenderers'][0]['identifier']['scheme'] = tender_data['shortlistedFirms'][index]['identifier']['scheme']
     bid['data']['tenderers'][0]['identifier']['scheme'] = tender_data['shortlistedFirms'][index]['identifier']['scheme']
     bid['data']['tenderers'][0]['identifier']['legalName'] = tender_data['shortlistedFirms'][index]['identifier']['legalName']
     bid['data']['tenderers'][0]['identifier']['legalName'] = tender_data['shortlistedFirms'][index]['identifier']['legalName']
-
-    if tender_data.get('procurementMethodType', '')[:-2] in ('aboveThreshold', 'competitiveDialogue'):
+    bid['data']['tenderers'][0]['name'] = tender_data['shortlistedFirms'][index]['name']
+    if tender_data.get('procurementMethodType', '') in ('competitiveDialogueEU.stage2', 'competitiveDialogueUA.stage2'):
         bid.data.selfEligible = True
         bid.data.selfEligible = True
         bid.data.selfQualified = True
         bid.data.selfQualified = True
     if 'lots' in tender_data:
     if 'lots' in tender_data:

@@ -52,7 +52,6 @@
 
 
 -i make_bid_without_related_lot
 -i make_bid_without_related_lot
 -i make_bid_by_provider
 -i make_bid_by_provider
-  -i modify_bid_by_provider
   -i add_doc_to_bid_by_provider
   -i add_doc_to_bid_by_provider
 -i make_bid_by_provider1
 -i make_bid_by_provider1
 -i make_bid_by_provider2
 -i make_bid_by_provider2

+-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 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_approve_first_award
+
+-i contract_sign

--s openProcedure
-
 -v MODE:open_competitive_dialogue
 -v MODE:open_competitive_dialogue