Commit 09650b448ae9b8ecf45683af88c9c5eda7dc7fe8
1 parent
ea4c5e68
contract guarantee document keywords/add criteria guarantee variable
Showing
2 changed files
with
72 additions
and
1 deletions
@@ -52,6 +52,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | @@ -52,6 +52,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | ||
52 | ... ELSE Run As ${tender_owner} Створити тендер | 52 | ... ELSE Run As ${tender_owner} Створити тендер |
53 | ... ${adapted_data} | 53 | ... ${adapted_data} |
54 | ... ${ARTIFACT.tender_uaid} | 54 | ... ${ARTIFACT.tender_uaid} |
55 | + ... ${CRITERIA_GUARANTEE} | ||
55 | Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data} | 56 | Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data} |
56 | Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} | 57 | Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} |
57 | 58 | ||
@@ -2358,6 +2359,21 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | @@ -2358,6 +2359,21 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | ||
2358 | Set To Dictionary ${USERS.users['${username}']} bid_document_modified=${bid_document_modified_data} | 2359 | Set To Dictionary ${USERS.users['${username}']} bid_document_modified=${bid_document_modified_data} |
2359 | Remove File ${file_path} | 2360 | Remove File ${file_path} |
2360 | 2361 | ||
2362 | + | ||
2363 | +Можливість завантажити підтвердження виконання контракту в пропозицію учасника | ||
2364 | + [Arguments] ${username} ${tender_uaid} | ||
2365 | + Log ${username} | ||
2366 | + Log ${tender_uaid} | ||
2367 | + Log Many ${USERS.users['${username}'].id_map} | ||
2368 | + ${bid}= openprocurement_client.Отримати пропозицію ${username} ${tender_uaid} | ||
2369 | + Log ${bid} | ||
2370 | + ${bid_doc_id}= get_from_object ${bid.data} documents[0].id | ||
2371 | + Log ${bid_doc_id} | ||
2372 | + ${bid_doc_title}= get_from_object ${bid.data} documents[0].title | ||
2373 | + Log ${bid_doc_title} | ||
2374 | + ${contract_response}= Підготувати дані по гарантії виконання контракту ${bid_doc_id} ${bid_doc_title} | ||
2375 | + Run As ${username} Завантажити відповідь на критерій гарантії виконання контракту ${tender_uaid} ${contract_response} | ||
2376 | + | ||
2361 | ############################################################################################## | 2377 | ############################################################################################## |
2362 | # Cancellations | 2378 | # Cancellations |
2363 | ############################################################################################## | 2379 | ############################################################################################## |
@@ -207,6 +207,35 @@ Library Collections | @@ -207,6 +207,35 @@ Library Collections | ||
207 | ${participationUrl}= Get Variable Value ${object_with_url['participationUrl']} | 207 | ${participationUrl}= Get Variable Value ${object_with_url['participationUrl']} |
208 | [Return] ${participationUrl} | 208 | [Return] ${participationUrl} |
209 | 209 | ||
210 | + | ||
211 | +Отримати поточного Переможця тендера | ||
212 | + ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact.yaml | ||
213 | + ${ARTIFACT}= load_data_from ${file_path} | ||
214 | + Log ${ARTIFACT} | ||
215 | + ${provider}= get variable value ${provider_bid_id} ${ARTIFACT.provider_bid_id} | ||
216 | + Log ${provider} | ||
217 | + ${provider1}= get variable value ${provider1_bid_id} ${ARTIFACT.provider1_bid_id} | ||
218 | + Log ${provider1} | ||
219 | + ${provider2}= get variable value ${provider2_bid_id} ${ARTIFACT.provider2_bid_id} | ||
220 | + Log ${provider2} | ||
221 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${tender_owner} ${TENDER['TENDER_UAID']} | ||
222 | + Log ${tender} | ||
223 | + ${award}= Get Variable Value ${USERS.users['${tender_owner}'].tender_data.data.awards[${award_index}]} | ||
224 | + Log ${award} | ||
225 | + ${award.bid_id}= Encode String To Bytes ${award.bid_id} UTF-8 | ||
226 | + Log ${award.bid_id} | ||
227 | + ${status_1}= run keyword and return status Should Be Equal ${provider} ${award.bid_id} | ||
228 | + log ${status_1} | ||
229 | + ${status_2}= run keyword and return status Should Be Equal ${provider1} ${award.bid_id} | ||
230 | + log ${status_2} | ||
231 | + ${status_3}= run keyword and return status Should Be Equal ${provider2} ${award.bid_id} | ||
232 | + log ${status_3} | ||
233 | + ${username}= run keyword if ${status_1} == ${True} set variable Tender_User | ||
234 | + ... ELSE IF ${status_2} == ${True} set variable Tender_User1 | ||
235 | + ... ELSE set variable Tender_User2 | ||
236 | + Log ${username} | ||
237 | + [Return] ${username} | ||
238 | + | ||
210 | ############################################################################## | 239 | ############################################################################## |
211 | # Tender operations | 240 | # Tender operations |
212 | ############################################################################## | 241 | ############################################################################## |
@@ -223,7 +252,7 @@ Library Collections | @@ -223,7 +252,7 @@ Library Collections | ||
223 | 252 | ||
224 | 253 | ||
225 | Створити тендер | 254 | Створити тендер |
226 | - [Arguments] ${username} ${tender_data} ${plan_uaid} | 255 | + [Arguments] ${username} ${tender_data} ${plan_uaid} ${CRITERIA_GUARANTEE}=None |
227 | ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml | 256 | ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml |
228 | ${ARTIFACT}= load_data_from ${file_path} | 257 | ${ARTIFACT}= load_data_from ${file_path} |
229 | Log ${ARTIFACT.tender_owner_access_token} | 258 | Log ${ARTIFACT.tender_owner_access_token} |
@@ -234,6 +263,11 @@ Library Collections | @@ -234,6 +263,11 @@ Library Collections | ||
234 | ... access_token=${ARTIFACT.tender_owner_access_token} | 263 | ... access_token=${ARTIFACT.tender_owner_access_token} |
235 | Log ${tender} | 264 | Log ${tender} |
236 | ${access_token}= Get Variable Value ${tender.access.token} | 265 | ${access_token}= Get Variable Value ${tender.access.token} |
266 | + ${criteria_guarantee_data}= Run keyword If ${CRITERIA_GUARANTEE} == True Підготувати дані по критеріям гарантії | ||
267 | + ${tender_criteria_guarantee}= Run keyword If ${CRITERIA_GUARANTEE} == True Call Method ${USERS.users['${username}'].client} create_criteria | ||
268 | + ... ${tender.data.id} | ||
269 | + ... ${criteria_guarantee_data} | ||
270 | + ... access_token=${tender.access.token} | ||
237 | ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY} | 271 | ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY} |
238 | ${status}= Set Variable If 'below' in '${MODE}' active.enquiries ${status} | 272 | ${status}= Set Variable If 'below' in '${MODE}' active.enquiries ${status} |
239 | ${status}= Set Variable If 'selection' in '${MODE}' draft.pending ${status} | 273 | ${status}= Set Variable If 'selection' in '${MODE}' draft.pending ${status} |
@@ -1908,6 +1942,27 @@ Library Collections | @@ -1908,6 +1942,27 @@ Library Collections | ||
1908 | [return] ${reply} | 1942 | [return] ${reply} |
1909 | 1943 | ||
1910 | 1944 | ||
1945 | +Завантажити відповідь на критерій гарантії виконання контракту | ||
1946 | + [Arguments] ${username} ${tender_uaid} ${contract_response} | ||
1947 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | ||
1948 | + Log ${tender} | ||
1949 | + ${bid}= openprocurement_client.Отримати пропозицію ${username} ${tender_uaid} | ||
1950 | + Log ${bid} | ||
1951 | + ${bid_id}= openprocurement_client.Отримати інформацію із пропозиції ${username} ${tender_uaid} id | ||
1952 | + Log ${bid_id} | ||
1953 | + ${req_id}= get_from_object ${bid.data} requirementResponses[-1].id | ||
1954 | + Log ${req_id} | ||
1955 | + ${token}= Get Variable Value ${USERS.users['${username}'].access_token} | ||
1956 | + Log ${token} | ||
1957 | + ${reply}= Call Method ${USERS.users['${username}'].client} create_bid_criteria_contract_guarantee_response | ||
1958 | + ... ${tender.data.id} | ||
1959 | + ... ${contract_response} | ||
1960 | + ... ${bid_id} | ||
1961 | + ... ${req_id} | ||
1962 | + ... ${token} | ||
1963 | + ${reply}= munch_dict arg=${reply} | ||
1964 | + [Return] ${reply} | ||
1965 | + | ||
1911 | ############################################################################## | 1966 | ############################################################################## |
1912 | # QUALIFICATION | 1967 | # QUALIFICATION |
1913 | ############################################################################## | 1968 | ############################################################################## |
Please
register
or
login
to post a comment