Merge branch 'a342594055523082_complaints_off'

openprocurement · Jun 12, 2017 · 01ed8a4 · 01ed8a4
2 parents 549f980 + caa7617
commit 01ed8a4
Show file tree

Hide file tree

Showing 38 changed files with 469 additions and 490 deletions.
diff --git a/docs.py b/docs.py
@@ -831,18 +831,18 @@ def test_docs_complaints(self):
 
         with open('docs/source/complaints/complaint-escalate.http', 'w') as self.app.file_obj:
             response = self.app.patch_json('/tenders/{}/complaints/{}?acc_token={}'.format(
-                    self.tender_id, complaint2_id, complaint2_token), {"data":{"status":"pending","satisfied":False}})
+                    self.tender_id, complaint2_id, complaint2_token), {"data":{"status":"resolved","satisfied":False}})
             self.assertEqual(response.status, '200 OK')
 
         #### Rejecting Tender Conditions Complaint
         #
 
-        self.app.authorization = ('Basic', ('reviewer', ''))
+        #self.app.authorization = ('Basic', ('reviewer', ''))
 
-        with open('docs/source/complaints/complaint-reject.http', 'w') as self.app.file_obj:
-            response = self.app.patch_json('/tenders/{}/complaints/{}'.format(
-                    self.tender_id, complaint2_id), {"data":{"status":"invalid"}})
-            self.assertEqual(response.status, '200 OK')
+        #with open('docs/source/complaints/complaint-reject.http', 'w') as self.app.file_obj:
+            #response = self.app.patch_json('/tenders/{}/complaints/{}'.format(
+                    #self.tender_id, complaint2_id), {"data":{"status":"invalid"}})
+            #self.assertEqual(response.status, '200 OK')
 
         #### Submitting Tender Conditions Complaint Resolution
         #
@@ -858,7 +858,7 @@ def test_docs_complaints(self):
         self.app.patch_json('/tenders/{}/complaints/{}?acc_token={}'.format(
                 self.tender_id, complaint3_id, self.tender_token), {"data":{"status":"answered","resolutionType":"resolved","resolution":"Виправлено неконкурентні умови"}})
         self.app.patch_json('/tenders/{}/complaints/{}?acc_token={}'.format(
-                self.tender_id, complaint3_id, complaint3_token), {"data":{"status":"pending","satisfied":False}})
+                self.tender_id, complaint3_id, complaint3_token), {"data":{"status":"resolved","satisfied":False}})
 
         response = self.app.post_json('/tenders/{}/complaints'.format(
             self.tender_id), test_complaint_data)
@@ -869,30 +869,30 @@ def test_docs_complaints(self):
         self.app.patch_json('/tenders/{}/complaints/{}?acc_token={}'.format(
                 self.tender_id, complaint4_id, self.tender_token), {"data":{"status":"answered","resolutionType":"resolved","resolution":"Виправлено неконкурентні умови"}})
         self.app.patch_json('/tenders/{}/complaints/{}?acc_token={}'.format(
-                self.tender_id, complaint4_id, complaint4_token), {"data":{"status":"pending","satisfied":False}})
+                self.tender_id, complaint4_id, complaint4_token), {"data":{"status":"resolved","satisfied":False}})
 
 
-        self.app.authorization = ('Basic', ('reviewer', ''))
+        #self.app.authorization = ('Basic', ('reviewer', ''))
 
-        with open('docs/source/complaints/complaint-resolution-upload.http', 'w') as self.app.file_obj:
-            response = self.app.post_json('/tenders/{}/complaints/{}/documents'.format(
-                    self.tender_id, complaint3_id), {'data': {
-                    'title': u'ComplaintResolution.pdf',
-                    'url': self.generate_docservice_url(),
-                    'hash': 'md5:' + '0' * 32,
-                    'format': 'application/pdf',
-                }})
-            self.assertEqual(response.status, '201 Created')
+        #with open('docs/source/complaints/complaint-resolution-upload.http', 'w') as self.app.file_obj:
+            #response = self.app.post_json('/tenders/{}/complaints/{}/documents'.format(
+                    #self.tender_id, complaint3_id), {'data': {
+                    #'title': u'ComplaintResolution.pdf',
+                    #'url': self.generate_docservice_url(),
+                    #'hash': 'md5:' + '0' * 32,
+                    #'format': 'application/pdf',
+                #}})
+            #self.assertEqual(response.status, '201 Created')
 
-        with open('docs/source/complaints/complaint-resolve.http', 'w') as self.app.file_obj:
-            response = self.app.patch_json('/tenders/{}/complaints/{}'.format(
-                    self.tender_id, complaint3_id), {"data":{"status":"resolved"}})
-            self.assertEqual(response.status, '200 OK')
+        #with open('docs/source/complaints/complaint-resolve.http', 'w') as self.app.file_obj:
+            #response = self.app.patch_json('/tenders/{}/complaints/{}'.format(
+                    #self.tender_id, complaint3_id), {"data":{"status":"resolved"}})
+            #self.assertEqual(response.status, '200 OK')
 
