Skip to content

Commit

Permalink
Merge branch 'a258001251842882_refactoring'
Browse files Browse the repository at this point in the history
  • Loading branch information
vmaksymiv committed Sep 12, 2017
2 parents acb70e3 + a50885b commit 3dc9299
Show file tree
Hide file tree
Showing 133 changed files with 8,403 additions and 13,136 deletions.
6 changes: 4 additions & 2 deletions buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ newest = false
parts = test
develop = .
extensions = mr.developer
auto-checkout = openprocurement.api
auto-checkout = openprocurement.api openprocurement.tender.core openprocurement.tender.belowthreshold
find-links = http://op:x9W3jZ@dist.quintagroup.com/op/

[sources]
openprocurement.api = git https://github.com/openprocurement/openprocurement.api.git
openprocurement.api = git https://github.com/openprocurement/openprocurement.api.git branch=a258001251842882_refactoring
openprocurement.tender.core = git https://github.com/openprocurement/openprocurement.tender.core.git branch=master
openprocurement.tender.belowthreshold = git https://github.com/openprocurement/openprocurement.tender.belowthreshold.git branch=master

[test]
recipe = zc.recipe.egg:scripts
Expand Down
2 changes: 1 addition & 1 deletion docs/source/tutorial/activate-bidder.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/2.3/tenders/d5f01806d85143458795cbd133b0e667/bids/b94deeb4edae4cdb8e6571b1b455abfb?acc_token=cf643c97d1f84f4487a651ad8d5e11da HTTP/1.0
PATCH /api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/bids/f489e65e56b646f4a5948df764a5a2f7?acc_token=dc58fc5e3b344a5db77a71f006efff76 HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 30
Content-Type: application/json
Expand Down
22 changes: 11 additions & 11 deletions docs/source/tutorial/active-cancellation.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/2.3/tenders/d5f01806d85143458795cbd133b0e667/cancellations/87abd9e46bc14a34858fa1ccc1071006?acc_token=f945406a1ac44cff8f49754d54f658fa HTTP/1.0
PATCH /api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/cancellations/76718472024b4f2ca5de2893c07cd7b2?acc_token=4da34917776743398aa0bb0b7a639d70 HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 30
Content-Type: application/json
Expand All @@ -19,29 +19,29 @@ Content-Type: application/json; charset=UTF-8
{
"description": "Changed description",
"title": "Notice.pdf",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/d5f01806d85143458795cbd133b0e667/cancellations/87abd9e46bc14a34858fa1ccc1071006/documents/6b30ada17f704b2cb64a3792d99c8b2d?download=e3afa4897ade4ee1882b58374d737500",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/cancellations/76718472024b4f2ca5de2893c07cd7b2/documents/6009105ed2a04ad6a38ddb0a76854ef9?download=f78f4064cd6a46dbb7e02fbbaa170ae5",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2017-06-24T18:20:59.825782+03:00",
"id": "6b30ada17f704b2cb64a3792d99c8b2d",
"dateModified": "2017-06-24T18:20:59.825838+03:00"
"datePublished": "2017-06-21T15:53:24.144949+03:00",
"id": "6009105ed2a04ad6a38ddb0a76854ef9",
"dateModified": "2017-06-21T15:53:24.145023+03:00"
},
{
"description": "Changed description",
"title": "Notice-2.pdf",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/d5f01806d85143458795cbd133b0e667/cancellations/87abd9e46bc14a34858fa1ccc1071006/documents/6b30ada17f704b2cb64a3792d99c8b2d?download=802e095b60844994b4469c535cf1e7ca",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/cancellations/76718472024b4f2ca5de2893c07cd7b2/documents/6009105ed2a04ad6a38ddb0a76854ef9?download=55931e2acaac419484e7fc8070aa385c",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2017-06-24T18:20:59.825782+03:00",
"id": "6b30ada17f704b2cb64a3792d99c8b2d",
"dateModified": "2017-06-24T18:21:00.317750+03:00"
"datePublished": "2017-06-21T15:53:24.144949+03:00",
"id": "6009105ed2a04ad6a38ddb0a76854ef9",
"dateModified": "2017-06-21T15:53:24.522331+03:00"
}
],
"reason": "cancellation reason",
"reasonType": "unsuccessful",
"date": "2017-06-24T18:21:00.505993+03:00",
"date": "2017-06-21T15:53:24.721063+03:00",
"cancellationOf": "tender",
"id": "87abd9e46bc14a34858fa1ccc1071006"
"id": "76718472024b4f2ca5de2893c07cd7b2"
}
}

