Fixed patching data, auction view, bids visibility

Author: kroman0

src/openprocurement/api/models.py

@@ -207,8 +207,8 @@ class Options:
             'active.enquiries': whitelist(),
             'active.tendering': whitelist(),
             'active.auction': whitelist('value'),
-            'active.qualification': whitelist('value'),
-            'active.awarded': whitelist('value'),
+            'active.qualification': schematics_default_role,
+            'active.awarded': schematics_default_role,
             'complete': schematics_default_role,
             'unsuccessful': schematics_default_role,
             'paused': whitelist(),

src/openprocurement/api/tests/auction.py

@@ -148,13 +148,13 @@ def test_post_tender_auction(self):
         response = self.app.patch_json('/tenders/{}/auction'.format(self.tender_id), {'data': patch_data})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.content_type, 'application/json')
-        auction = response.json['data']
-        self.assertNotEqual(auction["bids"][0]['value']['amount'], self.initial_data["bids"][0]['value']['amount'])
-        self.assertNotEqual(auction["bids"][1]['value']['amount'], self.initial_data["bids"][1]['value']['amount'])
-        self.assertEqual(auction["bids"][0]['value']['amount'], patch_data["bids"][1]['value']['amount'])
-        self.assertEqual(auction["bids"][1]['value']['amount'], patch_data["bids"][0]['value']['amount'])
-
-        self.set_status('active.qualification')
+        tender = response.json['data']
+        self.assertNotEqual(tender["bids"][0]['value']['amount'], self.initial_data["bids"][0]['value']['amount'])
+        self.assertNotEqual(tender["bids"][1]['value']['amount'], self.initial_data["bids"][1]['value']['amount'])
+        self.assertEqual(tender["bids"][0]['value']['amount'], patch_data["bids"][1]['value']['amount'])
+        self.assertEqual(tender["bids"][1]['value']['amount'], patch_data["bids"][0]['value']['amount'])
+        self.assertTrue("tenderers" in tender["bids"][0])
+        self.assertTrue("name" in tender["bids"][0]["tenderers"][0])
 
         response = self.app.patch_json('/tenders/{}/auction'.format(self.tender_id), {'data': patch_data}, status=403)
         self.assertEqual(response.status, '403 Forbidden')

src/openprocurement/api/tests/bidder.py

@@ -107,6 +107,15 @@ def test_create_tender_bidder(self):
         self.assertTrue('id' in bidder)
         self.assertTrue(bidder['id'] in response.headers['Location'])
 
+        response = self.app.post_json('/tenders/{}/bids'.format(
+            self.tender_id), {'data': {'tenderers': [{'identifier': {'id': 1}, 'name': 'Name'}]}})
+        self.assertEqual(response.status, '201 Created')
+        self.assertEqual(response.content_type, 'application/json')
+        bidder = response.json['data']
+        self.assertEqual(bidder['tenderers'][0]['name'], 'Name')
+        self.assertTrue('id' in bidder)
+        self.assertTrue(bidder['id'] in response.headers['Location'])
+
         self.set_status('complete')
 
         response = self.app.post_json('/tenders/{}/bids'.format(

src/openprocurement/api/tests/tender.py

@@ -223,17 +223,17 @@ def test_create_tender(self):
         response = self.app.post_json('/tenders?opt_jsonp=callback', {"data": test_tender_data})
         self.assertEqual(response.status, '201 Created')
         self.assertEqual(response.content_type, 'application/javascript')
-        self.assertTrue('callback({"data": {"' in response.body)
+        self.assertTrue('callback({"' in response.body)
 
         response = self.app.post_json('/tenders?opt_pretty=1', {"data": test_tender_data})
         self.assertEqual(response.status, '201 Created')
         self.assertEqual(response.content_type, 'application/json')
-        self.assertTrue('{\n    "data": {\n        "' in response.body)
+        self.assertTrue('{\n    "' in response.body)
 
         response = self.app.post_json('/tenders', {"data": test_tender_data, "options": {"pretty": True}})
         self.assertEqual(response.status, '201 Created')
         self.assertEqual(response.content_type, 'application/json')
-        self.assertTrue('{\n    "data": {\n        "' in response.body)
+        self.assertTrue('{\n    "' in response.body)
 
     def test_get_tender(self):
         response = self.app.get('/tenders')
@@ -279,6 +279,16 @@ def test_put_tender(self):
         self.assertEqual(tender, new_tender)
         self.assertNotEqual(dateModified, new_dateModified)
 
+        response = self.app.patch_json('/tenders/{}'.format(tender['id']), {'data': {'status': 'complete'}})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.content_type, 'application/json')
+
+        response = self.app.put_json('/tenders/{}'.format(
+            tender['id']), {'data': tender}, status=403)
+        self.assertEqual(response.status, '403 Forbidden')
+        self.assertEqual(response.content_type, 'application/json')
+        self.assertEqual(response.json['errors'][0]["description"], "Can't change tender in current status")
+
     def test_patch_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
@@ -312,6 +322,17 @@ def test_patch_tender(self):
         self.assertEqual(revisions[0][u'changes'][0]['op'], u'remove')
         self.assertEqual(revisions[0][u'changes'][0]['path'], u'/procurementMethod')
 
+        response = self.app.patch_json('/tenders/{}'.format(
+            tender['id']), {'data': {'items': [test_tender_data['items'][0]]}})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.content_type, 'application/json')
+
+        response = self.app.patch_json('/tenders/{}'.format(
+            tender['id']), {'data': {'items': [{}, test_tender_data['items'][0]]}})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.content_type, 'application/json')
+        self.assertEqual(response.json['data']['items'][0], response.json['data']['items'][1])
+
         response = self.app.patch_json('/tenders/{}'.format(
             tender['id']), {'data': {'enquiryPeriod': {'endDate': new_dateModified2}}})
         self.assertEqual(response.status, '200 OK')
