add cause/causeDescription fields

openprocurement · Mar 17, 2016 · 463947a · 463947a
1 parent 690bbe0
commit 463947a
Show file tree

Hide file tree

Showing 45 changed files with 354 additions and 345 deletions.
diff --git a/docs.py b/docs.py
@@ -134,9 +134,12 @@
 
 test_tender_negotiation_data = deepcopy(test_tender_data)
 test_tender_negotiation_data['procurementMethodType'] = "negotiation"
+test_tender_negotiation_data['cause'] = "twiceUnsuccessful"
+test_tender_negotiation_data['causeDescription'] = "original tender has failed twice"
 
 test_tender_negotiation_quick_data = deepcopy(test_tender_data)
 test_tender_negotiation_quick_data['procurementMethodType'] = "negotiation.quick"
+test_tender_negotiation_quick_data['causeDescription'] = "chupacabra"
 
 class DumpsTestAppwebtest(TestApp):
 

diff --git a/docs/source/tutorial/active-cancellation.http b/docs/source/tutorial/active-cancellation.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/7f6e7b1b66c043b4bf34a9c0a067beb4/cancellations/4e94b08ebc964a2ba226d26887b07631?acc_token=88d696fc99b94f9fa6cb4d279c0366ac HTTP/1.0
+PATCH /api/0.12/tenders/20a01aaf77b54546bf0d964dddf4c478/cancellations/92e2ba138e6840eb84583e62abe6a06b?acc_token=a27778dbf2c94d8cb9f105d38ab1703c HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 30
 Content-Type: application/json
@@ -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.0/tenders/7f6e7b1b66c043b4bf34a9c0a067beb4/cancellations/4e94b08ebc964a2ba226d26887b07631/documents/aca555352d51444d8ae522a0fd107387?download=d873992fd5f148979acad67a02ea2eb7", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/20a01aaf77b54546bf0d964dddf4c478/cancellations/92e2ba138e6840eb84583e62abe6a06b/documents/5a9e7c61083249a1b290b3e04096b0bd?download=9da61d1824fa490abf59388d13122bd4", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-16T17:33:31.431525+02:00", 
-        "id": "aca555352d51444d8ae522a0fd107387", 
-        "dateModified": "2016-03-16T17:33:31.431564+02:00"
+        "datePublished": "2016-03-17T16:49:29.668162+02:00", 
+        "id": "5a9e7c61083249a1b290b3e04096b0bd", 
+        "dateModified": "2016-03-17T16:49:29.668201+02:00"
       }, 
       {
         "description": "Changed description", 
         "title": "Notice-2.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/7f6e7b1b66c043b4bf34a9c0a067beb4/cancellations/4e94b08ebc964a2ba226d26887b07631/documents/aca555352d51444d8ae522a0fd107387?download=9c9d398ddebd4ae88f29a21a58c13816", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/20a01aaf77b54546bf0d964dddf4c478/cancellations/92e2ba138e6840eb84583e62abe6a06b/documents/5a9e7c61083249a1b290b3e04096b0bd?download=3c52fc14b1f04a6a8fff93956e3bfa98", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-16T17:33:31.431525+02:00", 
-        "id": "aca555352d51444d8ae522a0fd107387", 
-        "dateModified": "2016-03-16T17:33:31.744432+02:00"
+        "datePublished": "2016-03-17T16:49:29.668162+02:00", 
+        "id": "5a9e7c61083249a1b290b3e04096b0bd", 
+        "dateModified": "2016-03-17T16:49:29.966978+02:00"
       }
     ], 
     "reason": "cancellation reason", 
     "reasonType": "unsuccessful", 
-    "date": "2016-03-16T17:33:31.165493+02:00", 
+    "date": "2016-03-17T16:49:29.375968+02:00", 
     "cancellationOf": "tender", 
-    "id": "4e94b08ebc964a2ba226d26887b07631"
+    "id": "92e2ba138e6840eb84583e62abe6a06b"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-accept.http b/docs/source/tutorial/award-complaint-accept.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2 HTTP/1.0
+PATCH /api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576 HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 32
 Content-Type: application/json
