Merge branch 'a211430089103760_deny_award_items_modification' into dev

openprocurement · Nov 14, 2016 · 976abad · 976abad
2 parents 6d29143 + 40dfb50
commit 976abad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/openprocurement/tender/limited/models.py b/openprocurement/tender/limited/models.py
@@ -42,8 +42,8 @@ def validate_dateSigned(self, data, value):
             raise ValidationError(u"Contract signature date can't be in the future")
 
 
-award_edit_role = blacklist('id', 'date', 'documents', 'complaints', 'complaintPeriod')
-award_create_role = blacklist('id', 'status', 'date', 'documents', 'complaints', 'complaintPeriod')
+award_edit_role = blacklist('id', 'items', 'date', 'documents', 'complaints', 'complaintPeriod')
+award_create_role = blacklist('id', 'status', 'items', 'date', 'documents', 'complaints', 'complaintPeriod')
 award_create_reporting_role = award_create_role + blacklist('qualified')
 award_edit_reporting_role = award_edit_role + blacklist('qualified')
 

diff --git a/openprocurement/tender/limited/tests/award.py b/openprocurement/tender/limited/tests/award.py
@@ -108,13 +108,15 @@ def test_create_tender_award(self):
         request_path = '/tenders/{}/awards?acc_token={}'.format(self.tender_id, self.tender_token)
         response = self.app.post_json(request_path, {'data': {'suppliers': [test_organization],
                                                               'subcontractingDetails': 'Details',
+                                                              'items': test_tender_data['items'],
                                                               'status': 'pending',
                                                               'qualified': True}})
         self.assertEqual(response.status, '201 Created')
         self.assertEqual(response.content_type, 'application/json')
         award = response.json['data']
         self.assertEqual(award['suppliers'][0]['name'], test_organization['name'])
         self.assertIn('id', award)
+        self.assertNotIn('items', award)
         self.assertIn(award['id'], response.headers['Location'])
         self.assertEqual(award["subcontractingDetails"], "Details")
         if self.initial_data['procurementMethodType'] == "reporting":
@@ -245,6 +247,12 @@ def test_patch_tender_award(self):
         self.assertEqual(response.content_type, 'application/json')
         award = response.json['data']
 
+        response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
+            self.tender_id, award['id'], self.tender_token),
+            {"data": {"items": test_tender_data['items']}})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.body, u'null')
+
         response = self.app.patch_json('/tenders/{}/awards/some_id'.format(self.tender_id),
                                        {"data": {"status": "unsuccessful"}}, status=404)
         self.assertEqual(response.status, '404 Not Found')
@@ -281,6 +289,7 @@ def test_patch_tender_award(self):
             {"data": {"title": 'award title'}})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json['data']['title'], 'award title')
+        self.assertNotIn('items', response.json['data'])
         response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
             self.tender_id, award['id'], self.tender_token),
             {"data": {"title": 'award title2'}})
@@ -799,6 +808,12 @@ def test_patch_tender_award(self):
         self.assertEqual(response.content_type, 'application/json')
         award = response.json['data']
 
+        response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
+            self.tender_id, award['id'], self.tender_token),
+            {"data": {"items": test_tender_data['items']}})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.body, u'null')
+
         response = self.app.patch_json('/tenders/{}/awards/some_id'.format(self.tender_id),
                                        {"data": {"status": "unsuccessful"}}, status=404)
         self.assertEqual(response.status, '404 Not Found')
@@ -835,6 +850,7 @@ def test_patch_tender_award(self):
             {"data": {"title": 'award title'}})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json['data']['title'], 'award title')
+        self.assertNotIn('items', response.json['data'])
         response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
             self.tender_id, award['id'], self.tender_token),
             {"data": {"title": 'award title2'}})