Merge pull request #85 from gorserg/update_docs

Прибрав поле value з пропозицій в документації
openprocurement · Oct 12, 2016 · efe085e · efe085e
2 parents 90fc77a + c0dcf03
commit efe085e
Show file tree

Hide file tree

Showing 226 changed files with 2,797 additions and 3,052 deletions.
diff --git a/docs.py b/docs.py
@@ -3,6 +3,7 @@
 import os
 from datetime import timedelta
 from hashlib import sha512
+from copy import deepcopy
 
 import openprocurement.tender.competitivedialogue.tests.base as base_test
 from openprocurement.api.models import get_now
@@ -511,16 +512,16 @@
                 "name": "ДКП «Школяр»"
             }
         ],
-        "value": {
-            "amount": 500
-        },
         "status": "draft",
         "subcontractingDetails": "ДКП «Орфей», Україна",
         'selfEligible': True,
         'selfQualified': True,
     }
 }
 
+bid_stage2 = deepcopy(bid)
+bid_stage2["data"]["value"] = {"amount": 500}
+
 bid_with_bad_participant = {
     "data": {
         "tenderers": [
@@ -1336,7 +1337,7 @@ def test_stage2_EU(self):
                                           status=403)
 
         with open('docs/source/tutorial/stage2/EU/register-bidder.http', 'w') as self.app.file_obj:
-            response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), bid)
+            response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), bid_stage2)
             bid1_id = response.json['data']['id']
             bids_access[bid1_id] = response.json['access']['token']
             self.assertEqual(response.status, '201 Created')
@@ -2153,7 +2154,7 @@ def test_multiple_lots(self):
                                           {'data': {'selfEligible': True, 'selfQualified': True,
                                                     'tenderers': bid['data']["tenderers"],
                                                     'lotValues': [{'subcontractingDetails': 'ДКП «Орфей», Україна',
-                                                                   'value': {'amount': 500}, 'relatedLot': lot_id1}]}})
+                                                                   'relatedLot': lot_id1}]}})
             self.assertEqual(response.status, '201 Created')
             bid1_token = response.json['access']['token']
             bid1_id = response.json['data']['id']
@@ -2162,9 +2163,9 @@ def test_multiple_lots(self):
             response = self.app.post_json('/tenders/{}/bids'.format(tender_id),
                                           {'data': {'selfEligible': True, 'selfQualified': True,
                                                     'tenderers': bid2['data']['tenderers'],
-                                                    'lotValues': [{'value': {'amount': 500}, 'relatedLot': lot_id1},
+                                                    'lotValues': [{'relatedLot': lot_id1},
                                                                   {'subcontractingDetails': 'ДКП «Укр Прінт», Україна',
-                                                                   'value': {'amount': 500}, 'relatedLot': lot_id2}]}})
+                                                                   'relatedLot': lot_id2}]}})
             self.assertEqual(response.status, '201 Created')
             bid2_id = response.json['data']['id']
             bid2_token = response.json['access']['token']
@@ -2173,9 +2174,9 @@ def test_multiple_lots(self):
             response = self.app.post_json('/tenders/{}/bids'.format(tender_id),
                                           {'data': {'selfEligible': True, 'selfQualified': True,
                                                     'tenderers': bid3['data']['tenderers'],
-                                                    'lotValues': [{'value': {'amount': 500}, 'relatedLot': lot_id1},
+                                                    'lotValues': [{'relatedLot': lot_id1},
                                                                   {'subcontractingDetails': 'ДКП «Укр Прінт», Україна',
-                                                                   'value': {'amount': 500}, 'relatedLot': lot_id2}]}})
+                                                                   'relatedLot': lot_id2}]}})
             self.assertEqual(response.status, '201 Created')
             bid3_id = response.json['data']['id']
             bid3_token = response.json['access']['token']
@@ -2192,18 +2193,18 @@ def test_multiple_lots(self):
         with open('docs/source/multiple_lots_tutorial/bid-lot1-update-view.http', 'w') as self.app.file_obj:
             response = self.app.patch_json('/tenders/{}/bids/{}?acc_token={}'.format(tender_id, bid1_id, bid1_token),
                                            {'data': {'lotValues': [{'subcontractingDetails': 'ДКП «Орфей»',
-                                                                    'value': {'amount': 500}, 'relatedLot': lot_id1}],
+                                                                    'relatedLot': lot_id1}],
                                                      'status': 'pending'}})
             self.assertEqual(response.status, '200 OK')
 
         with open('docs/source/multiple_lots_tutorial/bid-lot2-update-view.http', 'w') as self.app.file_obj:
             response = self.app.patch_json('/tenders/{}/bids/{}?acc_token={}'.format(tender_id, bid2_id, bid2_token),
-                                           {'data': {'lotValues': [{'value': {'amount': 500}, 'relatedLot': lot_id1}],
+                                           {'data': {'lotValues': [{'relatedLot': lot_id1}],
                                                      'status': 'pending'}})
 
         with open('docs/source/multiple_lots_tutorial/bid-lot3-update-view.http', 'w') as self.app.file_obj:
             response = self.app.patch_json('/tenders/{}/bids/{}?acc_token={}'.format(tender_id, bid3_id, bid3_token),
-                                           {'data': {'lotValues': [{'value': {'amount': 500}, 'relatedLot': lot_id1}],
+                                           {'data': {'lotValues': [{'relatedLot': lot_id1}],
                                                      'status': 'pending'}})
 
             self.assertEqual(response.status, '200 OK')
@@ -2353,7 +2354,7 @@ def test_award_complaints_stage2(self):
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json['data']['status'], 'active.tendering')
 
-        response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), bid)
+        response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), bid_stage2)
         bid_id = response.json['data']['id']
         bid_token = response.json['access']['token']
 
@@ -2707,7 +2708,7 @@ def test_stage2_UA(self):
                                           status=403)
 
         with open('docs/source/tutorial/stage2/UA/register-bidder.http', 'w') as self.app.file_obj:
-            response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), bid)
+            response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), bid_stage2)
             bid1_id = response.json['data']['id']
             bids_access[bid1_id] = response.json['access']['token']
             self.assertEqual(response.status, '201 Created')

diff --git a/docs/source/multiple_lots_tutorial/bid-lot1-invalid-view.http b/docs/source/multiple_lots_tutorial/bid-lot1-invalid-view.http
@@ -1,4 +1,4 @@
-GET /api/2.3/tenders/0849947f89274771919db9e27c676655/bids/25def5b6d247455da95a97d1505fb9b0?acc_token=558a797fdcc946e5a52ae9fd73e7f3b5 HTTP/1.0
+GET /api/2.3/tenders/c69bc7d44dbe456e866cdb1e862446c1/bids/4f99a021f48a42daa1b9c4ed877f7080?acc_token=1789680a20e54be799b844e8207afdf6 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Host: api-sandbox.openprocurement.org
 
@@ -7,7 +7,7 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "invalid", 
-    "id": "25def5b6d247455da95a97d1505fb9b0"
+    "id": "4f99a021f48a42daa1b9c4ed877f7080"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/bid-lot1-update-view.http b/docs/source/multiple_lots_tutorial/bid-lot1-update-view.http
@@ -1,6 +1,6 @@
-PATCH /api/2.3/tenders/0849947f89274771919db9e27c676655/bids/25def5b6d247455da95a97d1505fb9b0?acc_token=558a797fdcc946e5a52ae9fd73e7f3b5 HTTP/1.0
+PATCH /api/2.3/tenders/c69bc7d44dbe456e866cdb1e862446c1/bids/4f99a021f48a42daa1b9c4ed877f7080?acc_token=1789680a20e54be799b844e8207afdf6 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 214
+Content-Length: 188
 Content-Type: application/json
 Host: api-sandbox.openprocurement.org
 DATA:
@@ -9,10 +9,7 @@ DATA:
     "status": "pending", 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "value": {
-          "amount": 500
-        }, 
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e", 
         "subcontractingDetails": "ДКП «Орфей»"
       }
     ]
@@ -27,14 +24,9 @@ Content-Type: application/json; charset=UTF-8
     "selfEligible": true, 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "date": "2016-08-17T11:56:46.699107+03:00", 
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e", 
+        "date": "2016-10-12T02:41:15.113265+03:00", 
         "status": "pending", 
-        "value": {
-          "currency": "UAH", 
-          "amount": 500.0, 
-          "valueAddedTaxIncluded": true
-        }, 
         "subcontractingDetails": "ДКП «Орфей»"
       }
     ], 
@@ -61,8 +53,8 @@ Content-Type: application/json; charset=UTF-8
         }
       }
     ], 
-    "date": "2016-08-17T11:56:46.698766+03:00", 
-    "id": "25def5b6d247455da95a97d1505fb9b0"
+    "date": "2016-10-12T02:41:15.112962+03:00", 
+    "id": "4f99a021f48a42daa1b9c4ed877f7080"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/bid-lot1.http b/docs/source/multiple_lots_tutorial/bid-lot1.http
@@ -1,6 +1,6 @@
-POST /api/2.3/tenders/0849947f89274771919db9e27c676655/bids HTTP/1.0
+POST /api/2.3/tenders/c69bc7d44dbe456e866cdb1e862446c1/bids HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 984
+Content-Length: 958
 Content-Type: application/json
 Host: api-sandbox.openprocurement.org
 DATA:
@@ -10,10 +10,7 @@ DATA:
     "selfQualified": true, 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "value": {
-          "amount": 500
-        }, 
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e", 
         "subcontractingDetails": "ДКП «Орфей», Україна"
       }
     ], 
@@ -44,24 +41,19 @@ DATA:
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/0849947f89274771919db9e27c676655/bids/25def5b6d247455da95a97d1505fb9b0
+Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/c69bc7d44dbe456e866cdb1e862446c1/bids/4f99a021f48a42daa1b9c4ed877f7080
 {
   "access": {
-    "token": "558a797fdcc946e5a52ae9fd73e7f3b5"
+    "token": "1789680a20e54be799b844e8207afdf6"
   }, 
   "data": {
     "status": "pending", 
     "selfEligible": true, 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "date": "2016-08-17T11:56:46.699107+03:00", 
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e", 
+        "date": "2016-10-12T02:41:15.113265+03:00", 
         "status": "pending", 
-        "value": {
-          "currency": "UAH", 
-          "amount": 500.0, 
-          "valueAddedTaxIncluded": true
-        }, 
         "subcontractingDetails": "ДКП «Орфей», Україна"
       }
     ], 
@@ -88,8 +80,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/0849947f8927477
         }
       }
     ], 
-    "date": "2016-08-17T11:56:46.698766+03:00", 
-    "id": "25def5b6d247455da95a97d1505fb9b0"
+    "date": "2016-10-12T02:41:15.112962+03:00", 
+    "id": "4f99a021f48a42daa1b9c4ed877f7080"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/bid-lot2-update-view.http b/docs/source/multiple_lots_tutorial/bid-lot2-update-view.http
@@ -1,6 +1,6 @@
-PATCH /api/2.3/tenders/0849947f89274771919db9e27c676655/bids/ac37b5c7b5b94bb99686b902e861b710?acc_token=ecd7d5c10e524ea0af43e90447392114 HTTP/1.0
+PATCH /api/2.3/tenders/c69bc7d44dbe456e866cdb1e862446c1/bids/a451905493ab4a8ebbb85358e08ef494?acc_token=bd7811b49911455383d117d31db5c460 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 124
+Content-Length: 98
 Content-Type: application/json
 Host: api-sandbox.openprocurement.org
 DATA:
@@ -9,10 +9,7 @@ DATA:
     "status": "pending", 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "value": {
-          "amount": 500
-        }
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e"
       }
     ]
   }