@@ -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.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2/documents/c9837a88dd944125a7cb3b0c47186287?download=1a5b6e62bfd64f60907f77bf93fe5982", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576/documents/a60c0483755f425c8f33c9df00da2c7c?download=953f698246924aceb1c53c6b82469034", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-16T17:33:37.647867+02:00", 
-        "id": "c9837a88dd944125a7cb3b0c47186287", 
-        "dateModified": "2016-03-16T17:33:37.647920+02:00"
+        "datePublished": "2016-03-17T16:49:35.916679+02:00", 
+        "id": "a60c0483755f425c8f33c9df00da2c7c", 
+        "dateModified": "2016-03-17T16:49:35.916718+02:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -50,13 +50,13 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateAccepted": "2016-03-16T17:33:38.455545+02:00", 
-    "dateSubmitted": "2016-03-16T17:33:37.839857+02:00", 
-    "complaintID": "UA-2016-03-16-000001.1", 
-    "date": "2016-03-16T17:33:37.515318+02:00", 
+    "dateAccepted": "2016-03-17T16:49:36.742848+02:00", 
+    "dateSubmitted": "2016-03-17T16:49:36.094351+02:00", 
+    "complaintID": "UA-2016-03-17-000001.1", 
+    "date": "2016-03-17T16:49:35.783395+02:00", 
     "acceptance": true, 
     "type": "complaint", 
-    "id": "413dc414a4864db9a445ac0ebf9879f2"
+    "id": "2220bbdc24c14fb9a5ac790092b68576"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-cancel.http b/docs/source/tutorial/award-complaint-cancel.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/0e808b170a574b66b39299255ec9bcc0?acc_token=357ac4e1f0c64acfba290d66219757b6 HTTP/1.0
+PATCH /api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/03d60e96090b424e8a3b6cfe93acd830?acc_token=d5557233dde4449b9fa3ae96fb16451d HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 150
 Content-Type: application/json
@@ -40,12 +40,12 @@ Content-Type: application/json; charset=UTF-8
     }, 
     "title": "Недостатньо інформації", 
     "cancellationReason": "Умови виправлено", 
-    "dateCanceled": "2016-03-16T17:33:39.599914+02:00", 
-    "dateSubmitted": "2016-03-16T17:33:39.429872+02:00", 
-    "complaintID": "UA-2016-03-16-000001.4", 
-    "date": "2016-03-16T17:33:39.428382+02:00", 
+    "dateCanceled": "2016-03-17T16:49:37.881122+02:00", 
+    "dateSubmitted": "2016-03-17T16:49:37.707537+02:00", 
+    "complaintID": "UA-2016-03-17-000001.4", 
+    "date": "2016-03-17T16:49:37.705898+02:00", 
     "type": "complaint", 
-    "id": "0e808b170a574b66b39299255ec9bcc0"
+    "id": "03d60e96090b424e8a3b6cfe93acd830"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-complaint.http b/docs/source/tutorial/award-complaint-complaint.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2?acc_token=d6ad1384c8ab41b684c3fe8ef117cc72 HTTP/1.0
+PATCH /api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576?acc_token=84d419f21a624b81b3b31c5f959dbd66 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 31
 Content-Type: application/json
@@ -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.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2/documents/c9837a88dd944125a7cb3b0c47186287?download=1a5b6e62bfd64f60907f77bf93fe5982", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576/documents/a60c0483755f425c8f33c9df00da2c7c?download=953f698246924aceb1c53c6b82469034", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-16T17:33:37.647867+02:00", 
-        "id": "c9837a88dd944125a7cb3b0c47186287", 
-        "dateModified": "2016-03-16T17:33:37.647920+02:00"
+        "datePublished": "2016-03-17T16:49:35.916679+02:00", 
+        "id": "a60c0483755f425c8f33c9df00da2c7c", 
+        "dateModified": "2016-03-17T16:49:35.916718+02:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -50,11 +50,11 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateSubmitted": "2016-03-16T17:33:37.839857+02:00", 
-    "complaintID": "UA-2016-03-16-000001.1", 
-    "date": "2016-03-16T17:33:37.515318+02:00", 
+    "dateSubmitted": "2016-03-17T16:49:36.094351+02:00", 
+    "complaintID": "UA-2016-03-17-000001.1", 
+    "date": "2016-03-17T16:49:35.783395+02:00", 
     "type": "complaint", 
