Complaints: pending=>stopping

openprocurement · May 6, 2016 · c587ffe · c587ffe
1 parent bd0e1f2
commit c587ffe
Show file tree

Hide file tree

Showing 23 changed files with 234 additions and 236 deletions.
diff --git a/docs.py b/docs.py
@@ -691,7 +691,7 @@ def test_award_complaints(self):
             response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(self.tender_id, award_id), complaint_data)
             self.assertEqual(response.status, '201 Created')
 
-        response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(self.tender_id, award_id), complaint_data)
+        response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(self.tender_id, award_id), complaint)
         self.assertEqual(response.status, '201 Created')
 
         with open('docs/source/tutorial/award-complaint-cancel.http', 'w') as self.app.file_obj:

diff --git a/docs/source/complaints.rst b/docs/source/complaints.rst
@@ -24,9 +24,8 @@ Tender Award Complaints
         }
         satisfied -> resolved;
         edge[style=dashed];
-        draft -> pending;
-        {draft,pending} -> cancelled; 
-        accepted -> stopping;
+        draft -> {pending,cancelled}; 
+        {pending,accepted} -> stopping;
         edge[style=bold];
         pending -> {accepted,invalid};
         stopping -> stopped;

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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/503dffbcf4c246f29ad480870ac62160 HTTP/1.0
+PATCH /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/3b7f8f221b6e4cfe934548bbf562265e 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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/503dffbcf4c246f29ad480870ac62160/documents/1cab46905a88401dbdf681caed8e747b?download=242257ac391845b7bf9eae758f6f7b65", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/3b7f8f221b6e4cfe934548bbf562265e/documents/18b712e0c8ab4a11bae22ebfecac4b40?download=077dbc9cccff49bb83c0ff34df85750a", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-04-15T12:59:09.936871+03:00", 
-        "id": "1cab46905a88401dbdf681caed8e747b", 
-        "dateModified": "2016-04-15T12:59:09.936919+03:00"
+        "datePublished": "2016-05-06T12:45:38.188566+03:00", 
+        "id": "18b712e0c8ab4a11bae22ebfecac4b40", 
+        "dateModified": "2016-05-06T12:45:38.188604+03:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -50,13 +50,13 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateAccepted": "2016-04-15T12:59:11.399626+03:00", 
-    "dateSubmitted": "2016-04-15T12:59:10.243616+03:00", 
-    "complaintID": "UA-2016-04-15-000001.1", 
-    "date": "2016-04-15T12:59:09.678316+03:00", 
+    "dateAccepted": "2016-05-06T12:45:39.324829+03:00", 
+    "dateSubmitted": "2016-05-06T12:45:38.321120+03:00", 
+    "complaintID": "UA-2016-05-06-000001.1", 
+    "date": "2016-05-06T12:45:37.901333+03:00", 
     "acceptance": true, 
     "type": "complaint", 
-    "id": "503dffbcf4c246f29ad480870ac62160"
+    "id": "3b7f8f221b6e4cfe934548bbf562265e"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-accepted-stopped.http b/docs/source/tutorial/award-complaint-accepted-stopped.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/a4ab15544ac24a03800ec43ec0dc2e67 HTTP/1.0
+PATCH /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/0b1177c6cc7849e586748bb1e468514f HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 217
 Content-Type: application/json
@@ -16,13 +16,13 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "stopped", 
-    "dateDecision": "2016-04-15T12:59:12.991890+03:00", 
+    "dateDecision": "2016-05-06T12:45:40.779878+03:00", 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
     "title": "Недостатньо інформації", 
     "decision": "Тендер скасовується замовником", 
     "acceptance": true, 