@@ -26,14 +23,9 @@ Content-Type: application/json; charset=UTF-8
     "selfEligible": true, 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "date": "2016-08-17T11:56:46.750113+03:00", 
-        "status": "pending", 
-        "value": {
-          "currency": "UAH", 
-          "amount": 500.0, 
-          "valueAddedTaxIncluded": true
-        }
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e", 
+        "date": "2016-10-12T02:41:15.204891+03:00", 
+        "status": "pending"
       }
     ], 
     "selfQualified": true, 
@@ -59,8 +51,8 @@ Content-Type: application/json; charset=UTF-8
         }
       }
     ], 
-    "date": "2016-08-17T11:56:46.749757+03:00", 
-    "id": "ac37b5c7b5b94bb99686b902e861b710"
+    "date": "2016-10-12T02:41:15.204589+03:00", 
+    "id": "a451905493ab4a8ebbb85358e08ef494"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/bid-lot2.http b/docs/source/multiple_lots_tutorial/bid-lot2.http
@@ -1,6 +1,6 @@
-POST /api/2.3/tenders/0849947f89274771919db9e27c676655/bids HTTP/1.0
+POST /api/2.3/tenders/c69bc7d44dbe456e866cdb1e862446c1/bids HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 1027
+Content-Length: 975
 Content-Type: application/json
 Host: api-sandbox.openprocurement.org
 DATA:
@@ -10,16 +10,10 @@ DATA:
     "selfQualified": true, 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "value": {
-          "amount": 500
-        }
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e"
       }, 
       {
-        "relatedLot": "8d3c1898e9594aa5b5a5130e979d2e98", 
-        "value": {
-          "amount": 500
-        }, 
+        "relatedLot": "412c8c769eea447f8758959ee76830bf", 
         "subcontractingDetails": "ДКП «Укр Прінт», Україна"
       }
     ], 
@@ -50,34 +44,24 @@ DATA:
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/0849947f89274771919db9e27c676655/bids/dbc44142163b4c57b9954ee944e387e7
+Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/c69bc7d44dbe456e866cdb1e862446c1/bids/bca2ade397ae487c9d60e2b1ca6a94e7
 {
   "access": {
-    "token": "91ee4d2714c54cd2b2fdf0c240310840"
+    "token": "e224597863fe4299ad3c6833ac1ca452"
   }, 
   "data": {
     "status": "pending", 
     "selfEligible": true, 
     "lotValues": [
       {
-        "relatedLot": "01ecf1213b364e0b8265304ba94a401c", 
-        "date": "2016-08-17T11:56:46.812328+03:00", 
-        "status": "pending", 
-        "value": {
-          "currency": "UAH", 
-          "amount": 500.0, 
-          "valueAddedTaxIncluded": true
-        }
+        "relatedLot": "1f528c20ff7e43d4985064f5825ba98e", 
+        "date": "2016-10-12T02:41:15.264792+03:00", 
+        "status": "pending"
       }, 
       {
-        "relatedLot": "8d3c1898e9594aa5b5a5130e979d2e98", 
-        "date": "2016-08-17T11:56:46.812736+03:00", 
+        "relatedLot": "412c8c769eea447f8758959ee76830bf", 
+        "date": "2016-10-12T02:41:15.264941+03:00", 
         "status": "pending", 
-        "value": {
-          "currency": "UAH", 
-          "amount": 500.0, 
-          "valueAddedTaxIncluded": true
-        }, 
         "subcontractingDetails": "ДКП «Укр Прінт», Україна"
       }
     ], 
@@ -104,8 +88,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/0849947f8927477
         }
       }
     ], 
-    "date": "2016-08-17T11:56:46.811919+03:00", 
-    "id": "dbc44142163b4c57b9954ee944e387e7"
+    "date": "2016-10-12T02:41:15.264492+03:00", 
+    "id": "bca2ade397ae487c9d60e2b1ca6a94e7"
   }
 }