Skip to content

Complaints search #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
annawzz wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Complaints search #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a2ab48
Add function to get complaint index by title
annawzz Jan 12, 2017
c886041
Change search mechanism for complaints
annawzz Jan 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions op_robot_tests/tests_files/base_keywords.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... cancelled


Expand All @@ -651,7 +651,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... cancelled


Expand All @@ -677,7 +677,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... ${status}
... ${award_index}

Expand All @@ -700,7 +700,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... pending


Expand All @@ -722,7 +722,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... pending


Expand All @@ -745,7 +745,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data'][['claim']['data']['title']}
... pending
... ${award_index}

Expand All @@ -756,7 +756,7 @@ Resource resource.robot
... ${TENDER['TENDER_UAID']}
... ${data}
... ${field}
... ${USERS.users['${provider}'].claim_data['complaintID']}
... ${USERS.users['${provider}'].claim_data['claim']['data']['title']}


Звірити відображення поля ${field} вимоги про виправлення визначення ${award_index} переможця із ${data} для користувача ${username}
Expand All @@ -765,7 +765,7 @@ Resource resource.robot
... ${TENDER['TENDER_UAID']}
... ${data}
... ${field}
... ${USERS.users['${provider}'].claim_data['complaintID']}
... ${USERS.users['${provider}'].claim_data['claim']['data']['title']}
... ${award_index}


Expand All @@ -786,7 +786,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... answered


Expand All @@ -807,7 +807,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... answered


Expand All @@ -829,7 +829,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... answered
... ${award_index}

Expand All @@ -852,7 +852,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... resolved


Expand All @@ -874,7 +874,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... resolved


Expand All @@ -897,7 +897,7 @@ Resource resource.robot
... Звірити статус вимоги/скарги
... ${provider}
... ${TENDER['TENDER_UAID']}
... ${USERS.users['${provider}']['claim_data']['complaintID']}
... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']}
... resolved
... ${award_index}

Expand Down
4 changes: 2 additions & 2 deletions op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,10 +668,10 @@ Library openprocurement_client_helper.py


Отримати інформацію із скарги
[Arguments] ${username} ${tender_uaid} ${complaintID} ${field_name} ${award_index}=${None}
[Arguments] ${username} ${tender_uaid} ${complaintTitle} ${field_name} ${award_index}=${None}
openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
${complaints}= Get Variable Value ${USERS.users['${username}'].tender_data.data.awards[${award_index}].complaints} ${USERS.users['${username}'].tender_data.data.complaints}
${complaint_index}= get_complaint_index_by_complaintID ${complaints} ${complaintID}
${complaint_index}= get_complaint_index_by_complaintTitle ${complaints} ${complaintTitle}
${field_value}= Get Variable Value ${complaints[${complaint_index}]['${field_name}']}
[Return] ${field_value}

Expand Down
8 changes: 4 additions & 4 deletions op_robot_tests/tests_files/keywords.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,8 @@ Log differences between dicts


Звірити поле скарги із значенням
[Arguments] ${username} ${tender_uaid} ${given_value} ${field_name} ${complaintID} ${award_index}=${None}
${received_value}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintID} ${field_name} ${award_index}
[Arguments] ${username} ${tender_uaid} ${given_value} ${field_name} ${complaintTitle} ${award_index}=${None}
${received_value}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintTitle} ${field_name} ${award_index}
Порівняти об'єкти ${given_value} ${received_value}


Expand Down Expand Up @@ -632,8 +632,8 @@ Require Failure


Звірити статус вимоги/скарги
[Arguments] ${username} ${tender_uaid} ${complaintID} ${left} ${award_index}=${None}
${right}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintID} status ${award_index}
[Arguments] ${username} ${tender_uaid} ${complaintTitle} ${left} ${award_index}=${None}
${right}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintTitle} status ${award_index}
Порівняти об'єкти ${left} ${right}


Expand Down
12 changes: 12 additions & 0 deletions op_robot_tests/tests_files/service_keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,18 @@ def get_complaint_index_by_complaintID(data, complaintID):
return index



def get_complaint_index_by_complaintTitle(data, complaintTitle):
if not data:
return 0
for index, element in enumerate(data):
if element.get('title', '') == complaintTitle:
break
else:
index += 1
return index


def generate_test_bid_data(tender_data):
bid = test_bid_data()
if tender_data.get('procurementMethodType', '')[:-2] in ('aboveThreshold', 'competitiveDialogue'):
Expand Down