8 changes: 4 additions & 4 deletions docs/source/tutorial/answer-question.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/2.3/tenders/d5f01806d85143458795cbd133b0e667/questions/c616c4905e7d481da326b4de16c00df4?acc_token=f945406a1ac44cff8f49754d54f658fa HTTP/1.0
PATCH /api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/questions/d490583bca4b41d68e36b2b53a5f4caf?acc_token=4da34917776743398aa0bb0b7a639d70 HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 162
Content-Type: application/json
Expand All @@ -15,11 +15,11 @@ Content-Type: application/json; charset=UTF-8
{
"data": {
"description": "Просимо додати таблицю потрібної калорійності харчування",
"dateAnswered": "2017-06-24T18:20:56.627386+03:00",
"dateAnswered": "2017-06-21T15:53:20.818993+03:00",
"title": "Калорійність",
"date": "2017-06-24T18:20:56.553152+03:00",
"date": "2017-06-21T15:53:20.738523+03:00",
"answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"",
"id": "c616c4905e7d481da326b4de16c00df4",
"id": "d490583bca4b41d68e36b2b53a5f4caf",
"questionOf": "tender"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
POST /api/2.3/tenders/d5f01806d85143458795cbd133b0e667/questions HTTP/1.0
POST /api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/questions HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 1506
Content-Type: application/json
Expand Down
8 changes: 4 additions & 4 deletions docs/source/tutorial/ask-question.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
POST /api/2.3/tenders/d5f01806d85143458795cbd133b0e667/questions HTTP/1.0
POST /api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/questions HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 1506
Content-Type: application/json
Expand Down Expand Up @@ -34,7 +34,7 @@ DATA:

Response: 201 Created
Content-Type: application/json; charset=UTF-8
Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/d5f01806d85143458795cbd133b0e667/questions/c616c4905e7d481da326b4de16c00df4
Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/questions/d490583bca4b41d68e36b2b53a5f4caf
{
"data": {
"description": "Просимо додати таблицю потрібної калорійності харчування",
Expand All @@ -60,8 +60,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/d5f01806d851434
}
},
"title": "Калорійність",
"date": "2017-06-24T18:20:56.553152+03:00",
"id": "c616c4905e7d481da326b4de16c00df4",
"date": "2017-06-21T15:53:20.738523+03:00",
"id": "d490583bca4b41d68e36b2b53a5f4caf",
"questionOf": "tender"
}
}
Expand Down
70 changes: 35 additions & 35 deletions docs/source/tutorial/auction-url.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET /api/2.3/tenders/d5f01806d85143458795cbd133b0e667 HTTP/1.0
GET /api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9 HTTP/1.0
Authorization: Basic YnJva2VyOg==
Host: api-sandbox.openprocurement.org

