Skip to content

Add cavs and cpvs with no item.address field validation #768

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
OrysiaDrabych wants to merge 1 commit into
base: eauction_cdb2
Choose a base branch
from
Open

Add cavs and cpvs with no item.address field validation #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 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 @@ -15,6 +15,7 @@ Resource resource.robot
... item_meat=${${ITEM_MEAT}}
... api_host_url=${API_HOST_URL}
... minNumberOfQualifiedBids=${minNumberOfQualifiedBids}
... item_address=${${ITEM_ADDRESS}}
${DIALOGUE_TYPE}= Get Variable Value ${DIALOGUE_TYPE}
Run keyword if '${DIALOGUE_TYPE}' != '${None}' Set to dictionary ${tender_parameters} dialogue_type=${DIALOGUE_TYPE}
${tender_data}= Підготувати дані для створення тендера ${tender_parameters}
Expand Down
7 changes: 5 additions & 2 deletions op_robot_tests/tests_files/initial_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,10 @@ def test_tender_data_dgf_other(params):
data["procuringEntity"] = fake.procuringEntity_other()

for i in range(params['number_of_items']):
scheme_group_other = fake.scheme_other()[:4]
new_item = test_item_data(scheme_group_other)
if params.get('item_address'):
scheme_group = fake.scheme_other()[:4]
else:
scheme_group = fake.scheme_no_validation()[:4]
new_item = test_item_data(scheme_group)
data['items'].append(new_item)
return data
17 changes: 13 additions & 4 deletions op_robot_tests/tests_files/op_faker/op_faker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class OP_Provider(BaseProvider):
addresses = __fake_data.addresses
classifications_other = __fake_data.classifications_other
schemes_other = __fake_data.schemes_other
schemes_no_validation = __fake_data.schemes_no_validation
items_base_data_other = __fake_data.items_base_data_other
additionalIdentifiers = __fake_data.additionalIdentifiers

Expand Down Expand Up @@ -105,6 +106,10 @@ def procuringEntity_other(self):
def scheme_other(self):
return self.random_element(self.schemes_other)

@classmethod
def scheme_no_validation(self):
return self.random_element(self.schemes_no_validation)

@classmethod
def additionalIdentifier(self):
return self.random_element(self.additionalIdentifiers)
Expand Down Expand Up @@ -135,16 +140,20 @@ def fake_item(self, scheme_group):
classification = entity
break

address = self.random_element(self.addresses)
item = {
"description": item_base_data["description"],
"description_ru": item_base_data["description_ru"],
"description_en": item_base_data["description_en"],
"classification": classification["classification"],
"additionalClassifications": classification["additionalClassifications"],
"address": address["deliveryAddress"],
"deliveryLocation": address["deliveryLocation"],
"unit": item_base_data["unit"],
"quantity": self.randomize_nb_elements(number=item_base_data["quantity"], le=80, ge=120)
}
return deepcopy(item)

if classification["classification"]["id"] not in self.schemes_no_validation:
address = self.random_element(self.addresses)
item.update({
"address": address["deliveryAddress"]
})