-        with open('docs/source/complaints/complaint-decline.http', 'w') as self.app.file_obj:
-            response = self.app.patch_json('/tenders/{}/complaints/{}'.format(
-                    self.tender_id, complaint4_id), {"data":{"status":"declined"}})
-            self.assertEqual(response.status, '200 OK')
+        #with open('docs/source/complaints/complaint-decline.http', 'w') as self.app.file_obj:
+            #response = self.app.patch_json('/tenders/{}/complaints/{}'.format(
+                    #self.tender_id, complaint4_id), {"data":{"status":"declined"}})
+            #self.assertEqual(response.status, '200 OK')
 
         # create bids
         self.set_status('active.tendering')
@@ -1076,18 +1076,18 @@ def test_docs_complaints(self):
 
         with open('docs/source/complaints/award-complaint-escalate.http', 'w') as self.app.file_obj:
             response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
-                    self.tender_id, award_id, complaint2_id, complaint2_token), {"data":{"status":"pending","satisfied":False}})
+                    self.tender_id, award_id, complaint2_id, complaint2_token), {"data":{"status":"resolved","satisfied":False}})
             self.assertEqual(response.status, '200 OK')
 
         #### Rejecting Tender Award Complaint
         #
 
-        self.app.authorization = ('Basic', ('reviewer', ''))
+        #self.app.authorization = ('Basic', ('reviewer', ''))
 
-        with open('docs/source/complaints/award-complaint-reject.http', 'w') as self.app.file_obj:
-            response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(
-                    self.tender_id, award_id, complaint2_id), {"data":{"status":"invalid"}})
-            self.assertEqual(response.status, '200 OK')
+        #with open('docs/source/complaints/award-complaint-reject.http', 'w') as self.app.file_obj:
+            #response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(
+                    #self.tender_id, award_id, complaint2_id), {"data":{"status":"invalid"}})
+            #self.assertEqual(response.status, '200 OK')
 
         #### Submitting Tender Award Complaint Resolution
         #
@@ -1102,7 +1102,7 @@ def test_docs_complaints(self):
         self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
                 self.tender_id, award_id, complaint3_id, self.tender_token), {"data":{"status":"answered","resolutionType":"resolved","resolution":"Виправлено неконкурентні умови"}})
         self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
-                self.tender_id, award_id, complaint3_id, complaint3_token), {"data":{"status":"pending","satisfied":False}})
+                self.tender_id, award_id, complaint3_id, complaint3_token), {"data":{"status":"resolved","satisfied":False}})
 
 
         response = self.app.post_json('/tenders/{}/awards/{}/complaints?acc_token={}'.format(
@@ -1113,29 +1113,29 @@ def test_docs_complaints(self):
         self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
                 self.tender_id, award_id, complaint4_id, self.tender_token), {"data":{"status":"answered","resolutionType":"resolved","resolution":"Виправлено неконкурентні умови"}})
         self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
-                self.tender_id, award_id, complaint4_id, complaint4_token), {"data":{"status":"pending","satisfied":False}})
-
-        self.app.authorization = ('Basic', ('reviewer', ''))
-
-        with open('docs/source/complaints/award-complaint-resolution-upload.http', 'w') as self.app.file_obj:
-            response = self.app.post_json('/tenders/{}/awards/{}/complaints/{}/documents'.format(
-                    self.tender_id, award_id, complaint3_id), {'data': {
-                    'title': u'ComplaintResolution.pdf',
-                    'url': self.generate_docservice_url(),
-                    'hash': 'md5:' + '0' * 32,
-                    'format': 'application/pdf',
-                }})
-            self.assertEqual(response.status, '201 Created')
-
-        with open('docs/source/complaints/award-complaint-resolve.http', 'w') as self.app.file_obj:
-            response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(
-                    self.tender_id, award_id, complaint3_id), {"data":{"status":"resolved"}})
-            self.assertEqual(response.status, '200 OK')
-
-        with open('docs/source/complaints/award-complaint-decline.http', 'w') as self.app.file_obj:
-            response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(
-                    self.tender_id, award_id, complaint4_id), {"data":{"status":"declined"}})
-            self.assertEqual(response.status, '200 OK')
+                self.tender_id, award_id, complaint4_id, complaint4_token), {"data":{"status":"resolved","satisfied":False}})
+
+        #self.app.authorization = ('Basic', ('reviewer', ''))
+
+        #with open('docs/source/complaints/award-complaint-resolution-upload.http', 'w') as self.app.file_obj:
+            #response = self.app.post_json('/tenders/{}/awards/{}/complaints/{}/documents'.format(
+                    #self.tender_id, award_id, complaint3_id), {'data': {
+                    #'title': u'ComplaintResolution.pdf',
+                    #'url': self.generate_docservice_url(),
+                    #'hash': 'md5:' + '0' * 32,
+                    #'format': 'application/pdf',
+                #}})
+            #self.assertEqual(response.status, '201 Created')
+
+        #with open('docs/source/complaints/award-complaint-resolve.http', 'w') as self.app.file_obj:
+            #response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(
+                    #self.tender_id, award_id, complaint3_id), {"data":{"status":"resolved"}})
+            #self.assertEqual(response.status, '200 OK')
+
+        #with open('docs/source/complaints/award-complaint-decline.http', 'w') as self.app.file_obj:
+            #response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(
+                    #self.tender_id, award_id, complaint4_id), {"data":{"status":"declined"}})
+            #self.assertEqual(response.status, '200 OK')
 
         self.app.authorization = ('Basic', ('broker', ''))
 