-    "dateCanceled": "2016-04-15T12:59:12.991926+03:00", 
-    "dateAccepted": "2016-04-15T12:59:12.111494+03:00", 
+    "dateCanceled": "2016-05-06T12:45:40.779920+03:00", 
+    "dateAccepted": "2016-05-06T12:45:39.859081+03:00", 
     "author": {
       "contactPoint": {
         "email": "soleksuk@gmail.com", 
@@ -44,11 +44,11 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateSubmitted": "2016-04-15T12:59:11.013149+03:00", 
-    "complaintID": "UA-2016-04-15-000001.5", 
-    "date": "2016-04-15T12:59:11.011676+03:00", 
+    "dateSubmitted": "2016-05-06T12:45:38.981442+03:00", 
+    "complaintID": "UA-2016-05-06-000001.5", 
+    "date": "2016-05-06T12:45:38.979981+03:00", 
     "type": "complaint", 
-    "id": "a4ab15544ac24a03800ec43ec0dc2e67"
+    "id": "0b1177c6cc7849e586748bb1e468514f"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-accepted-stopping.http b/docs/source/tutorial/award-complaint-accepted-stopping.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/db0318402d7d48a79aa782fe25fd53b8?acc_token=42e69a03a66f46e8bba9a4b248676c7b HTTP/1.0
+PATCH /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/76a7592d27ac4cc9bc874fe115f5a097?acc_token=6e20b19ed08648e5a686625162cb4bc0 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 228
 Content-Type: application/json
@@ -40,14 +40,14 @@ Content-Type: application/json; charset=UTF-8
     }, 
     "acceptance": true, 
     "cancellationReason": "Тендер скасовується замовником", 
-    "dateCanceled": "2016-04-15T12:59:15.052211+03:00", 
-    "dateAccepted": "2016-04-15T12:59:11.929009+03:00", 
-    "dateSubmitted": "2016-04-15T12:59:10.852869+03:00", 
-    "complaintID": "UA-2016-04-15-000001.4", 
-    "date": "2016-04-15T12:59:10.851362+03:00", 
+    "dateCanceled": "2016-05-06T12:45:41.797638+03:00", 
+    "dateAccepted": "2016-05-06T12:45:39.673737+03:00", 
+    "dateSubmitted": "2016-05-06T12:45:38.792852+03:00", 
+    "complaintID": "UA-2016-05-06-000001.4", 
+    "date": "2016-05-06T12:45:38.790941+03:00", 
     "title": "Недостатньо інформації", 
     "type": "complaint", 
-    "id": "db0318402d7d48a79aa782fe25fd53b8"
+    "id": "76a7592d27ac4cc9bc874fe115f5a097"
   }
 }
 
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/d69d836d35ba4bd48672234e11b7820f/awards/4c43dd0f7ace43a8915cc4b219fdb62e/complaints/5d1e55f90bb145e2acfddbcc9cda111e?acc_token=31c3e85c6cd04a46bfc2d0ee29679fc2 HTTP/1.0
+PATCH /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/75aa7d4e609c4cec8052a1f896cd9f5d/complaints/9282c0aae5ad42f7acc6615262ec7585?acc_token=0857f9ffad0e4db3bb5b811df25d1b52 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 150
 Content-Type: application/json
@@ -40,12 +40,11 @@ Content-Type: application/json; charset=UTF-8
     }, 
     "title": "Недостатньо інформації", 
     "cancellationReason": "Умови виправлено", 
-    "dateCanceled": "2016-04-15T12:59:17.779589+03:00", 
-    "dateSubmitted": "2016-04-15T12:59:17.219115+03:00", 
-    "complaintID": "UA-2016-04-15-000001.7", 
-    "date": "2016-04-15T12:59:17.217175+03:00", 
+    "dateCanceled": "2016-05-06T12:45:42.934808+03:00", 
+    "complaintID": "UA-2016-05-06-000001.7", 
+    "date": "2016-05-06T12:45:42.677640+03:00", 
     "type": "complaint", 
-    "id": "5d1e55f90bb145e2acfddbcc9cda111e"
+    "id": "9282c0aae5ad42f7acc6615262ec7585"
   }
 }
 
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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/503dffbcf4c246f29ad480870ac62160?acc_token=189e6e16d8a448069c75e8bf8b621809 HTTP/1.0
+PATCH /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/3b7f8f221b6e4cfe934548bbf562265e?acc_token=e22f98059c3140c4be4b8eab7ee1854e 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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/503dffbcf4c246f29ad480870ac62160/documents/1cab46905a88401dbdf681caed8e747b?download=242257ac391845b7bf9eae758f6f7b65", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/3b7f8f221b6e4cfe934548bbf562265e/documents/18b712e0c8ab4a11bae22ebfecac4b40?download=077dbc9cccff49bb83c0ff34df85750a", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-04-15T12:59:09.936871+03:00", 
-        "id": "1cab46905a88401dbdf681caed8e747b", 
-        "dateModified": "2016-04-15T12:59:09.936919+03:00"
+        "datePublished": "2016-05-06T12:45:38.188566+03:00", 
+        "id": "18b712e0c8ab4a11bae22ebfecac4b40", 
+        "dateModified": "2016-05-06T12:45:38.188604+03:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -50,11 +50,11 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateSubmitted": "2016-04-15T12:59:10.243616+03:00", 
-    "complaintID": "UA-2016-04-15-000001.1", 
-    "date": "2016-04-15T12:59:09.678316+03:00", 
+    "dateSubmitted": "2016-05-06T12:45:38.321120+03:00", 
+    "complaintID": "UA-2016-05-06-000001.1", 
+    "date": "2016-05-06T12:45:37.901333+03:00", 
     "type": "complaint", 
-    "id": "503dffbcf4c246f29ad480870ac62160"
+    "id": "3b7f8f221b6e4cfe934548bbf562265e"
   }
 }
 
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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/29ebf86ddb96457d94a55b883dbe09fe HTTP/1.0
+PATCH /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/c47cc82df42f45ed8b62e6e56f5eaac6 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-04-15T12:59:12.730256+03:00", 
+    "dateDecision": "2016-05-06T12:45:40.531965+03:00", 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
     "author": {
       "contactPoint": {
@@ -39,13 +39,13 @@ Content-Type: application/json; charset=UTF-8
       }
     }, 
     "acceptance": true, 