return deepcopy(item)
148 changes: 140 additions & 8 deletions op_robot_tests/tests_files/op_faker/op_faker_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3053,15 +3053,85 @@
"additionalClassifications": [
{
"scheme": "CPVS",
"id": "PA01-7",
"description": "Оренда"
"id": "RB07-8",
"description": "У сфері міжнародної економіки"
}
],
"classification": {
"scheme": "CPV",
"id": "98910000-5",
"description": "Послуги міжнародних організацій та органів"
}
},
{
"additionalClassifications": [
{
"scheme": "CPVS",
"id": "FG22-5",
"description": "Для косметичних цілей"
}
],
"classification": {
"scheme": "CPV",
"id": "98322110-0",
"description": "Косметичні послуги"
}
},
{
"additionalClassifications": [
{
"scheme": "CPVS",
"id": "SB01-1",
"description": "Для страхування"
}
],
"classification": {
"scheme": "CPV",
"id": "66512220-0",
"description": "Послуги з медичного страхування"
}
},
{
"additionalClassifications": [
{
"scheme": "CPVS",
"id": "SA01-0",
"description": "Для банківської діяльності"
}
],
"classification": {
"scheme": "CPV",
"id": "66112000-8",
"description": "Депозитні послуги"
}
},
{
"additionalClassifications": [
{
"scheme": "CPVS",
"id": "SA01-0",
"description": "Для банківської діяльності"
}
],
"classification": {
"scheme": "CAV-PS",
"id": "07120000-6",
"description": "Кредити Юридичних осіб заставні"
}
},
{
"additionalClassifications": [
{
"scheme": "CPVS",
"id": "SA01-0",
"description": "Для банківської діяльності"
}
],
"classification": {
"scheme": "CAV-PS",
"id": "07220000-7",
"description": "Кредити Фізичних осіб заставні"
}
}
],
"units": [
Expand Down Expand Up @@ -3154,11 +3224,18 @@
"30111000-0",
"34110000-1",
"39710000-2",
"16720000-8",
"98910000-5"
"16720000-8"
],
"schemes_no_validation": [
"98910000-5",
"98322110-0",
"66512220-0",
"66112000-8",
"07120000-6",
"07220000-7"
],
"items_base_data_other": [
{
{
"scheme_id": "05110000-9",
"description": "Молокозаводи",
"description_ru": "Молокозаводы",
Expand Down Expand Up @@ -3224,7 +3301,7 @@
"name": "штуки"
}
},
{
{
"scheme_id": "34110000-1",
"description": "Легкові автомобілі",
"description_ru": "Легковые автомобили",
Expand All @@ -3235,7 +3312,7 @@
"name": "штуки"
}
},
{
{
"scheme_id": "39710000-2",
"description": "Електричні побутові прилади",
"description_ru": "Электрические бытовые приборы",
Expand All @@ -3246,7 +3323,7 @@
"name": "штуки"
}
},
{
{
"scheme_id": "16720000-8",
"description": "Трактори, що були у використанні",
"description_ru": "Тракторы бывшие в употреблении",
Expand All @@ -3256,6 +3333,61 @@
"code": "H87",
"name": "штуки"
}
},
{
"scheme_id": "98322110-0",
"description": "Косметичні послуги",
"description_ru": "Косметические услуги",
"description_en": "Cosmetic services",
"quantity": 5,
"unit": {
"code": "H87",
"name": "штуки"
}
},
{
"scheme_id": "66512220-0",
"description": "Послуги з медичного страхування",
"description_ru": "Услуги по медицинскому страхованию",
"description_en": "Medical insurance services",
"quantity": 5,
"unit": {
"code": "H87",
"name": "штуки"
}
},
{
"scheme_id": "66112000-8",
"description": "Депозитні послуги",
"description_ru": "Депозитные услуги",
"description_en": "Deposit services",
"quantity": 5,
"unit": {
"code": "H87",
"name": "штуки"
}
},
{
"scheme_id": "07120000-6",
"description": "Кредити Юридичних осіб заставні",
"description_ru": "Кредиты Юридических лиц закладные",
"description_en": "Legal entities mortgages",
"quantity": 5,
"unit": {
"code": "H87",
"name": "штуки"
}
},
{
"scheme_id": "07220000-7",
"description": "Кредити Фізичних осіб заставні",
"description_ru": "Кредиты Физических лиц закладные",
"description_en": "Mortgages of private individuals",
"quantity": 5,
"unit": {
"code": "H87",
"name": "штуки"
}
}
]
}
1 change: 1 addition & 0 deletions op_robot_tests/tests_files/openProcedure.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ${NUMBER_OF_ITEMS} ${1}
${TENDER_MEAT} ${True}
${LOT_MEAT} ${True}
${ITEM_MEAT} ${True}
${ITEM_ADDRESS} ${True}


*** Test Cases ***
Expand Down
2 changes: 2 additions & 0 deletions robot_tests_arguments/dgf_other_tender_cancellation.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

-v minNumberOfQualifiedBids:2

-v ITEM_ADDRESS: False

-v NUMBER_OF_ITEMS:1

-i create_tender
Expand Down