@@ -328,6 +349,15 @@ def test_patch_tender(self):
         self.assertEqual(response.content_type, 'application/json')
         self.assertTrue('auctionUrl' in response.json['data'])
 
+        response = self.app.patch_json('/tenders/{}'.format(tender['id']), {'data': {'status': 'complete'}})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.content_type, 'application/json')
+
+        response = self.app.patch_json('/tenders/{}'.format(tender['id']), {'data': {'status': 'active.auction'}}, status=403)
+        self.assertEqual(response.status, '403 Forbidden')
+        self.assertEqual(response.content_type, 'application/json')
+        self.assertEqual(response.json['errors'][0]["description"], "Can't change tender in current status")
+
     def test_dateModified_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')

src/openprocurement/api/utils.py

@@ -14,7 +14,7 @@ def generate_tender_id(tid):
     return "UA-" + tid
 
 
-def filter_data(data, fields=['id', 'doc_id', 'date', 'dateModified', 'url']):
+def filter_data(data, fields=['id', 'doc_id', 'date', 'dateModified', 'url', 'owner_token']):
     result = data.copy()
     for i in fields:
         if i in result:
@@ -62,17 +62,28 @@ def get_file(tender, document, key, db, request):
         request.errors.status = 404
 
 
+def prepare_patch(changes, orig, patch, basepath=''):
+    if isinstance(patch, dict):
+        for i in patch:
+            if i in orig:
+                prepare_patch(changes, orig[i], patch[i], '{}/{}'.format(basepath, i))
+            else:
+                changes.append({'op': 'add', 'path': '{}/{}'.format(basepath, i), 'value': patch[i]})
+    elif isinstance(patch, list):
+        for i, j in enumerate(patch):
+            if len(orig) > i:
+                prepare_patch(changes, orig[i], patch[i], '{}/{}'.format(basepath, i))
+            else:
+                changes.append({'op': 'add', 'path': '{}/{}'.format(basepath, i), 'value': j})
+    else:
+        for x in make_patch(orig, patch).patch:
+            x['path'] = '{}{}'.format(basepath, x['path'])
+            changes.append(x)
+
+
 def apply_data_patch(item, changes):
     patch_changes = []
-    for i, j in changes.items():
-        if i in item:
-            for x in make_patch(item[i], j).patch:
-                if x['op'] == u'remove':
-                    continue
-                x['path'] = '/{}{}'.format(i, x['path'])
-                patch_changes.append(x)
-        else:
-            patch_changes.append({'op': 'add', 'path': '/{}'.format(i), 'value': j})
+    prepare_patch(patch_changes, item, changes)
     return apply_patch(item, patch_changes)
 
 

src/openprocurement/api/views/auction.py

@@ -154,7 +154,8 @@ def patch_auction(request):
         bids = auction_data.get('bids', [])
         tender_bids_ids = [i.id for i in tender.bids]
         auction_data['bids'] = [x for (y, x) in sorted(zip([tender_bids_ids.index(i['id']) for i in bids], bids))]
+        auction_data['status'] = 'active.qualification'
         src = tender.serialize("plain")
         tender.import_data(apply_data_patch(src, auction_data))
         save_tender(tender, src, request)
-    return {'data': tender.serialize("auction_view")}
+    return {'data': tender.serialize(tender.status)}

src/openprocurement/api/views/tender.py

@@ -253,7 +253,12 @@ def collection_post(self):
         self.request.response.status = 201
         self.request.response.headers[
             'Location'] = self.request.route_url('Tender', id=tender_id)
-        return {'data': tender.serialize(tender.status)}
+        return {
+            'data': tender.serialize(tender.status),
+            'access': {
+                'token': tender.owner_token
+            }
+        }
 
     @view(renderer='json', validators=(validate_tender_exists,))
     def get(self):