-    "dateAccepted": "2016-04-15T12:59:11.706227+03:00", 
-    "dateSubmitted": "2016-04-15T12:59:10.665831+03:00", 
-    "complaintID": "UA-2016-04-15-000001.3", 
-    "date": "2016-04-15T12:59:10.663676+03:00", 
+    "dateAccepted": "2016-05-06T12:45:39.490270+03:00", 
+    "dateSubmitted": "2016-05-06T12:45:38.628637+03:00", 
+    "complaintID": "UA-2016-05-06-000001.3", 
+    "date": "2016-05-06T12:45:38.626706+03:00", 
     "title": "Недостатньо інформації", 
     "type": "complaint", 
-    "id": "29ebf86ddb96457d94a55b883dbe09fe"
+    "id": "c47cc82df42f45ed8b62e6e56f5eaac6"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-newaward.http b/docs/source/tutorial/award-complaint-newaward.http
@@ -1,4 +1,4 @@
-POST /api/2.0/tenders/d69d836d35ba4bd48672234e11b7820f/awards?acc_token=7bf4a579a20440faad951217a79e2e3f HTTP/1.0
+POST /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards?acc_token=255362cfb32f46c49a20f60ccf1eddce HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 1284
 Content-Type: application/json
@@ -42,12 +42,12 @@ 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/d69d836d35ba4bd48672234e11b7820f/awards/4c43dd0f7ace43a8915cc4b219fdb62e
+Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/75aa7d4e609c4cec8052a1f896cd9f5d
 {
   "data": {
     "status": "pending", 
     "complaintPeriod": {
-      "startDate": "2016-04-15T12:59:14.034328+03:00"
+      "startDate": "2016-05-06T12:45:41.362288+03:00"
     }, 
     "suppliers": [
       {
@@ -77,8 +77,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.0/tenders/d69d836d35ba4bd
       "amount": 475000.0, 
       "valueAddedTaxIncluded": true
     }, 
-    "date": "2016-04-15T12:59:14.032345+03:00", 
-    "id": "4c43dd0f7ace43a8915cc4b219fdb62e"
+    "date": "2016-05-06T12:45:41.360870+03:00", 
+    "id": "75aa7d4e609c4cec8052a1f896cd9f5d"
   }
 }
 
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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/8dec386e38134e92a8f91fbcf36963fb HTTP/1.0
+PATCH /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/376cedbdb98d420bbcc4e04a62ad4081 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-04-15T12:59:11.180738+03:00", 
+    "dateDecision": "2016-05-06T12:45:39.157982+03:00", 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
     "author": {
       "contactPoint": {
@@ -39,12 +39,12 @@ Content-Type: application/json; charset=UTF-8
       }
     }, 
     "acceptance": false, 
-    "dateSubmitted": "2016-04-15T12:59:10.473968+03:00", 
-    "complaintID": "UA-2016-04-15-000001.2", 
-    "date": "2016-04-15T12:59:10.472006+03:00", 
+    "dateSubmitted": "2016-05-06T12:45:38.444119+03:00", 
+    "complaintID": "UA-2016-05-06-000001.2", 
+    "date": "2016-05-06T12:45:38.442682+03:00", 
     "title": "Недостатньо інформації", 
     "type": "complaint", 
-    "id": "8dec386e38134e92a8f91fbcf36963fb"
+    "id": "376cedbdb98d420bbcc4e04a62ad4081"
   }
 }
 
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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/503dffbcf4c246f29ad480870ac62160/documents HTTP/1.0
+POST /api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/3b7f8f221b6e4cfe934548bbf562265e/documents HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 199
-Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy520697633244$
+Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy856314368078$
 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/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/503dffbcf4c246f29ad480870ac62160/documents/4ba6151e8afd44efa364532da11b3f11
+Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/3b7f8f221b6e4cfe934548bbf562265e/documents/23f26d7b4c814eacaede4497184fc5a6
 {
   "data": {
     "author": "aboveThresholdReviewers", 
     "title": "ComplaintResolution.pdf", 
-    "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/d69d836d35ba4bd48672234e11b7820f/awards/ae555b89fac646ab939861f6ec68dd5e/complaints/503dffbcf4c246f29ad480870ac62160/documents/4ba6151e8afd44efa364532da11b3f11?download=8c13faed4c80469f96f6ae5208761863", 
+    "url": "http://api-sandbox.openprocurement.org/api/2.3/tenders/e7c1081f497d40f197b3387c3959c9ea/awards/330b4090b4794739b29c013bea2ee298/complaints/3b7f8f221b6e4cfe934548bbf562265e/documents/23f26d7b4c814eacaede4497184fc5a6?download=56a4f2763dd0452cb27cb0c858c0919a", 
     "format": "application/pdf", 
     "documentOf": "tender", 
-    "datePublished": "2016-04-15T12:59:12.304270+03:00", 
-    "id": "4ba6151e8afd44efa364532da11b3f11", 
-    "dateModified": "2016-04-15T12:59:12.304308+03:00"
+    "datePublished": "2016-05-06T12:45:40.055759+03:00", 
+    "id": "23f26d7b4c814eacaede4497184fc5a6", 
+    "dateModified": "2016-05-06T12:45:40.055797+03:00"
   }
 }