Expand All @@ -8,18 +8,18 @@ Content-Type: application/json; charset=UTF-8
"data": {
"procurementMethod": "open",
"complaintPeriod": {
"startDate": "2017-06-08T18:20:40.437462+03:00",
"endDate": "2017-06-20T00:00:00+03:00"
"startDate": "2017-06-05T15:53:05.318541+03:00",
"endDate": "2017-06-17T00:00:00+03:00"
},
"auctionUrl": "http://auction-sandbox.openprocurement.org/tenders/d5f01806d85143458795cbd133b0e667",
"auctionUrl": "http://auction-sandbox.openprocurement.org/tenders/97dd0ca9a0f741a6ad5628c6873d1de9",
"enquiryPeriod": {
"startDate": "2017-06-08T18:20:40.437462+03:00",
"clarificationsUntil": "2017-06-19T18:20:40.437462+03:00",
"endDate": "2017-06-14T18:20:40.437462+03:00",
"invalidationDate": "2017-06-24T18:20:57.456760+03:00"
"startDate": "2017-06-05T15:53:05.318541+03:00",
"clarificationsUntil": "2017-06-15T00:00:00+03:00",
"endDate": "2017-06-11T15:53:05.318541+03:00",
"invalidationDate": "2017-06-21T15:53:21.710428+03:00"
},
"submissionMethod": "electronicAuction",
"next_check": "2017-06-24T18:56:40.437462+03:00",
"next_check": "2017-06-21T16:29:05.318541+03:00",
"procuringEntity": {
"contactPoint": {
"url": "http://sch10.edu.vn.ua/",
Expand All @@ -44,16 +44,16 @@ Content-Type: application/json; charset=UTF-8
"questions": [
{
"description": "Просимо додати таблицю потрібної калорійності харчування",
"dateAnswered": "2017-06-24T18:20:56.627386+03:00",
"dateAnswered": "2017-06-21T15:53:20.818993+03:00",
"title": "Калорійність",
"date": "2017-06-24T18:20:56.553152+03:00",
"date": "2017-06-21T15:53:20.738523+03:00",
"answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"",
"id": "c616c4905e7d481da326b4de16c00df4",
"id": "d490583bca4b41d68e36b2b53a5f4caf",
"questionOf": "tender"
}
],
"owner": "broker",
"id": "d5f01806d85143458795cbd133b0e667",
"id": "97dd0ca9a0f741a6ad5628c6873d1de9",
"guarantee": {
"currency": "USD",
"amount": 8.0
Expand All @@ -62,48 +62,48 @@ Content-Type: application/json; charset=UTF-8
{
"author": "tender_owner",
"title": "Notice.pdf",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/d5f01806d85143458795cbd133b0e667/documents/05f740324f484460a3c678e5d81e3753?download=c7e31ec7c94e4b6d975d70a1058c4822",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/documents/834ae499148f4eb7996d8db7dcd8fd14?download=6f58464f57364eff809716a21346d568",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2017-06-24T18:20:56.275293+03:00",
"id": "05f740324f484460a3c678e5d81e3753",
"dateModified": "2017-06-24T18:20:56.275330+03:00"
"datePublished": "2017-06-21T15:53:20.439891+03:00",
"id": "834ae499148f4eb7996d8db7dcd8fd14",
"dateModified": "2017-06-21T15:53:20.439925+03:00"
},
{
"author": "tender_owner",
"title": "AwardCriteria.pdf",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/d5f01806d85143458795cbd133b0e667/documents/fe214e2fd06d4917a4998f35ef96a2fd?download=04b3c246ca794b67b3d15e721f8639d7",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/documents/8eb8c964d53342919cf982b74ce28eee?download=1b5689bd04d94e68813052edcc6e9eaa",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2017-06-24T18:20:56.366320+03:00",
"id": "fe214e2fd06d4917a4998f35ef96a2fd",
"dateModified": "2017-06-24T18:20:56.366360+03:00"
"datePublished": "2017-06-21T15:53:20.531460+03:00",
"id": "8eb8c964d53342919cf982b74ce28eee",
"dateModified": "2017-06-21T15:53:20.531494+03:00"
},
{
"author": "tender_owner",
"title": "AwardCriteria-2.pdf",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/d5f01806d85143458795cbd133b0e667/documents/fe214e2fd06d4917a4998f35ef96a2fd?download=dbe17f675abc44138c25fba3c24c1109",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/97dd0ca9a0f741a6ad5628c6873d1de9/documents/8eb8c964d53342919cf982b74ce28eee?download=70093c4ab022423eb1acf14a6a34ca4b",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2017-06-24T18:20:56.366320+03:00",
"id": "fe214e2fd06d4917a4998f35ef96a2fd",
"dateModified": "2017-06-24T18:20:56.461758+03:00"
"datePublished": "2017-06-21T15:53:20.531460+03:00",
"id": "8eb8c964d53342919cf982b74ce28eee",
"dateModified": "2017-06-21T15:53:20.635230+03:00"
}
],
"title": "футляри до державних нагород",
"tenderID": "UA-2017-06-24-000001",
"dateModified": "2017-06-24T18:20:58.002379+03:00",
"tenderID": "UA-2017-06-21-000001",
"dateModified": "2017-06-21T15:53:22.246710+03:00",
"status": "active.auction",
"tenderPeriod": {
"startDate": "2017-06-08T18:20:40.437462+03:00",
"endDate": "2017-06-24T18:20:40.437462+03:00"
"startDate": "2017-06-05T15:53:05.318541+03:00",
"endDate": "2017-06-21T15:53:05.318541+03:00"
},
"auctionPeriod": {
"startDate": "2017-06-24T18:20:40.437462+03:00",
"shouldStartAfter": "2017-06-25T00:00:00+03:00"
"startDate": "2017-06-21T15:53:05.318541+03:00",
"shouldStartAfter": "2017-06-22T00:00:00+03:00"
},
"procurementMethodType": "aboveThresholdUA",
"date": "2017-06-24T18:20:55.831226+03:00",
"date": "2017-06-21T15:53:20.034093+03:00",
"minimalStep": {
"currency": "UAH",
"amount": 35.0,
Expand Down Expand Up @@ -132,10 +132,10 @@ Content-Type: application/json; charset=UTF-8
"locality": "м. Київ"
},
"deliveryDate": {
"startDate": "2017-07-14T18:20:40.467711+03:00",
"endDate": "2017-08-13T18:20:40.467766+03:00"
"startDate": "2017-07-11T15:53:06.068598+03:00",
"endDate": "2017-08-10T15:53:06.068650+03:00"
},
"id": "bc5e1e48639541f1b57b9678a4085991",
"id": "fc733ce56c434220bb9e7418b0de6162",
"unit": {
"code": "44617100-9",
"name": "item"
Expand Down
20 changes: 10 additions & 10 deletions docs/source/tutorial/award-complaint-accept.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/2.3/tenders/9d4a9ad333404549aa38deb10d43e030/awards/a2faf89452b649fc989d3d5f31af3682/complaints/fc238acc7a3a4641b15648305bb0adac HTTP/1.0
PATCH /api/2.3/tenders/9eaa2f3beb554dd5b22ba7ab74f89d1f/awards/bdda4791877a4e7ca0d3ba4f00fa28c6/complaints/2e4cc336e8964ba5ada86f29c99e618f HTTP/1.0
Authorization: Basic cmV2aWV3ZXI6
Content-Length: 32
Content-Type: application/json
Expand All @@ -19,12 +19,12 @@ Content-Type: application/json; charset=UTF-8
{
"author": "complaint_owner",
"title": "Complaint_Attachement.pdf",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/9d4a9ad333404549aa38deb10d43e030/awards/a2faf89452b649fc989d3d5f31af3682/complaints/fc238acc7a3a4641b15648305bb0adac/documents/ec486a86817e422597e6fc7075a3b881?download=80c6f011c29a4ded8c7132a9438a861a",
"url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/9eaa2f3beb554dd5b22ba7ab74f89d1f/awards/bdda4791877a4e7ca0d3ba4f00fa28c6/complaints/2e4cc336e8964ba5ada86f29c99e618f/documents/c2b960bd63864644ac4b037b72248938?download=f08fe6ae1cc64651a4563cb0ceca2bc9",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2017-06-24T18:20:43.566834+03:00",
"id": "ec486a86817e422597e6fc7075a3b881",
"dateModified": "2017-06-24T18:20:43.566874+03:00"
"datePublished": "2017-06-21T15:53:08.346179+03:00",
"id": "c2b960bd63864644ac4b037b72248938",
"dateModified": "2017-06-21T15:53:08.346231+03:00"
}
],
"description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.",
Expand All @@ -50,13 +50,13 @@ Content-Type: application/json; charset=UTF-8
"locality": "м. Вінниця"
}
},
"dateAccepted": "2017-06-24T18:20:46.374241+03:00",
"dateSubmitted": "2017-06-24T18:20:43.708863+03:00",
"complaintID": "UA-2017-06-24-000001.1",
"date": "2017-06-24T18:20:46.388417+03:00",
"dateAccepted": "2017-06-21T15:53:11.308002+03:00",
"dateSubmitted": "2017-06-21T15:53:08.495937+03:00",
"complaintID": "UA-2017-06-21-000001.1",
"date": "2017-06-21T15:53:11.321906+03:00",
"acceptance": true,
"type": "complaint",
"id": "fc238acc7a3a4641b15648305bb0adac"
"id": "2e4cc336e8964ba5ada86f29c99e618f"
}
}

