Commit 9f60a2abd52fd532c71e0bf4208b2dc33feffa78
Committed by
GitHub
Merge pull request #104 from ProzorroUKR/update_entity_data
update_data_procuringEntities
Showing
3 changed files
with
79 additions
and
6 deletions
| @@ -350,7 +350,7 @@ def test_feature_data(): | @@ -350,7 +350,7 @@ def test_feature_data(): | ||
| 350 | def test_question_data(): | 350 | def test_question_data(): |
| 351 | return munchify({ | 351 | return munchify({ |
| 352 | "data": { | 352 | "data": { |
| 353 | - "author": fake.procuringEntity(), | 353 | + "author": fake.procuringTenderer(), |
| 354 | "description": fake.description(), | 354 | "description": fake.description(), |
| 355 | "title": field_with_id("q", fake.title()) | 355 | "title": field_with_id("q", fake.title()) |
| 356 | } | 356 | } |
| @@ -373,7 +373,7 @@ def test_question_answer_data(): | @@ -373,7 +373,7 @@ def test_question_answer_data(): | ||
| 373 | def test_complaint_data(): | 373 | def test_complaint_data(): |
| 374 | data = munchify({ | 374 | data = munchify({ |
| 375 | "data": { | 375 | "data": { |
| 376 | - "author": fake.procuringEntity(), | 376 | + "author": fake.procuringTenderer(), |
| 377 | "description": fake.description(), | 377 | "description": fake.description(), |
| 378 | "title": fake.title() | 378 | "title": fake.title() |
| 379 | } | 379 | } |
| @@ -425,7 +425,7 @@ def test_bid_competitive_data(): | @@ -425,7 +425,7 @@ def test_bid_competitive_data(): | ||
| 425 | bid = munchify({ | 425 | bid = munchify({ |
| 426 | "data": { | 426 | "data": { |
| 427 | "tenderers": [ | 427 | "tenderers": [ |
| 428 | - fake.procuringEntity() | 428 | + fake.procuringTenderer() |
| 429 | ] | 429 | ] |
| 430 | } | 430 | } |
| 431 | }) | 431 | }) |
| @@ -452,7 +452,7 @@ def test_bid_data(): | @@ -452,7 +452,7 @@ def test_bid_data(): | ||
| 452 | bid = munchify({ | 452 | bid = munchify({ |
| 453 | "data": { | 453 | "data": { |
| 454 | "tenderers": [ | 454 | "tenderers": [ |
| 455 | - fake.procuringEntity() | 455 | + fake.procuringTenderer() |
| 456 | ] | 456 | ] |
| 457 | } | 457 | } |
| 458 | }) | 458 | }) |
| @@ -30,6 +30,7 @@ class OP_Provider(BaseProvider): | @@ -30,6 +30,7 @@ class OP_Provider(BaseProvider): | ||
| 30 | items_base_data = _fake_data.items_base_data | 30 | items_base_data = _fake_data.items_base_data |
| 31 | rationale_types = _fake_data.rationale_types | 31 | rationale_types = _fake_data.rationale_types |
| 32 | title_of_milestones = _fake_data.title_of_milestones | 32 | title_of_milestones = _fake_data.title_of_milestones |
| 33 | + procuringTenderers = _fake_data.procuringTenderers | ||
| 33 | 34 | ||
| 34 | @classmethod | 35 | @classmethod |
| 35 | def randomize_nb_elements(self, number=10, le=60, ge=140): | 36 | def randomize_nb_elements(self, number=10, le=60, ge=140): |
| @@ -95,6 +96,10 @@ class OP_Provider(BaseProvider): | @@ -95,6 +96,10 @@ class OP_Provider(BaseProvider): | ||
| 95 | return deepcopy(self.random_element(self.procuringEntities)) | 96 | return deepcopy(self.random_element(self.procuringEntities)) |
| 96 | 97 | ||
| 97 | @classmethod | 98 | @classmethod |
| 99 | + def procuringTenderer(self): | ||
| 100 | + return deepcopy(self.random_element(self.procuringTenderers)) | ||
| 101 | + | ||
| 102 | + @classmethod | ||
| 98 | def funders_data(self): | 103 | def funders_data(self): |
| 99 | return self.random_element(self.funders) | 104 | return self.random_element(self.funders) |
| 100 | 105 |
| @@ -723,13 +723,15 @@ | @@ -723,13 +723,15 @@ | ||
| 723 | "region": "місто Київ", | 723 | "region": "місто Київ", |
| 724 | "locality": "Київ" | 724 | "locality": "Київ" |
| 725 | } | 725 | } |
| 726 | - }, | 726 | + } |
| 727 | + ], | ||
| 728 | + "procuringTenderers": [ | ||
| 727 | { | 729 | { |
| 728 | "contactPoint": { | 730 | "contactPoint": { |
| 729 | "url": "http://www.page.gov.ua/", | 731 | "url": "http://www.page.gov.ua/", |
| 730 | "telephone": "6665544", | 732 | "telephone": "6665544", |
| 731 | "email": "test_e_mail@ukr.net", | 733 | "email": "test_e_mail@ukr.net", |
| 732 | - "name": "Тезтовий Замовник 3", | 734 | + "name": "Тестовий Учасник 1", |
| 733 | "faxNumber": "9998877" | 735 | "faxNumber": "9998877" |
| 734 | }, | 736 | }, |
| 735 | "identifier": { | 737 | "identifier": { |
| @@ -745,6 +747,72 @@ | @@ -745,6 +747,72 @@ | ||
| 745 | "region": "Київська область", | 747 | "region": "Київська область", |
| 746 | "locality": "Переяслав-Хмельницький" | 748 | "locality": "Переяслав-Хмельницький" |
| 747 | } | 749 | } |
| 750 | + }, | ||
| 751 | + { | ||
| 752 | + "contactPoint": { | ||
| 753 | + "url": "http://www.page.gov.ua/", | ||
| 754 | + "telephone": "6665544", | ||
| 755 | + "email": "test_e_mail@ukr.net", | ||
| 756 | + "name": "ТЕСТ ФОП 1", | ||
| 757 | + "faxNumber": "9998877" | ||
| 758 | + }, | ||
| 759 | + "identifier": { | ||
| 760 | + "scheme": "UA-EDR", | ||
| 761 | + "id": "2833906462", | ||
| 762 | + "legalName": "Тестовий ФОП 1" | ||
| 763 | + }, | ||
| 764 | + "name": "Тестовий ФОП 1", | ||
| 765 | + "address": { | ||
| 766 | + "postalCode": "01111", | ||
| 767 | + "countryName": "Україна", | ||
| 768 | + "streetAddress": "Тестова вулиця, 21-29", | ||
| 769 | + "region": "Київська область", | ||
| 770 | + "locality": "Переяслав-Хмельницький" | ||
| 771 | + } | ||
| 772 | + }, | ||
| 773 | + { | ||
| 774 | + "contactPoint": { | ||
| 775 | + "url": "http://webpage.com.ua", | ||
| 776 | + "telephone": "2223344", | ||
| 777 | + "email": "e_mail_test@ukr.net", | ||
| 778 | + "name": "ТЕСТ ФОП 2", | ||
| 779 | + "faxNumber": "333-44-55" | ||
| 780 | + }, | ||
| 781 | + "identifier": { | ||
| 782 | + "scheme": "UA-EDR", | ||
| 783 | + "id": "2894905868", | ||
| 784 | + "legalName": "Тестовий ФОП 2" | ||
| 785 | + }, | ||
| 786 | + "name": "Тестовий ФОП 2", | ||
| 787 | + "address": { | ||
| 788 | + "postalCode": "04444", | ||
| 789 | + "countryName": "Україна", | ||
| 790 | + "streetAddress": "вулиця Тестова, 32", | ||
| 791 | + "region": "місто Київ", | ||
| 792 | + "locality": "Київ" | ||
| 793 | + } | ||
| 794 | + }, | ||
| 795 | + { | ||
| 796 | + "contactPoint": { | ||
| 797 | + "url": "http://webpage.org.ua/", | ||
| 798 | + "telephone": "0881112233", | ||
| 799 | + "email": "e_mail_test@bigmir.net", | ||
| 800 | + "name": "ТЕСТ ФОП 3", | ||
| 801 | + "faxNumber": "088-111-22-33" | ||
| 802 | + }, | ||
| 803 | + "identifier": { | ||
| 804 | + "scheme": "UA-EDR", | ||
| 805 | + "id": "2854913619", | ||
| 806 | + "legalName": "Тестовий ФОП 3" | ||
| 807 | + }, | ||
| 808 | + "name": "Тестовий ФОП 3", | ||
| 809 | + "address": { | ||
| 810 | + "postalCode": "01111", | ||
| 811 | + "countryName": "Україна", | ||
| 812 | + "streetAddress": "вулиця Тестова, 220, 8", | ||
| 813 | + "region": "місто Київ", | ||
| 814 | + "locality": "Київ" | ||
| 815 | + } | ||
| 748 | } | 816 | } |
| 749 | ], | 817 | ], |
| 750 | "addresses": [ | 818 | "addresses": [ |
Please
register
or
login
to post a comment