Merge pull request #91 from annawzz/a312620117236937_block_cpv

Fix docs.py (change cpv to dk021)
openprocurement · Jun 24, 2017 · bc95aa8 · bc95aa8
2 parents 2541587 + be2f8ac
commit bc95aa8
Show file tree

Hide file tree

Showing 63 changed files with 622 additions and 616 deletions.
diff --git a/docs.py b/docs.py
@@ -23,7 +23,7 @@
                 "classification": {
                     "description": "Послуги з харчування у школах",
                     "id": "55523100-3",
-                    "scheme": "CPV"
+                    "scheme": "ДК021"
                 },
                 "description": "Послуги шкільних їдалень",
                 "description_en": "Services in school canteens",

diff --git a/docs/source/multiple_lots_tutorial/tender-add-lot.http b/docs/source/multiple_lots_tutorial/tender-add-lot.http
@@ -1,4 +1,4 @@
-POST /api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff/lots?acc_token=021f23e2ed4548c1b5a3d4104b071dc9 HTTP/1.0
+POST /api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b/lots?acc_token=56bff70fcb174649879a0f9d83055a8c HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 198
 Content-Type: application/json
@@ -18,7 +18,7 @@ Host: api-sandbox.openprocurement.org
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff/lots/d4d982e10ce844aaa98054c8f113470d
+Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b/lots/132b472e0b564c2a9151fb10fa7abb08
 {
   "data": {
     "status": "active", 
@@ -29,8 +29,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/4bec589c36ec421
       "amount": 500000.0, 
       "valueAddedTaxIncluded": true
     }, 
-    "date": "2016-09-12T14:29:33.409560+03:00", 
-    "id": "d4d982e10ce844aaa98054c8f113470d"
+    "date": "2017-06-19T20:02:50.533976+03:00", 
+    "id": "132b472e0b564c2a9151fb10fa7abb08"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/tender-add-relatedLot-to-item.http b/docs/source/multiple_lots_tutorial/tender-add-relatedLot-to-item.http
@@ -1,4 +1,4 @@
-PATCH /api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff?acc_token=021f23e2ed4548c1b5a3d4104b071dc9 HTTP/1.0
+PATCH /api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b?acc_token=56bff70fcb174649879a0f9d83055a8c HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 73
 Content-Type: application/json
@@ -8,7 +8,7 @@ Host: api-sandbox.openprocurement.org
   "data": {
     "items": [
       {
-        "relatedLot": "d4d982e10ce844aaa98054c8f113470d"
+        "relatedLot": "132b472e0b564c2a9151fb10fa7abb08"
       }
     ]
   }
@@ -32,16 +32,16 @@ Content-Type: application/json; charset=UTF-8
           "amount": 500000.0, 
           "valueAddedTaxIncluded": true
         }, 
-        "date": "2016-09-12T14:29:33.409560+03:00", 
-        "id": "d4d982e10ce844aaa98054c8f113470d"
+        "date": "2017-06-19T20:02:50.533976+03:00", 
+        "id": "132b472e0b564c2a9151fb10fa7abb08"
       }
     ], 
     "items": [
       {
-        "relatedLot": "d4d982e10ce844aaa98054c8f113470d", 
+        "relatedLot": "132b472e0b564c2a9151fb10fa7abb08", 
         "description": "Послуги шкільних їдалень", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Послуги з харчування у школах", 
           "id": "55523100-3"
         }, 
@@ -54,31 +54,30 @@ Content-Type: application/json; charset=UTF-8
           }
         ], 
         "deliveryAddress": {
-          "countryName": "Україна", 
           "postalCode": "79000", 
+          "countryName": "Україна", 
           "streetAddress": "вул. Банкова 1", 
           "region": "м. Київ", 
           "locality": "м. Київ"
         }, 
         "deliveryDate": {
-          "startDate": "2016-09-14T11:29:24.989068+03:00", 
-          "endDate": "2016-09-17T11:29:24.989068+03:00"
+          "startDate": "2017-06-21T20:02:22.515286+03:00", 
+          "endDate": "2017-06-24T20:02:22.515286+03:00"
         }, 
         "description_ru": "Услуги школьных столовых", 
         "id": "2dc54675d6364e2baffbc0f8e74432ac"
       }
     ], 