16 changes: 8 additions & 8 deletions docs/source/tutorial/award-complaint-accepted-stopped.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/2.3/tenders/9d4a9ad333404549aa38deb10d43e030/awards/a2faf89452b649fc989d3d5f31af3682/complaints/afb8514f281541f3acf4822d35c73ad1 HTTP/1.0
PATCH /api/2.3/tenders/9eaa2f3beb554dd5b22ba7ab74f89d1f/awards/bdda4791877a4e7ca0d3ba4f00fa28c6/complaints/07b2843b36bd4938b9b4d1dd8d1fa990 HTTP/1.0
Authorization: Basic cmV2aWV3ZXI6
Content-Length: 217
Content-Type: application/json
Expand All @@ -16,13 +16,13 @@ Content-Type: application/json; charset=UTF-8
{
"data": {
"status": "stopped",
"dateDecision": "2017-06-24T18:20:48.042528+03:00",
"dateDecision": "2017-06-21T15:53:12.984005+03:00",
"description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.",
"title": "Недостатньо інформації",
"decision": "Тендер скасовується замовником",
"acceptance": true,
"dateCanceled": "2017-06-24T18:20:48.042556+03:00",
"dateAccepted": "2017-06-24T18:20:47.058557+03:00",
"dateCanceled": "2017-06-21T15:53:12.984031+03:00",
"dateAccepted": "2017-06-21T15:53:12.010192+03:00",
"author": {
"contactPoint": {
"email": "soleksuk@gmail.com",
Expand All @@ -44,11 +44,11 @@ Content-Type: application/json; charset=UTF-8
"locality": "м. Вінниця"
}
},
"dateSubmitted": "2017-06-24T18:20:44.304163+03:00",
"complaintID": "UA-2017-06-24-000001.5",
"date": "2017-06-24T18:20:48.055162+03:00",
"dateSubmitted": "2017-06-21T15:53:09.183588+03:00",
"complaintID": "UA-2017-06-21-000001.5",
"date": "2017-06-21T15:53:12.995844+03:00",
"type": "complaint",
"id": "afb8514f281541f3acf4822d35c73ad1"
"id": "07b2843b36bd4938b9b4d1dd8d1fa990"
}
}

