Commit 45e16fd91dafbae0d9cf472617bacebb5c6451d8
1 parent
5c954d95
Upd work with features and lots ids in create bid
Showing
2 changed files
with
13 additions
and
3 deletions
@@ -610,8 +610,14 @@ Resource resource.robot | @@ -610,8 +610,14 @@ Resource resource.robot | ||
610 | ${bid}= Підготувати дані для подання пропозиції ${username} | 610 | ${bid}= Підготувати дані для подання пропозиції ${username} |
611 | ${bidresponses}= Create Dictionary bid=${bid} | 611 | ${bidresponses}= Create Dictionary bid=${bid} |
612 | Set To Dictionary ${USERS.users['${username}']} bidresponses=${bidresponses} | 612 | Set To Dictionary ${USERS.users['${username}']} bidresponses=${bidresponses} |
613 | - ${lots_ids}= Отримати ідентифікатори об’єктів ${username} lots | ||
614 | - ${features_ids}= Отримати ідентифікатори об’єктів ${username} features | 613 | + ${lots}= Get Variable Value ${USERS.users['${username}'].tender_data.data.lots} ${None} |
614 | + ${lots_ids}= Run Keyword IF ${lots} | ||
615 | + ... Отримати ідентифікатори об’єктів ${username} lots | ||
616 | + ... ELSE Set Variable ${None} | ||
617 | + ${features}= Get Variable Value ${USERS.users['${username}'].tender_data.data.features} ${None} | ||
618 | + ${features_ids}= Run Keyword IF ${features} | ||
619 | + ... Отримати ідентифікатори об’єктів ${username} features | ||
620 | + ... ELSE Set Variable ${None} | ||
615 | ${resp}= Run As ${username} Подати цінову пропозицію ${TENDER['TENDER_UAID']} ${bid} ${lots_ids} ${features_ids} | 621 | ${resp}= Run As ${username} Подати цінову пропозицію ${TENDER['TENDER_UAID']} ${bid} ${lots_ids} ${features_ids} |
616 | Set To Dictionary ${USERS.users['${username}'].bidresponses} resp=${resp} | 622 | Set To Dictionary ${USERS.users['${username}'].bidresponses} resp=${resp} |
617 | 623 |
@@ -624,12 +624,16 @@ Library openprocurement_client_helper.py | @@ -624,12 +624,16 @@ Library openprocurement_client_helper.py | ||
624 | ############################################################################## | 624 | ############################################################################## |
625 | 625 | ||
626 | Подати цінову пропозицію | 626 | Подати цінову пропозицію |
627 | - [Arguments] ${username} ${tender_uaid} ${bid} ${lots_ids}=${empty_list} ${features_ids}=${empty_list} | 627 | + [Arguments] ${username} ${tender_uaid} ${bid} ${lots_ids}=${None} ${features_ids}=${None} |
628 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | 628 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
629 | + ${lots_ids}= Run Keyword IF ${lots_ids} Set Variable ${lots_ids} | ||
630 | + ... ELSE Create List | ||
629 | : FOR ${index} ${lot_id} IN ENUMERATE @{lots_ids} | 631 | : FOR ${index} ${lot_id} IN ENUMERATE @{lots_ids} |
630 | \ ${lot_index}= get_object_index_by_id ${tender.data.lots} ${lot_id} | 632 | \ ${lot_index}= get_object_index_by_id ${tender.data.lots} ${lot_id} |
631 | \ ${lot_id}= Get Variable Value ${tender.data.lots[${lot_index}].id} | 633 | \ ${lot_id}= Get Variable Value ${tender.data.lots[${lot_index}].id} |
632 | \ Set To Dictionary ${bid.data.lotValues[${index}]} relatedLot=${lot_id} | 634 | \ Set To Dictionary ${bid.data.lotValues[${index}]} relatedLot=${lot_id} |
635 | + ${features_ids}= Run Keyword IF ${features_ids} Set Variable ${features_ids} | ||
636 | + ... ELSE Create List | ||
633 | : FOR ${index} ${feature_id} IN ENUMERATE @{features_ids} | 637 | : FOR ${index} ${feature_id} IN ENUMERATE @{features_ids} |
634 | \ ${feature_index}= get_object_index_by_id ${tender.data.features} ${feature_id} | 638 | \ ${feature_index}= get_object_index_by_id ${tender.data.features} ${feature_id} |
635 | \ ${code}= Get Variable Value ${tender.data.features[${feature_index}].code} | 639 | \ ${code}= Get Variable Value ${tender.data.features[${feature_index}].code} |
Please
register
or
login
to post a comment