-    "id": "413dc414a4864db9a445ac0ebf9879f2"
+    "id": "2220bbdc24c14fb9a5ac790092b68576"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-decline.http b/docs/source/tutorial/award-complaint-decline.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/0630a15f82b840bcb6c5ed0fa4b6b6a2 HTTP/1.0
+PATCH /api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/3965ae6a93cf4b6194e86d45dc6d7da1 HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 32
 Content-Type: application/json
@@ -15,7 +15,7 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "declined", 
-    "dateDecision": "2016-03-16T17:33:39.100290+02:00", 
+    "dateDecision": "2016-03-17T16:49:37.386136+02:00", 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
     "author": {
       "contactPoint": {
@@ -39,13 +39,13 @@ Content-Type: application/json; charset=UTF-8
       }
     }, 
     "acceptance": true, 
-    "dateAccepted": "2016-03-16T17:33:38.599506+02:00", 
-    "dateSubmitted": "2016-03-16T17:33:38.129455+02:00", 
-    "complaintID": "UA-2016-03-16-000001.3", 
-    "date": "2016-03-16T17:33:38.127998+02:00", 
+    "dateAccepted": "2016-03-17T16:49:36.889748+02:00", 
+    "dateSubmitted": "2016-03-17T16:49:36.418935+02:00", 
+    "complaintID": "UA-2016-03-17-000001.3", 
+    "date": "2016-03-17T16:49:36.417344+02:00", 
     "title": "Недостатньо інформації", 
     "type": "complaint", 
-    "id": "0630a15f82b840bcb6c5ed0fa4b6b6a2"
+    "id": "3965ae6a93cf4b6194e86d45dc6d7da1"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-reject.http b/docs/source/tutorial/award-complaint-reject.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/fd058b336c2b4d3aa49145b68626f98b HTTP/1.0
+PATCH /api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/af5dadb2dee641fa976dc6db9cbc124d HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 31
 Content-Type: application/json
@@ -15,7 +15,7 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "invalid", 
-    "dateDecision": "2016-03-16T17:33:38.310024+02:00", 
+    "dateDecision": "2016-03-17T16:49:36.599200+02:00", 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
     "author": {
       "contactPoint": {
@@ -39,12 +39,12 @@ Content-Type: application/json; charset=UTF-8
       }
     }, 
     "acceptance": false, 
-    "dateSubmitted": "2016-03-16T17:33:37.958429+02:00", 
-    "complaintID": "UA-2016-03-16-000001.2", 
-    "date": "2016-03-16T17:33:37.956872+02:00", 
+    "dateSubmitted": "2016-03-17T16:49:36.252876+02:00", 
+    "complaintID": "UA-2016-03-17-000001.2", 
+    "date": "2016-03-17T16:49:36.251467+02:00", 
     "title": "Недостатньо інформації", 
     "type": "complaint", 
