Commit 0b7e6b852a1c931303efa1cb42073b9c13b774b0

Authored by Playtenders
1 parent 60e32952

fix

... ... @@ -709,7 +709,7 @@ Resource playtender_agree
709 709 Змінити статус скарги на визначення пре-кваліфікації учасника
710 710 [Arguments] ${username} ${tender_uaid} ${complaintID} ${qualification_index} ${confirmation_data}
711 711
712   -# amku result ${username} ${tender_uaid} ${complaintID} ${confirmation_data}
  712 + amku result ${username} ${tender_uaid} ${complaintID} ${confirmation_data}
713 713 playtender.Змінити статус скарги ${username} ${tender_uaid} ${complaintID} ${confirmation_data}
714 714
715 715 Змінити статус скарги на визначення переможця
... ... @@ -858,6 +858,7 @@ Resource playtender_agree
858 858 ... в статус active.
859 859
860 860 open tender page by uaid ${tender_uaid}
  861 + Run Keyword If "${TEST_NAME}" == "Неможливість підтвердити постачальника після закінчення періоду кваліфікації" and '${mode}' == 'open_framework' GetTenderContract ${username} ${tender_uaid}
861 862 open tender form qualification ${award_num}
862 863 confirm award qualification ${username} ${award_num}
863 864
... ...
... ... @@ -379,6 +379,7 @@ amku result2
379 379 [Documentation] Виконує ішення АМКУ
380 380 ... потрібно скасувати рішення по оскаржуваній кваліфікації award
381 381
  382 + sleep 600
382 383 open tender page by uaid ${tender_uaid}
383 384 capture page screenshot
384 385 Execute Javascript $('#bids-pjax .pseudo-table__row .badge .badge__inner .badge__text:contains("Кваліфікувати"):first').click()
... ...
... ... @@ -467,16 +467,6 @@ def getTenderDataByTenderUaId(apiBaseUrl, tenderUaId):
467 467 return tenderDataJson
468 468
469 469
470   -# prepares data for filling form in easiest way
471   -def prepare_tender_data_cancellation(data_original):
472   - # preventing change data in global view
473   - data = copy.deepcopy(data_original)
474   - print(data)
475   - b = []
476   - b.append(data['cancellations'])
477   -
478   - return b
479   -
480 470 def getTenderDataByTenderCancellationsUaId(apiBaseUrl, tenderUaId):
481 471 requestData = {"opt_fields": "tenderID", "descending": "1", "mode": "_all_"}
482 472 updatesResponse = doGetRequest(apiBaseUrl.strip("/") + "/tenders", data=requestData)
... ... @@ -592,3 +582,22 @@ def getLastQualificationComplaintDataByTenderUaId(apiBaseUrl, tenderUaId):
592 582 tenderDataJson = tenderDataResponse['json']['data'][0]
593 583 return tenderDataJson
594 584
  585 +def getTenderDataByTenderContractUaId(apiBaseUrl, tenderUaId):
  586 + requestData = {"opt_fields": "tenderID", "descending": "1", "mode": "_all_"}
  587 + updatesResponse = doGetRequest(apiBaseUrl.strip("/") + "/tenders", data=requestData)
  588 + if "json" not in updatesResponse:
  589 + print('json key not found')
  590 + return {}
  591 + tenderId = None
  592 + print("lastTenders:")
  593 + print(updatesResponse['json']['data'])
  594 + for item in updatesResponse['json']['data']:
  595 + if tenderUaId == item['tenderID']:
  596 + tenderId = item['id']
  597 + break
  598 + if tenderId is None:
  599 + return {}
  600 +
  601 + tenderDataResponse = doGetRequest(apiBaseUrl.strip("/") + "/tenders/" + tenderId + "/contracts", data={})
  602 + tenderDataJson = tenderDataResponse['json']['data'][0]
  603 + return tenderDataJson
... ...
... ... @@ -748,14 +748,6 @@ decline tender
748 748 ${tender_с}= op_robot_tests.tests_files.service_keywords.Munchify ${tender_с}
749 749
750 750 Log ${tender_с}
751   -# ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation
752   -## ${reply}= prepare tender data cancellation ${tender}
753   -# ${reply}= Call Method ${USERS.users['${username}']} patch_cancellation
754   -# ... ${tender.data.id}
755   -# ... ${data}
756   -# ... ${data.data.id}
757   -# ... access_token=${tender.access.token}
758   -# Log ${reply}
759 751 [Return] ${tender_с}
760 752
761 753 Отримати тендер по внутрішньому ідентифікатору
... ... @@ -768,6 +760,19 @@ decline tender
768 760 [return] ${tender}
769 761
770 762
  763 +GetTenderContract ${username} ${tender_uaid}
  764 + [Arguments] ${username} ${tender_uaid}
  765 + [Documentation]
  766 + ... Username, tender uaid
  767 +
  768 + ${contract}= getTenderDataByTenderContractUaId ${API_HOST_URL}/api/${API_VERSION} ${tender_uaid}
  769 + ${contract}= op_robot_tests.tests_files.service_keywords.Munchify ${contract}
  770 +
  771 + Log ${contract}
  772 +# Set To Dictionary ${USERS.users['${tender_owner}']} agreement_data=${contract}
  773 + Set To Dictionary ${USERS.users['${username}']} agreement_data=${contract}
  774 + log ${USERS.users['${username}'].agreement_data}
  775 +
771 776 decline lot
772 777 [Arguments] ${username} ${tender_uaid} ${lot_id} ${cancellation_reason} ${cancellation_reasonType} ${doc_name} ${cancellation_data}
773 778 [Documentation] Скасувати закупівлю
... ...
Please register or login to post a comment