14 changes: 7 additions & 7 deletions docs/source/tutorial/award-complaint-accepted-stopping.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/2.3/tenders/9d4a9ad333404549aa38deb10d43e030/awards/a2faf89452b649fc989d3d5f31af3682/complaints/fd8e099e82424ff4bd76bce40ca5bdc9?acc_token=dae80325b4014aeba28a094527c927f3 HTTP/1.0
PATCH /api/2.3/tenders/9eaa2f3beb554dd5b22ba7ab74f89d1f/awards/bdda4791877a4e7ca0d3ba4f00fa28c6/complaints/2354b57545d94897819e1616a5022b00?acc_token=96eb242c65e546cea06019706eba701a HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 228
Content-Type: application/json
Expand Down Expand Up @@ -40,14 +40,14 @@ Content-Type: application/json; charset=UTF-8
},
"acceptance": true,
"cancellationReason": "Тендер скасовується замовником",
"dateCanceled": "2017-06-24T18:20:48.709901+03:00",
"dateAccepted": "2017-06-24T18:20:46.831873+03:00",
"dateSubmitted": "2017-06-24T18:20:44.138239+03:00",
"complaintID": "UA-2017-06-24-000001.4",
"date": "2017-06-24T18:20:48.722829+03:00",
"dateCanceled": "2017-06-21T15:53:13.655902+03:00",
"dateAccepted": "2017-06-21T15:53:11.773874+03:00",
"dateSubmitted": "2017-06-21T15:53:09.000608+03:00",
"complaintID": "UA-2017-06-21-000001.4",
"date": "2017-06-21T15:53:13.669330+03:00",
"title": "Недостатньо інформації",
"type": "complaint",
"id": "fd8e099e82424ff4bd76bce40ca5bdc9"
"id": "2354b57545d94897819e1616a5022b00"
}
}

0 comments on commit 3dc9299

Please sign in to comment.