diff --git a/docs/source/complaints-award.rst b/docs/source/complaints-award.rst
@@ -1,5 +1,21 @@
 .. Kicking page rebuild 2014-10-30 17:00:08
 
+Claim/Complaint Retrieval
+=========================
+
+Tender Award Claim/Complaint Retrieval
+-------------------------------------------
+
+You can list all Tender Award Claims/Complaints:
+
+.. include:: complaints/award-complaints-list.http
+   :code:
+
+And check individual complaint or claim:
+
+.. include:: complaints/award-complaint.http
+   :code:
+
 Claim Submission
 ================
 
@@ -31,20 +47,6 @@ You can submit claim that does not need additional documents:
 .. include:: complaints/award-complaint-submission-claim.http
    :code:
 
-Tender Award Claim/Complaint Retrieval
--------------------------------------------
-
-You can list all Tender Award Claims/Complaints:
-
-.. include:: complaints/award-complaints-list.http
-   :code:
-
-And check individual complaint or claim:
-
-.. include:: complaints/award-complaint.http
-   :code:
-
-
 Claim's Answer
 ==============
 
@@ -65,37 +67,8 @@ Satisfying resolution
    :code:
 
 
-Escalate claim to complaint
----------------------------
+Disagreement with decision
+--------------------------
 
 .. include:: complaints/award-complaint-escalate.http
    :code:
-
-
-Complaint Resolution
-====================
-
-Rejecting Tender Award Complaint
--------------------------------------
-
-.. include:: complaints/award-complaint-reject.http
-   :code:
-
-
-Submitting Tender Award Complaint Resolution
--------------------------------------------------
-
-The Complaint Review Body uploads the resolution document:
-
-.. include:: complaints/award-complaint-resolution-upload.http
-   :code:
-
-And either resolves complaint:
-
-.. include:: complaints/award-complaint-resolve.http
-   :code:
-
-Or declines it:
-
-.. include:: complaints/award-complaint-decline.http
-   :code:
diff --git a/docs/source/complaints-tender.rst b/docs/source/complaints-tender.rst
@@ -1,5 +1,22 @@
 .. Kicking page rebuild 2014-10-30 17:00:08
 
+Claim/Complaint Retrieval
+=========================
+
+Tender Conditions Claim/Complaint Retrieval
+-------------------------------------------
+
+You can list all Tender Conditions Claims/Complaints:
+
+.. include:: complaints/complaints-list.http
+   :code:
+
+And check individual complaint or claim:
+
+.. include:: complaints/complaint.http
+   :code:
+
+
 Claim Submission
 ================
 
@@ -31,20 +48,6 @@ Create claim that does not need additional documents:
 .. include:: complaints/complaint-submission-claim.http
    :code:
 
-Tender Conditions Claim/Complaint Retrieval
--------------------------------------------
-
-You can list all Tender Conditions Claims/Complaints:
-
-.. include:: complaints/complaints-list.http
-   :code:
-
-And check individual complaint or claim:
-
-.. include:: complaints/complaint.http
-   :code:
-
-
 Claim's Answer
 ==============
 
@@ -65,37 +68,8 @@ Satisfying resolution
    :code:
 
 
-Escalate claim to complaint
----------------------------
+Disagreement with decision
+--------------------------
 
 .. include:: complaints/complaint-escalate.http
    :code:
-
-
-Complaint Resolution
-====================
-
-Rejecting Tender Conditions Complaint
--------------------------------------
-
-.. include:: complaints/complaint-reject.http
-   :code:
-
-
-Submitting Tender Conditions Complaint Resolution
--------------------------------------------------
-
-The Complaint Review Body uploads the resolution document:
-
-.. include:: complaints/complaint-resolution-upload.http
-   :code:
-
-And either resolves complaint:
-
-.. include:: complaints/complaint-resolve.http
-   :code:
-
-Or declines it:
-
-.. include:: complaints/complaint-decline.http
-   :code: