Merge remote-tracking branch 'origin/a312620117236937_block_cpv'

openprocurement · Sep 5, 2017 · b3d3473 · b3d3473
2 parents 4f1538b + 2cb0579
commit b3d3473
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 68 deletions.
diff --git a/docs.py b/docs.py
@@ -85,7 +85,7 @@ def test_docs(self):
                     {
                         "description": "Насіння овочевих культур",
                         "classification": {
-                            "scheme": "CPV",
+                            "scheme": "ДК021",
                             "description": "Vegetable seeds",
                             "id": "03111700-9"
                         },

diff --git a/docs/source/tutorial/create-plan.http b/docs/source/tutorial/create-plan.http
@@ -1,21 +1,21 @@
 POST /api/2.3/plans?opt_pretty=1 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 2406
+Content-Length: 2454
 Content-Type: application/json
 Host: api-sandbox.openprocurement.org
 
 {
   "data": {
     "classification": {
-      "scheme": "CPV", 
+      "scheme": "ДК021", 
       "description": "Seeds", 
       "id": "03111000-2"
     }, 
     "items": [
       {
         "description": "Насіння гірчиці", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Mustard seeds", 
           "id": "03111600-8"
         }, 
@@ -27,7 +27,7 @@ Host: api-sandbox.openprocurement.org
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-05-30T23:26:56.153527"
+          "endDate": "2017-07-05T12:41:41.857893"
         }, 
         "unit": {
           "code": "KGM", 
@@ -38,7 +38,7 @@ Host: api-sandbox.openprocurement.org
       {
         "description": "Насіння соняшнику", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Sunflower seeds", 
           "id": "03111300-5"
         }, 
@@ -50,7 +50,7 @@ Host: api-sandbox.openprocurement.org
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-05-31T23:26:56.153527"
+          "endDate": "2017-07-06T12:41:41.857893"
         }, 
         "unit": {
           "code": "KGM", 
@@ -61,7 +61,7 @@ Host: api-sandbox.openprocurement.org
       {
         "description": "Насіння бавовнику", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Cotton seeds", 
           "id": "03111400-6"
         }, 
@@ -73,7 +73,7 @@ Host: api-sandbox.openprocurement.org
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-06-01T23:26:56.153527"
+          "endDate": "2017-07-07T12:41:41.857893"
         }, 
         "unit": {
           "code": "KGM", 
@@ -112,30 +112,30 @@ Host: api-sandbox.openprocurement.org
       "procurementMethod": "open", 
       "procurementMethodType": "belowThreshold", 
       "tenderPeriod": {
-        "startDate": "2016-05-22T23:26:56.153527"
+        "startDate": "2017-06-27T12:41:41.857893"
       }
     }
   }
 }
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a595bdd6b01f0817
+Location: http://api-sandbox.openprocurement.org/api/2.3/plans/b18f0d6638d64b4499666998e664977a
 {
   "access": {
-    "token": "1c04ffce20d5475cae136e0be85604ec"
+    "token": "e1562366c516497d8154ff0237c55fce"
   }, 
   "data": {
     "classification": {
-      "scheme": "CPV", 
+      "scheme": "ДК021", 
       "description": "Seeds", 
       "id": "03111000-2"
     }, 
     "items": [
       {
         "description": "Насіння гірчиці", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Mustard seeds", 
           "id": "03111600-8"
         }, 
@@ -147,9 +147,9 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-05-30T23:26:56.153527+03:00"
+          "endDate": "2017-07-05T12:41:41.857893+03:00"
         }, 
-        "id": "b282d47971c34994b09ac06d7cdc253f", 
+        "id": "aa20b36ad490439ab0d3d7f8673f8197", 
         "unit": {
           "code": "KGM", 
           "name": "кг"
@@ -159,7 +159,7 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a
       {
         "description": "Насіння соняшнику", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Sunflower seeds", 
           "id": "03111300-5"
         }, 
@@ -171,9 +171,9 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-05-31T23:26:56.153527+03:00"
+          "endDate": "2017-07-06T12:41:41.857893+03:00"
         }, 
-        "id": "bf70aa5aada241b980b9dcc5c12da9d4", 
+        "id": "a8f6f67f36e54f4f94df2e04d297d530", 
         "unit": {
           "code": "KGM", 
           "name": "кг"
@@ -183,7 +183,7 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a
       {
         "description": "Насіння бавовнику", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Cotton seeds", 
           "id": "03111400-6"
         }, 
@@ -195,17 +195,17 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-06-01T23:26:56.153527+03:00"
+          "endDate": "2017-07-07T12:41:41.857893+03:00"
         }, 
-        "id": "6e11d21f6b0947fb8c9e4c1a3984c0f3", 
+        "id": "8163a94be49b47b9a3daf01fad79a997", 
         "unit": {
           "code": "KGM", 
           "name": "кг"
         }, 
         "quantity": 3000
       }
     ], 
-    "planID": "UA-P-2016-05-16-000001", 
+    "planID": "UA-P-2017-06-20-000001", 
     "budget": {
       "amountNet": 12222.0, 
       "description": "budget_description", 
@@ -217,12 +217,12 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a
       "amount": 10000.0, 
       "id": "12303111000-2"
     }, 
-    "datePublished": "2016-05-16T01:26:56.882978+03:00", 
+    "datePublished": "2017-06-20T12:41:42.541383+03:00", 
     "tender": {
       "procurementMethod": "open", 
       "procurementMethodType": "belowThreshold", 
       "tenderPeriod": {
-        "startDate": "2016-05-22T23:26:56.153527+03:00"
+        "startDate": "2017-06-27T12:41:41.857893+03:00"
       }
     }, 
     "additionalClassifications": [
@@ -241,8 +241,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/plans/c834673ae78c4ec7a
       "name": "ДУС"
     }, 
     "owner": "broker", 
-    "dateModified": "2016-05-16T01:26:56.976021+03:00", 
-    "id": "c834673ae78c4ec7a595bdd6b01f0817"
+    "dateModified": "2017-06-20T12:41:42.560100+03:00", 
+    "id": "b18f0d6638d64b4499666998e664977a"
   }
 }
 
diff --git a/docs/source/tutorial/example_plan.http b/docs/source/tutorial/example_plan.http
@@ -1,4 +1,4 @@
-GET /api/2.3/plans/c834673ae78c4ec7a595bdd6b01f0817 HTTP/1.0
+GET /api/2.3/plans/b18f0d6638d64b4499666998e664977a HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Host: api-sandbox.openprocurement.org
 
@@ -7,15 +7,15 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "classification": {
-      "scheme": "CPV", 
+      "scheme": "ДК021", 
       "description": "Seeds", 
       "id": "03111000-2"
     }, 
     "items": [
       {
         "description": "Насіння гірчиці", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Mustard seeds", 
           "id": "03111600-8"
         }, 
@@ -27,9 +27,9 @@ Content-Type: application/json; charset=UTF-8
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-05-30T23:26:56.153527+03:00"
+          "endDate": "2017-07-05T12:41:41.857893+03:00"
         }, 
-        "id": "b282d47971c34994b09ac06d7cdc253f", 
+        "id": "aa20b36ad490439ab0d3d7f8673f8197", 
         "unit": {
           "code": "KGM", 
           "name": "кг"
@@ -39,7 +39,7 @@ Content-Type: application/json; charset=UTF-8
       {
         "description": "Насіння соняшнику", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Sunflower seeds", 
           "id": "03111300-5"
         }, 
@@ -51,9 +51,9 @@ Content-Type: application/json; charset=UTF-8
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-05-31T23:26:56.153527+03:00"
+          "endDate": "2017-07-06T12:41:41.857893+03:00"
         }, 
-        "id": "bf70aa5aada241b980b9dcc5c12da9d4", 
+        "id": "a8f6f67f36e54f4f94df2e04d297d530", 
         "unit": {
           "code": "KGM", 
           "name": "кг"
@@ -63,7 +63,7 @@ Content-Type: application/json; charset=UTF-8
       {
         "description": "Насіння бавовнику", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Cotton seeds", 
           "id": "03111400-6"
         }, 
@@ -75,17 +75,17 @@ Content-Type: application/json; charset=UTF-8
           }
         ], 
         "deliveryDate": {
-          "endDate": "2016-06-01T23:26:56.153527+03:00"
+          "endDate": "2017-07-07T12:41:41.857893+03:00"
         }, 
-        "id": "6e11d21f6b0947fb8c9e4c1a3984c0f3", 
+        "id": "8163a94be49b47b9a3daf01fad79a997", 
         "unit": {
           "code": "KGM", 
           "name": "кг"
         }, 
         "quantity": 3000
       }
     ], 
-    "planID": "UA-P-2016-05-16-000001", 
+    "planID": "UA-P-2017-06-20-000001", 
     "budget": {
       "amountNet": 12222.0, 
       "description": "budget_description", 
@@ -97,12 +97,12 @@ Content-Type: application/json; charset=UTF-8
       "amount": 10000.0, 
       "id": "12303111000-2"
     }, 
-    "datePublished": "2016-05-16T01:26:56.882978+03:00", 
+    "datePublished": "2017-06-20T12:41:42.541383+03:00", 
     "tender": {
       "procurementMethod": "open", 
       "procurementMethodType": "belowThreshold", 
       "tenderPeriod": {
-        "startDate": "2016-05-22T23:26:56.153527+03:00"
+        "startDate": "2017-06-27T12:41:41.857893+03:00"
       }
     }, 
     "additionalClassifications": [
@@ -121,8 +121,8 @@ Content-Type: application/json; charset=UTF-8
       "name": "ДУС"
     }, 
     "owner": "broker", 
-    "dateModified": "2016-05-16T01:26:56.976021+03:00", 
-    "id": "c834673ae78c4ec7a595bdd6b01f0817"
+    "dateModified": "2017-06-20T12:41:42.560100+03:00", 
+    "id": "b18f0d6638d64b4499666998e664977a"
   }
 }
 
diff --git a/docs/source/tutorial/patch-plan-procuringEntity-name.http b/docs/source/tutorial/patch-plan-procuringEntity-name.http
@@ -1,6 +1,6 @@
-PATCH /api/2.3/plans/c834673ae78c4ec7a595bdd6b01f0817?acc_token=1c04ffce20d5475cae136e0be85604ec HTTP/1.0
+PATCH /api/2.3/plans/b18f0d6638d64b4499666998e664977a?acc_token=e1562366c516497d8154ff0237c55fce HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 640
+Content-Length: 652
 Content-Type: application/json
 Host: api-sandbox.openprocurement.org
 
@@ -10,7 +10,7 @@ Host: api-sandbox.openprocurement.org
       {
         "description": "Насіння овочевих культур", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Vegetable seeds", 
           "id": "03111700-9"
         }, 
@@ -39,15 +39,15 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "classification": {
-      "scheme": "CPV", 
+      "scheme": "ДК021", 
       "description": "Seeds", 
       "id": "03111000-2"
     }, 
     "items": [
       {
         "description": "Насіння овочевих культур", 
         "classification": {
-          "scheme": "CPV", 
+          "scheme": "ДК021", 
           "description": "Vegetable seeds", 
           "id": "03111700-9"
         }, 
@@ -61,15 +61,15 @@ Content-Type: application/json; charset=UTF-8
         "deliveryDate": {
           "endDate": "2016-06-01T23:06:30.023018+03:00"
         }, 
-        "id": "b282d47971c34994b09ac06d7cdc253f", 
+        "id": "aa20b36ad490439ab0d3d7f8673f8197", 
         "unit": {
           "code": "KGM", 
           "name": "кг"
         }, 
         "quantity": 5000
       }
     ], 
-    "planID": "UA-P-2016-05-16-000001", 
+    "planID": "UA-P-2017-06-20-000001", 
     "budget": {
       "amountNet": 12222.0, 
       "description": "budget_description", 
@@ -81,12 +81,12 @@ Content-Type: application/json; charset=UTF-8
       "amount": 10000.0, 
       "id": "12303111000-2"
     }, 
-    "datePublished": "2016-05-16T01:26:56.882978+03:00", 
+    "datePublished": "2017-06-20T12:41:42.541383+03:00", 
     "tender": {
       "procurementMethod": "open", 
       "procurementMethodType": "belowThreshold", 
       "tenderPeriod": {
-        "startDate": "2016-05-22T23:26:56.153527+03:00"
+        "startDate": "2017-06-27T12:41:41.857893+03:00"
       }
     }, 
     "additionalClassifications": [
@@ -105,8 +105,8 @@ Content-Type: application/json; charset=UTF-8
       "name": "ДУС"
     }, 
     "owner": "broker", 
-    "dateModified": "2016-05-16T01:26:57.210149+03:00", 
-    "id": "c834673ae78c4ec7a595bdd6b01f0817"
+    "dateModified": "2017-06-20T12:41:42.740142+03:00", 
+    "id": "b18f0d6638d64b4499666998e664977a"
   }
 }