Merge pull request #96 from bdmbdsm/registrationFee

Registration fee
openprocurement · Mar 20, 2019 · dcb905b · dcb905b
2 parents 00be215 + 2059f96
commit dcb905b
Show file tree

Hide file tree

Showing 32 changed files with 492 additions and 731 deletions.
diff --git a/.mr.developer.cfg b/.mr.developer.cfg
@@ -1,5 +1,5 @@
 [buildout]
-args = 'bin/buildout'
+args = './bin/buildout'
 	'-c'
 	'docs.cfg'
 

diff --git a/docs/gen-requests.sh b/docs/gen-requests.sh
@@ -0,0 +1,9 @@
+# check if there is buildout present
+if [ ! -e bin/buildout ] || [ ! -e bin/nosetests ]
+# if it isn't - create it
+then
+    python bootstrap.py
+    ./bin/buildout
+fi
+# run the requests files generation
+./bin/nosetests -sv docs/update_tutorial_requests.py
diff --git a/docs/makedocs.sh b/docs/makedocs.sh
@@ -0,0 +1,10 @@
+# bootstrap the buildout if needed
+if [ ! -e bin/buildout ]; then
+    python bootstrap.py
+fi
+
+if [ ! -e bin/docs ]; then
+    ./bin/buildout -c docs.cfg
+fi
+
+./bin/docs
diff --git a/docs/source/standard/auction.rst b/docs/source/standard/auction.rst
@@ -79,11 +79,6 @@ Schema
 
   Bid guarantee. `Lots.auctions.guarantee` for 2nd and 3rd auctions within the privatization cycle will be calculated auctomatically.
 
-:registrationFee:
-  :ref:`Guarantee`, required
-
-  Bid registration fee. `Lots.auctions.registrationFee` for 2nd and 3rd auctions within the privatization cycle will be calculated auctomatically.
-
 :minimalStep:
   :ref:`value`, required
 
@@ -127,8 +122,6 @@ Schema
 | `unsuccessful`| The process has been unsuccessful.                         |
 +---------------+------------------------------------------------------------+
 
-  * `unsuccessful` - the process has been unsuccessful.
-
 :contracts:
   Array of :ref:`contracts`, auto-generated, read-only
 

diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst
@@ -144,7 +144,7 @@ Let's delete lot:
 
 A document with the `documentType: canellationDetails` has to be added first:
 
-.. literalinclude:: tutorial/add_cancellation_docs.http
+.. literalinclude:: tutorial/add_cancellation_docs.hhtp
    :language: javascript
 
 So now lot can be easily deleted:

diff --git a/docs/source/tutorial/add_cancellation_docs.hhtp b/docs/source/tutorial/add_cancellation_docs.hhtp
@@ -1,13 +1,13 @@
-POST /api/2.5/lots/962fa6efd16d4d55acd4b1f88bb7cec9/documents HTTP/1.0
+POST /api/2.5/lots/9c54261550f74c99b25b7a8ab16aa97a/documents HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 350
+Content-Length: 348
 Content-Type: application/json
 Host: lb.api-sandbox.registry.ea.openprocurement.net