-    "procurementMethodType": "negotiation", 
-    "causeDescription_en": "original tender has failed twice", 
+    "procurementMethodType": "negotiation.quick", 
     "value": {
       "currency": "UAH", 
       "amount": 500000.0, 
       "valueAddedTaxIncluded": true
     }, 
-    "dateModified": "2016-09-12T14:29:33.481943+03:00", 
+    "dateModified": "2017-06-19T20:02:50.619378+03:00", 
     "causeDescription_ru": "оригинальный тендер не получился дважды", 
-    "date": "2016-09-12T14:29:33.338540+03:00", 
-    "title_en": "Services in school canteens", 
+    "date": "2017-06-19T20:02:50.482399+03:00", 
+    "causeDescription_en": "original tender has failed twice", 
     "description_ru": "Услуги школьных столовых", 
     "description_en": "Services in school canteens", 
     "title_ru": "Услуги школьных столовых", 
@@ -104,9 +103,9 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "cause": "twiceUnsuccessful", 
-    "id": "4bec589c36ec421ebfbc2f785b273fff", 
-    "tenderID": "UA-2016-09-12-000001"
+    "title_en": "Services in school canteens", 
+    "id": "e2f60567d1d8406e8bc9f40931e1132b", 
+    "tenderID": "UA-2017-06-19-000001"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/tender-award-approve.http b/docs/source/multiple_lots_tutorial/tender-award-approve.http
@@ -1,4 +1,4 @@
-PATCH /api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff/awards/66aa55c32fc1417db36eab14982d2d82?acc_token=021f23e2ed4548c1b5a3d4104b071dc9 HTTP/1.0
+PATCH /api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b/awards/d113ca3649e1455a8f839a496ed2ad36?acc_token=56bff70fcb174649879a0f9d83055a8c HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 49
 Content-Type: application/json
@@ -16,10 +16,10 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "active", 
-    "lotID": "d4d982e10ce844aaa98054c8f113470d", 
+    "lotID": "132b472e0b564c2a9151fb10fa7abb08", 
     "complaintPeriod": {
-      "startDate": "2016-09-12T14:29:33.661957+03:00", 
-      "endDate": "2016-09-23T00:00:00+03:00"
+      "startDate": "2017-06-19T20:02:50.795217+03:00", 
+      "endDate": "2017-06-25T00:00:00+03:00"
     }, 
     "suppliers": [
       {
@@ -50,8 +50,8 @@ Content-Type: application/json; charset=UTF-8
       "valueAddedTaxIncluded": true
     }, 
     "qualified": true, 
-    "date": "2016-09-12T14:29:33.736820+03:00", 
-    "id": "66aa55c32fc1417db36eab14982d2d82"
+    "date": "2017-06-19T20:02:50.883003+03:00", 
+    "id": "d113ca3649e1455a8f839a496ed2ad36"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/tender-award.http b/docs/source/multiple_lots_tutorial/tender-award.http
@@ -1,4 +1,4 @@
-POST /api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff/awards?acc_token=021f23e2ed4548c1b5a3d4104b071dc9 HTTP/1.0
+POST /api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b/awards?acc_token=56bff70fcb174649879a0f9d83055a8c HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 1329
 Content-Type: application/json
@@ -7,7 +7,7 @@ Host: api-sandbox.openprocurement.org
 {
   "data": {
     "status": "pending", 
-    "lotID": "d4d982e10ce844aaa98054c8f113470d", 
+    "lotID": "132b472e0b564c2a9151fb10fa7abb08", 
     "suppliers": [
       {
         "contactPoint": {
@@ -43,13 +43,13 @@ Host: api-sandbox.openprocurement.org
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff/awards/66aa55c32fc1417db36eab14982d2d82
+Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b/awards/d113ca3649e1455a8f839a496ed2ad36
 {
   "data": {
     "status": "pending", 
-    "lotID": "d4d982e10ce844aaa98054c8f113470d", 
+    "lotID": "132b472e0b564c2a9151fb10fa7abb08", 
     "complaintPeriod": {
-      "startDate": "2016-09-12T14:29:33.661957+03:00"
+      "startDate": "2017-06-19T20:02:50.795217+03:00"
     }, 
     "suppliers": [
       {
@@ -79,8 +79,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/4bec589c36ec421
       "amount": 475000.0, 
       "valueAddedTaxIncluded": true
     }, 
-    "date": "2016-09-12T14:29:33.661251+03:00", 
-    "id": "66aa55c32fc1417db36eab14982d2d82"
+    "date": "2017-06-19T20:02:50.793061+03:00", 
+    "id": "d113ca3649e1455a8f839a496ed2ad36"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/tender-contract-set-contract-value.http b/docs/source/multiple_lots_tutorial/tender-contract-set-contract-value.http
@@ -1,4 +1,4 @@
-PATCH /api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff/contracts/7614c127c74843a59d87c0edb25221be?acc_token=021f23e2ed4548c1b5a3d4104b071dc9 HTTP/1.0
+PATCH /api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b/contracts/3a0caa5770a54815bdd48cd2e07a8a20?acc_token=56bff70fcb174649879a0f9d83055a8c HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 36
 Content-Type: application/json
@@ -19,10 +19,10 @@ Content-Type: application/json; charset=UTF-8
     "status": "pending", 
     "items": [
       {
-        "relatedLot": "d4d982e10ce844aaa98054c8f113470d", 
+        "relatedLot": "132b472e0b564c2a9151fb10fa7abb08", 
         "description": "Послуги шкільних їдалень", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Послуги з харчування у школах", 
           "id": "55523100-3"
         }, 
@@ -35,15 +35,15 @@ Content-Type: application/json; charset=UTF-8
           }
         ], 
         "deliveryAddress": {
-          "countryName": "Україна", 
           "postalCode": "79000", 
+          "countryName": "Україна", 
           "streetAddress": "вул. Банкова 1", 
           "region": "м. Київ", 
           "locality": "м. Київ"
         }, 
         "deliveryDate": {
-          "startDate": "2016-09-14T11:29:24.989068+03:00", 
-          "endDate": "2016-09-17T11:29:24.989068+03:00"
+          "startDate": "2017-06-21T20:02:22.515286+03:00", 
+          "endDate": "2017-06-24T20:02:22.515286+03:00"
         }, 
         "description_ru": "Услуги школьных столовых", 
         "id": "2dc54675d6364e2baffbc0f8e74432ac"
@@ -77,10 +77,10 @@ Content-Type: application/json; charset=UTF-8
       "amount": 238.0, 
       "valueAddedTaxIncluded": true
     }, 
-    "date": "2016-09-12T14:29:33.835837+03:00", 
-    "awardID": "66aa55c32fc1417db36eab14982d2d82", 
-    "id": "7614c127c74843a59d87c0edb25221be", 
-    "contractID": "UA-2016-09-12-000001-1"
+    "date": "2017-06-19T20:02:51.033377+03:00", 
+    "awardID": "d113ca3649e1455a8f839a496ed2ad36", 
+    "id": "3a0caa5770a54815bdd48cd2e07a8a20", 
+    "contractID": "UA-2017-06-19-000001-1"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/tender-contract-sign.http b/docs/source/multiple_lots_tutorial/tender-contract-sign.http
@@ -1,4 +1,4 @@
-PATCH /api/2.3/tenders/4bec589c36ec421ebfbc2f785b273fff/contracts/7614c127c74843a59d87c0edb25221be?acc_token=021f23e2ed4548c1b5a3d4104b071dc9 HTTP/1.0
+PATCH /api/2.3/tenders/e2f60567d1d8406e8bc9f40931e1132b/contracts/3a0caa5770a54815bdd48cd2e07a8a20?acc_token=56bff70fcb174649879a0f9d83055a8c HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 30
 Content-Type: application/json
@@ -17,10 +17,10 @@ Content-Type: application/json; charset=UTF-8
     "status": "active", 
     "items": [
       {
-        "relatedLot": "d4d982e10ce844aaa98054c8f113470d", 
+        "relatedLot": "132b472e0b564c2a9151fb10fa7abb08", 
         "description": "Послуги шкільних їдалень", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Послуги з харчування у школах", 
           "id": "55523100-3"
         }, 
@@ -33,15 +33,15 @@ Content-Type: application/json; charset=UTF-8
           }
         ], 
         "deliveryAddress": {
-          "countryName": "Україна", 
           "postalCode": "79000", 
+          "countryName": "Україна", 
           "streetAddress": "вул. Банкова 1", 
           "region": "м. Київ", 
           "locality": "м. Київ"
         }, 
         "deliveryDate": {
-          "startDate": "2016-09-14T11:29:24.989068+03:00", 
-          "endDate": "2016-09-17T11:29:24.989068+03:00"
+          "startDate": "2017-06-21T20:02:22.515286+03:00", 
+          "endDate": "2017-06-24T20:02:22.515286+03:00"
         }, 
         "description_ru": "Услуги школьных столовых", 
         "id": "2dc54675d6364e2baffbc0f8e74432ac"
@@ -75,11 +75,11 @@ Content-Type: application/json; charset=UTF-8
       "amount": 238.0, 
       "valueAddedTaxIncluded": true
     }, 
-    "dateSigned": "2016-09-12T14:29:33.970711+03:00", 
-    "date": "2016-09-12T14:29:33.972382+03:00", 
-    "awardID": "66aa55c32fc1417db36eab14982d2d82", 
-    "id": "7614c127c74843a59d87c0edb25221be", 
-    "contractID": "UA-2016-09-12-000001-1"
+    "dateSigned": "2017-06-19T20:02:51.155028+03:00", 
+    "date": "2017-06-19T20:02:51.158920+03:00", 
+    "awardID": "d113ca3649e1455a8f839a496ed2ad36", 
+    "id": "3a0caa5770a54815bdd48cd2e07a8a20", 
+    "contractID": "UA-2017-06-19-000001-1"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/tender-listing-no-auth.http b/docs/source/multiple_lots_tutorial/tender-listing-no-auth.http
@@ -5,14 +5,14 @@ Response: 200 OK
 Content-Type: application/json; charset=UTF-8
 {
   "next_page": {
-    "path": "/api/2.3/tenders?offset=2016-09-12T14%3A29%3A33.481943%2B03%3A00", 
-    "uri": "http://api-sandbox.openprocurement.org/api/2.3/tenders?offset=2016-09-12T14%3A29%3A33.481943%2B03%3A00", 
-    "offset": "2016-09-12T14:29:33.481943+03:00"
+    "path": "/api/2.3/tenders?offset=2017-06-19T20%3A02%3A50.619378%2B03%3A00", 
+    "uri": "http://api-sandbox.openprocurement.org/api/2.3/tenders?offset=2017-06-19T20%3A02%3A50.619378%2B03%3A00", 
+    "offset": "2017-06-19T20:02:50.619378+03:00"
   }, 
   "data": [
     {
-      "id": "4bec589c36ec421ebfbc2f785b273fff", 
-      "dateModified": "2016-09-12T14:29:33.481943+03:00"
+      "id": "e2f60567d1d8406e8bc9f40931e1132b", 
+      "dateModified": "2017-06-19T20:02:50.619378+03:00"
     }
   ]
 }