Switch to data as root item of tenders listing

Author: kroman0

src/openprocurement/api/tests/tender.py

@@ -33,12 +33,12 @@ def test_empty_listing(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.content_type, 'application/json')
-        self.assertEqual(response.body, '{"tenders": []}')
+        self.assertEqual(response.body, '{"data": []}')
 
     def test_listing(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 0)
+        self.assertEqual(len(response.json['data']), 0)
 
         for i in range(3):
             response = self.app.post_json('/tenders', {'data': {}})
@@ -47,7 +47,7 @@ def test_listing(self):
 
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 3)
+        self.assertEqual(len(response.json['data']), 3)
 
     def test_create_tender_invalid(self):
         request_path = '/tenders'
@@ -132,7 +132,7 @@ def test_create_tender_generated(self):
     def test_create_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 0)
+        self.assertEqual(len(response.json['data']), 0)
 
         response = self.app.post_json('/tenders', {"data": test_tender_data})
         self.assertEqual(response.status, '201 Created')
@@ -150,7 +150,7 @@ def test_create_tender(self):
     def test_get_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 0)
+        self.assertEqual(len(response.json['data']), 0)
 
         response = self.app.post_json('/tenders', {'data': {}})
         self.assertEqual(response.status, '201 Created')
@@ -164,7 +164,7 @@ def test_get_tender(self):
     def test_put_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 0)
+        self.assertEqual(len(response.json['data']), 0)
 
         response = self.app.post_json('/tenders', {'data': {}})
         self.assertEqual(response.status, '201 Created')
@@ -184,7 +184,7 @@ def test_put_tender(self):
     def test_patch_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 0)
+        self.assertEqual(len(response.json['data']), 0)
 
         response = self.app.post_json('/tenders', {'data': {}})
         self.assertEqual(response.status, '201 Created')
@@ -204,7 +204,7 @@ def test_patch_tender(self):
     def test_modified_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 0)
+        self.assertEqual(len(response.json['data']), 0)
 
         response = self.app.post_json('/tenders', {'data': {}})
         self.assertEqual(response.status, '201 Created')
@@ -233,7 +233,7 @@ def test_modified_tender(self):
     def test_tender_not_found(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')
-        self.assertEqual(len(response.json['tenders']), 0)
+        self.assertEqual(len(response.json['data']), 0)
 
         response = self.app.get('/tenders/some_id', status=404)
         self.assertEqual(response.status, '404 Not Found')

src/openprocurement/api/views.py

@@ -14,10 +14,6 @@
 auction = Service(name='Tender Auction', path='/tenders/{tender_id}/auction', renderer='json')
 
 
-def wrap_data(data):
-    return {"data": data}
-
-
 def validate_tender_data(request):
     try:
         json = request.json_body
@@ -128,7 +124,7 @@ def collection_get(self):
             Content-Type: application/json
 
             {
-                "tenders": [
+                "data": [
                     {
                         "id": "64e93250be76435397e8c992ed4214d1",
                         "tenderID": "UA-2014-DUS-156",
@@ -188,7 +184,7 @@ def collection_get(self):
         """
         # limit, skip, descending
         results = TenderDocument.view(self.db, 'tenders/all')
-        return {'tenders': [i.serialize("view") for i in results]}
+        return {'data': [i.serialize("view") for i in results]}
 
     @view(content_type="application/json", validators=(validate_tender_data,))
     def collection_post(self):
@@ -335,7 +331,7 @@ def collection_post(self):
         self.request.response.status = 201
         self.request.response.headers[
             'Location'] = self.request.route_url('Tender', id=tender_id)
-        return wrap_data(tender.serialize("view"))
+        return {'data': tender.serialize("view")}
 
     @view(renderer='json')
     def get(self):
@@ -421,7 +417,7 @@ def get(self):
             self.request.errors.add('url', 'id', 'Not Found')
             self.request.errors.status = 404
             return
-        return wrap_data(tender.serialize("view"))
+        return {'data': tender.serialize("view")}
 
     @view(content_type="application/json", validators=(validate_tender_data,))
     def put(self):
@@ -437,7 +433,7 @@ def put(self):
             tender.store(self.db)
         except Exception, e:
             return self.request.errors.add('body', 'data', str(e))
-        return wrap_data(tender.serialize("view"))
+        return {'data': tender.serialize("view")}
 
     @view(content_type="application/json", validators=(validate_tender_data,))
     def patch(self):
@@ -501,7 +497,7 @@ def patch(self):
             tender.store(self.db)
         except Exception, e:
             return self.request.errors.add('body', 'data', str(e))
-        return wrap_data(tender.serialize("view"))
+        return {'data': tender.serialize("view")}
 
 
 @resource(name='Tender Documents',
@@ -681,7 +677,7 @@ def collection_post(self):
             return self.request.errors.add('body', 'data', str(e))
         self.request.response.status = 201
         # self.request.response.headers['Location'] = self.request.route_url('Tender Bids', tender_id=self.tender_id, id=bid['id'])
-        return wrap_data(bid.serialize("view"))
+        return {'data': bid.serialize("view")}
 
 
 @resource(name='Tender Bid Documents',
@@ -826,7 +822,7 @@ def collection_post(self):
             return self.request.errors.add('body', 'data', str(e))
         self.request.response.status = 201
         # self.request.response.headers['Location'] = self.request.route_url('Tender Bids', tender_id=self.tender_id, id=award['awardID'])
-        return wrap_data(award.serialize("view"))
+        return {'data': award.serialize("view")}
 
 
 @auction.get()
@@ -887,7 +883,7 @@ def get_auction(request):
         "amount": 35,
         "currency": "UAH"
     }
-    return wrap_data(auction_info)
+    return {'data': auction_info}
 
 
 @auction.patch(content_type="application/json", validators=(validate_tender_data,))
@@ -965,4 +961,4 @@ def patch_auction(request):
         tender.store(db)
     except Exception, e:
         return request.errors.add('body', 'data', str(e))
-    return wrap_data(tender.serialize("auction"))
+    return {'data': tender.serialize("auction")}