diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-07-19 09:48:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-19 09:48:06 +0000 |
| commit | 4fc1f80d9f563f651a78cc4c45a2810afc8298d7 (patch) | |
| tree | 9d117c55f1b03e5d66244957f07159b57c36dcf3 /utils/test/testapi/opnfv_testapi/resources | |
| parent | b1b4c2dd8a5532c65b5df46f14721a5a421682d3 (diff) | |
| parent | 1e439d76e4d3b87a0385a5cb47a9d1509d1e419f (diff) | |
Merge "bugfix: pagination raise exception when no records returned"
Diffstat (limited to 'utils/test/testapi/opnfv_testapi/resources')
| -rw-r--r-- | utils/test/testapi/opnfv_testapi/resources/handlers.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/utils/test/testapi/opnfv_testapi/resources/handlers.py b/utils/test/testapi/opnfv_testapi/resources/handlers.py index c7fed8f17..f23cc57ee 100644 --- a/utils/test/testapi/opnfv_testapi/resources/handlers.py +++ b/utils/test/testapi/opnfv_testapi/resources/handlers.py @@ -107,12 +107,15 @@ class GenericApiHandler(web.RequestHandler): per_page = kwargs.get('per_page', 0) if query is None: query = {} - cursor = self._eval_db(self.table, 'find', query) - records_count = yield cursor.count() - total_pages = self._calc_total_pages(records_count, - last, - page, - per_page) + + total_pages = 0 + if page > 0: + cursor = self._eval_db(self.table, 'find', query) + records_count = yield cursor.count() + total_pages = self._calc_total_pages(records_count, + last, + page, + per_page) pipelines = self._set_pipelines(query, sort, last, page, per_page) cursor = self._eval_db(self.table, 'aggregate', @@ -125,7 +128,7 @@ class GenericApiHandler(web.RequestHandler): res = {self.table: data} else: res = res_op(data, *args) - if total_pages > 0: + if page > 0: res.update({ 'pagination': { 'current_page': kwargs.get('page'), @@ -140,12 +143,10 @@ class GenericApiHandler(web.RequestHandler): if (records_count > last) and (last > 0): records_nr = last - total_pages = 0 - if page > 0: - total_pages, remainder = divmod(records_nr, per_page) - if remainder > 0: - total_pages += 1 - if page > total_pages: + total_pages, remainder = divmod(records_nr, per_page) + if remainder > 0: + total_pages += 1 + if page > 1 and page > total_pages: raises.BadRequest( 'Request page > total_pages [{}]'.format(total_pages)) return total_pages |