-    "id": "fd058b336c2b4d3aa49145b68626f98b"
+    "id": "af5dadb2dee641fa976dc6db9cbc124d"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-resolution-upload.http b/docs/source/tutorial/award-complaint-resolution-upload.http
@@ -1,22 +1,22 @@
-POST /api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2/documents HTTP/1.0
+POST /api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576/documents HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 199
-Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy755870575597$
+Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy831487605984$
 Host: api-sandbox.openprocurement.org
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2/documents/e5510bab0eca49bc9262b9c00f52aa69
+Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576/documents/12de24bb47754c37a6811b8c1f840154
 {
   "data": {
     "author": "aboveThresholdReviewers", 
     "title": "ComplaintResolution.pdf", 
-    "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2/documents/e5510bab0eca49bc9262b9c00f52aa69?download=2ee4ce9be0104aff9ec790bbbdd5d571", 
+    "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576/documents/12de24bb47754c37a6811b8c1f840154?download=1843fc9ad399450292577809c8c55ddc", 
     "format": "application/pdf", 
     "documentOf": "tender", 
-    "datePublished": "2016-03-16T17:33:38.774661+02:00", 
-    "id": "e5510bab0eca49bc9262b9c00f52aa69", 
-    "dateModified": "2016-03-16T17:33:38.774711+02:00"
+    "datePublished": "2016-03-17T16:49:37.045085+02:00", 
+    "id": "12de24bb47754c37a6811b8c1f840154", 
+    "dateModified": "2016-03-17T16:49:37.045124+02:00"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-resolve.http b/docs/source/tutorial/award-complaint-resolve.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2 HTTP/1.0
+PATCH /api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576 HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 33
 Content-Type: application/json
@@ -15,27 +15,27 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "satisfied", 
-    "dateDecision": "2016-03-16T17:33:38.943137+02:00", 
+    "dateDecision": "2016-03-17T16:49:37.224754+02:00", 
     "documents": [
       {
         "author": "complaint_owner", 
         "title": "Complaint_Attachement.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2/documents/c9837a88dd944125a7cb3b0c47186287?download=1a5b6e62bfd64f60907f77bf93fe5982", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576/documents/a60c0483755f425c8f33c9df00da2c7c?download=953f698246924aceb1c53c6b82469034", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-16T17:33:37.647867+02:00", 
-        "id": "c9837a88dd944125a7cb3b0c47186287", 
-        "dateModified": "2016-03-16T17:33:37.647920+02:00"
+        "datePublished": "2016-03-17T16:49:35.916679+02:00", 
+        "id": "a60c0483755f425c8f33c9df00da2c7c", 
+        "dateModified": "2016-03-17T16:49:35.916718+02:00"
       }, 
       {
         "author": "aboveThresholdReviewers", 
         "title": "ComplaintResolution.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/525da6c01ed84ee380c26372b98ac98c/awards/8eb31cfbd8f24dc39192e3cf9619afee/complaints/413dc414a4864db9a445ac0ebf9879f2/documents/e5510bab0eca49bc9262b9c00f52aa69?download=2ee4ce9be0104aff9ec790bbbdd5d571", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/76435c934efe457db2739f92307121a9/awards/77f3c02645264dd9aa9f37abdda0e0ff/complaints/2220bbdc24c14fb9a5ac790092b68576/documents/12de24bb47754c37a6811b8c1f840154?download=1843fc9ad399450292577809c8c55ddc", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-16T17:33:38.774661+02:00", 
-        "id": "e5510bab0eca49bc9262b9c00f52aa69", 
-        "dateModified": "2016-03-16T17:33:38.774711+02:00"
+        "datePublished": "2016-03-17T16:49:37.045085+02:00", 
+        "id": "12de24bb47754c37a6811b8c1f840154", 
+        "dateModified": "2016-03-17T16:49:37.045124+02:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -61,13 +61,13 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateAccepted": "2016-03-16T17:33:38.455545+02:00", 
-    "dateSubmitted": "2016-03-16T17:33:37.839857+02:00", 
-    "complaintID": "UA-2016-03-16-000001.1", 
-    "date": "2016-03-16T17:33:37.515318+02:00", 
+    "dateAccepted": "2016-03-17T16:49:36.742848+02:00", 
+    "dateSubmitted": "2016-03-17T16:49:36.094351+02:00", 
+    "complaintID": "UA-2016-03-17-000001.1", 
+    "date": "2016-03-17T16:49:35.783395+02:00", 
     "acceptance": true, 
     "type": "complaint", 
-    "id": "413dc414a4864db9a445ac0ebf9879f2"
+    "id": "2220bbdc24c14fb9a5ac790092b68576"
   }
 }