-X-Access-Token: f3e126c1e7734b1b8887cfbf17478baa
+X-Access-Token: 53ce42a01cb745819303b64031afbb2b
 DATA:
 {
   "data": {
-    "url": "http://localhost/get/48050771eb984a409570e74376eb5b2b?KeyID=172d32c8&Signature=OFKbmhKyZRsurc8dM4p1r%2BM5wBR%2F4FmU9YYWcnPmA1GGz8QMS8RGHZOaNcUGtNg0kdkYCpSdx5B6acm2ka3vBg%3D%3D", 
+    "url": "http://localhost/get/bc55defdab034421af27f4d9c439a16e?KeyID=172d32c8&Signature=VR7N0kPTzDi3PRIImIg1agVop7Layrc47TX2GzzCWTUJhA6rqhg8ta4CpoO0%2FjKcq1RVFsfsG3bngh9CxLZjDA%3D%3D", 
     "title": "укр.doc", 
     "format": "application/msword", 
     "hash": "md5:00000000000000000000000000000000", 
@@ -17,20 +17,20 @@ DATA:
 
 Response: 201 Created
 Content-Type: application/json
-Location: http://lb.api-sandbox.registry.ea.openprocurement.net/api/2.5/lots/962fa6efd16d4d55acd4b1f88bb7cec9/documents/ba0b14ec636c4082b4a85630d44169cd
+Location: http://lb.api-sandbox.registry.ea.openprocurement.net/api/2.5/lots/9c54261550f74c99b25b7a8ab16aa97a/documents/b1d4e5b4377349a79aa8e282927a66b5
 X-Content-Type-Options: nosniff
 {
   "data": {
     "hash": "md5:00000000000000000000000000000000", 
     "author": "lot_owner", 
     "title": "укр.doc", 
-    "url": "http://localhost/get/48050771eb984a409570e74376eb5b2b?KeyID=172d32c8&Signature=ej%2F8G%252B24t1Fu1zN2kxRy%2F2nR1569zAny9URT43NxthpXxlvtHba1g9HgTyZanWuwDjF60X8ZIIveYTZw5ZisBw%253D%253D", 
+    "url": "http://localhost/get/bc55defdab034421af27f4d9c439a16e?KeyID=172d32c8&Signature=BZJ%2FgnWnyfxmrtm6WSZ8fEmExwbvCpoOgAFOdePF9jd5%252BAakEI%252BoNz%252BHzgbLbMvAiXhcKfcGxHziCeuOLNt%252BDw%253D%253D", 
     "format": "application/msword", 
     "documentOf": "lot", 
-    "datePublished": "2019-02-04T16:38:18.363290+02:00", 
+    "datePublished": "2019-03-19T15:23:07.118610+02:00", 
     "documentType": "cancellationDetails", 
-    "dateModified": "2019-02-04T16:38:18.363310+02:00", 
-    "id": "ba0b14ec636c4082b4a85630d44169cd"
+    "dateModified": "2019-03-19T15:23:07.118652+02:00", 
+    "id": "b1d4e5b4377349a79aa8e282927a66b5"
   }
 }
 
diff --git a/docs/source/tutorial/add_related_process_1.http b/docs/source/tutorial/add_related_process_1.http
@@ -1,26 +1,26 @@
-POST /api/2.5/lots/962fa6efd16d4d55acd4b1f88bb7cec9/related_processes HTTP/1.0
+POST /api/2.5/lots/9c54261550f74c99b25b7a8ab16aa97a/related_processes HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 83
 Content-Type: application/json
 Host: lb.api-sandbox.registry.ea.openprocurement.net
-X-Access-Token: f3e126c1e7734b1b8887cfbf17478baa
+X-Access-Token: 53ce42a01cb745819303b64031afbb2b
 DATA:
 {
   "data": {
     "type": "asset", 
-    "relatedProcessID": "a9cbac9550db413284dcfbbf9f9cd028"
+    "relatedProcessID": "9f99bebd24b54939ae1cbe4a81c1afa4"
   }
 }
 
 Response: 201 Created
 Content-Type: application/json
-Location: http://lb.api-sandbox.registry.ea.openprocurement.net/api/2.5/lots/962fa6efd16d4d55acd4b1f88bb7cec9/related_processes/c9dd31ba70cf485fa30231f3a19a81dc
+Location: http://lb.api-sandbox.registry.ea.openprocurement.net/api/2.5/lots/9c54261550f74c99b25b7a8ab16aa97a/related_processes/1c1943ff7c4d42ee983ec84afd486313
 X-Content-Type-Options: nosniff
 {
   "data": {
     "type": "asset", 
-    "id": "c9dd31ba70cf485fa30231f3a19a81dc", 
-    "relatedProcessID": "a9cbac9550db413284dcfbbf9f9cd028"
+    "id": "1c1943ff7c4d42ee983ec84afd486313", 
+    "relatedProcessID": "9f99bebd24b54939ae1cbe4a81c1afa4"
   }
 }
 
diff --git a/docs/source/tutorial/blank-lot-view.http b/docs/source/tutorial/blank-lot-view.http
@@ -1,4 +1,4 @@
-GET /api/2.5/lots/962fa6efd16d4d55acd4b1f88bb7cec9 HTTP/1.0
+GET /api/2.5/lots/9c54261550f74c99b25b7a8ab16aa97a HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Host: lb.api-sandbox.registry.ea.openprocurement.net
 
@@ -8,81 +8,69 @@ X-Content-Type-Options: nosniff
 {
   "data": {
     "status": "draft", 
-    "lotID": "UA-LR-DGF-2019-02-04-000002", 
+    "lotID": "UA-LR-DGF-2019-03-19-000002", 
     "contracts": [
       {
         "status": "scheduled", 
         "type": "yoke", 
-        "id": "1f33640dca2f43b48787d5bceacb577a"
+        "id": "eb92ac079d3945c9ae2d6a8c31877c3f"
       }
     ], 
     "lotType": "loki", 
-    "dateModified": "2019-02-04T16:38:17.596837+02:00", 
+    "dateModified": "2019-03-19T15:23:06.324966+02:00", 
     "owner": "broker", 
     "documents": [
       {
         "description": "Перелік та реквізити авторизованих електронних майданчиків (найменування установи банку, її адреса та номери рахунків, відкритих для внесення гарантійного внеску, реєстраційного внеску)", 
         "title": "Перелік та реквізити авторизованих електронних майданчиків", 
         "url": "https://prozorro.sale/info/elektronni-majdanchiki-ets-prozorroprodazhi-cbd2", 
         "documentOf": "lot", 
-        "datePublished": "2019-02-04T16:38:17.586506+02:00", 
+        "datePublished": "2019-03-19T15:23:06.314674+02:00", 
         "documentType": "x_PlatformLegalDetails", 
-        "dateModified": "2019-02-04T16:38:17.586543+02:00", 
-        "id": "fa6b62b6f5e2400d963dd502d2d83623"
+        "dateModified": "2019-03-19T15:23:06.314696+02:00", 
+        "id": "b5506c8a9353481f8e6fcc964242ea79"
       }
     ], 
     "auctions": [
       {
         "status": "scheduled", 
         "tenderAttempts": 1, 
         "procurementMethodType": "sellout.english", 
-        "id": "11f0bee4cf814e36b91ede32155fce67", 
         "auctionParameters": {
           "type": "english"
         }, 
-        "registrationFee": {
-          "currency": "UAH", 
-          "amount": 834.6
-        }
+        "id": "cb14fea47f324446b083099e026b1de4"
       }, 
       {
         "status": "scheduled", 
         "tenderAttempts": 2, 
         "procurementMethodType": "sellout.english", 
-        "id": "ec32cd417be24997af164a661733756d", 
         "auctionParameters": {
           "type": "english"
         }, 
-        "registrationFee": {
-          "currency": "UAH", 
-          "amount": 834.6
-        }
+        "id": "5bbdebcd2d9748aa89220f01f17a18f3"
       }, 
       {
         "status": "scheduled", 
         "tenderAttempts": 3, 
         "procurementMethodType": "sellout.insider", 
-        "id": "fe87453d392845819b75c11d66cc414d", 
         "auctionParameters": {
           "type": "insider", 
           "dutchSteps": 99
         }, 
-        "registrationFee": {
-          "currency": "UAH", 
-          "amount": 834.6
-        }
+        "id": "b2998f0368c340609fa56fa0a12fdcfa"
       }
     ], 
-    "date": "2019-02-04T16:38:17.594789+02:00", 
+    "date": "2019-03-19T15:23:06.323072+02:00", 
     "decisions": [
       {
-        "decisionDate": "2019-02-04T16:38:17.514327+02:00", 
+        "decisionDate": "2019-03-19T15:23:06.251270+02:00", 
         "decisionID": "initialDecisionID", 
-        "id": "5d1a237b9525459d9262153c5ae5cb5f", 
+        "id": "88efebe2abf542319f0a79b3645f5d9e", 
         "decisionOf": "lot"
       }
     ], 
-    "id": "962fa6efd16d4d55acd4b1f88bb7cec9"
+    "id": "9c54261550f74c99b25b7a8ab16aa97a"
   }
 }
 
diff --git a/docs/source/tutorial/compose_lot_patch_1.http b/docs/source/tutorial/compose_lot_patch_1.http
@@ -1,9 +1,9 @@
-PATCH /api/2.5/lots/962fa6efd16d4d55acd4b1f88bb7cec9/auctions/11f0bee4cf814e36b91ede32155fce67 HTTP/1.0
+PATCH /api/2.5/lots/9c54261550f74c99b25b7a8ab16aa97a/auctions/cb14fea47f324446b083099e026b1de4 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 507
+Content-Length: 449
 Content-Type: application/json
 Host: lb.api-sandbox.registry.ea.openprocurement.net
-X-Access-Token: f3e126c1e7734b1b8887cfbf17478baa
+X-Access-Token: 53ce42a01cb745819303b64031afbb2b
 DATA:
 {
   "data": {
@@ -22,10 +22,7 @@ DATA:
       "amount": 300.87, 
       "valueAddedTaxIncluded": true
     }, 
-    "auctionPeriod": {
-      "startDate": "2019-02-08T16:43:16.610865+02:00"
-    }, 
-    "registrationFee": {
+    "guarantee": {
       "currency": "UAH", 
       "amount": 700.87
     }, 
@@ -34,9 +31,8 @@ DATA:
       "amount": 3000.87, 
       "valueAddedTaxIncluded": true
     }, 
-    "guarantee": {
-      "currency": "UAH", 
-      "amount": 700.87
+    "auctionPeriod": {
+      "startDate": "2019-03-25T15:28:05.257425+02:00"
     }
   }
 }
@@ -63,23 +59,19 @@ X-Content-Type-Options: nosniff
       "valueAddedTaxIncluded": true
     }, 
     "auctionPeriod": {
-      "startDate": "2019-02-08T16:43:16.610865+02:00"
-    }, 
-    "registrationFee": {
-      "currency": "UAH", 
-      "amount": 700.87
+      "startDate": "2019-03-25T15:28:05.257425+02:00"
     }, 
+    "tenderAttempts": 1, 
     "procurementMethodType": "sellout.english", 
     "value": {
       "currency": "UAH", 
       "amount": 3000.87, 
       "valueAddedTaxIncluded": true
     }, 
-    "id": "11f0bee4cf814e36b91ede32155fce67", 
     "auctionParameters": {
       "type": "english"
     }, 
-    "tenderAttempts": 1, 
+    "id": "cb14fea47f324446b083099e026b1de4", 
     "guarantee": {
       "currency": "UAH", 
       "amount": 700.87

diff --git a/docs/source/tutorial/compose_lot_patch_2.http b/docs/source/tutorial/compose_lot_patch_2.http
@@ -1,9 +1,9 @@
-PATCH /api/2.5/lots/962fa6efd16d4d55acd4b1f88bb7cec9/auctions/ec32cd417be24997af164a661733756d HTTP/1.0
+PATCH /api/2.5/lots/9c54261550f74c99b25b7a8ab16aa97a/auctions/5bbdebcd2d9748aa89220f01f17a18f3 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 43
 Content-Type: application/json
 Host: lb.api-sandbox.registry.ea.openprocurement.net
-X-Access-Token: f3e126c1e7734b1b8887cfbf17478baa
+X-Access-Token: 53ce42a01cb745819303b64031afbb2b
 DATA:
 {
   "data": {
@@ -32,22 +32,18 @@ X-Content-Type-Options: nosniff
       "amount": 150.44, 
       "valueAddedTaxIncluded": true
     }, 
-    "registrationFee": {
-      "currency": "UAH", 
-      "amount": 700.87
-    }, 
+    "tenderAttempts": 2, 
     "procurementMethodType": "sellout.english", 
     "value": {
       "currency": "UAH", 
       "amount": 1500.44, 
       "valueAddedTaxIncluded": true
     }, 
     "tenderingDuration": "P25DT12H", 
-    "id": "ec32cd417be24997af164a661733756d", 
     "auctionParameters": {
       "type": "english"
     }, 
-    "tenderAttempts": 2, 
+    "id": "5bbdebcd2d9748aa89220f01f17a18f3", 
     "guarantee": {
       "currency": "UAH", 
       "amount": 350.44