Revert "Pass paging off to the fhir data-server (#683)" (#688)

This reverts commit f846cd1.

Author: whytheplatypus

apps/fhir/bluebutton/tests/test_read.py

@@ -277,6 +277,17 @@ def catchall(url, req):
 
             self.assertEqual(response.status_code, 200)
             self.assertEqual(response.json()['entry'], expected_response['entry'])
+            self.assertTrue(len(response.json()['link']) > 0)
+            self.assertIn("_count=5", response.json()['link'][0]['url'])
+
+            response = self.client.get(
+                reverse(
+                    'bb_oauth_fhir_search',
+                    kwargs={'resource_type': 'Patient'}),
+                {'_count': 6},
+                Authorization="Bearer %s" % (first_access_token))
+
+            self.assertIn("_count=6", response.json()['link'][0]['url'])
 
     def test_search_request_unauthorized(self):
         response = self.client.get(

apps/fhir/bluebutton/views/search.py

@@ -44,43 +44,50 @@ class SearchView(FhirDataView):
     ]
 
     def get(self, request, resource_type, *args, **kwargs):
+        serializer = ParamSerializer(data=request.query_params)
+        serializer.is_valid(raise_exception=True)
+        query_params = serializer.data
+
+        # Verify paging inputs. Casting an invalid int will throw a ValueError
+        try:
+            start_index = int(query_params.get(START_PARAMETER, 0))
+        except ValueError:
+            raise exceptions.ParseError(detail='%s must be an integer between zero and the number of results' % START_PARAMETER)
+
+        if start_index < 0:
+            raise exceptions.ParseError()
+
+        try:
+            page_size = int(query_params.get(SIZE_PARAMETER, DEFAULT_PAGE_SIZE))
+        except ValueError:
+            raise exceptions.ParseError(detail='%s must be an integer between 1 and %s' % (SIZE_PARAMETER, MAX_PAGE_SIZE))
+
+        if page_size <= 0 or page_size > MAX_PAGE_SIZE:
+            raise exceptions.ParseError()
+
         data = self.fetch_data(request, resource_type, *args, **kwargs)
+
+        if data.get('total', 0) > 0:
+            # TODO update to pagination class
+            data['entry'] = data['entry'][start_index:start_index + page_size]
+            replay_parameters = self.build_parameters(request)
+            data['link'] = get_paging_links(request.build_absolute_uri('?'),
+                                            start_index,
+                                            page_size,
+                                            data['total'],
+                                            replay_parameters)
+
         return Response(data)
 
     def build_parameters(self, request, *args, **kwargs):
         patient_id = request.crosswalk.fhir_id
         resource_type = request.resource_type
-
         get_parameters = {
-            '_format': 'application/json+fhir',
+            '_format': 'application/json+fhir'
         }
 
         if resource_type == 'ExplanationOfBenefit':
-            serializer = ParamSerializer(data=request.query_params)
-            serializer.is_valid(raise_exception=True)
-            query_params = serializer.data
-
-            # Verify paging inputs. Casting an invalid int will throw a ValueError
-            try:
-                start_index = int(query_params.get(START_PARAMETER, 0))
-            except ValueError:
-                raise exceptions.ParseError(
-                    detail='%s must be an integer between zero and the number of results' % START_PARAMETER)
-
-            if start_index < 0:
-                raise exceptions.ParseError()
-
-            try:
-                page_size = int(query_params.get(SIZE_PARAMETER, DEFAULT_PAGE_SIZE))
-            except ValueError:
-                raise exceptions.ParseError(detail='%s must be an integer between 1 and %s' % (SIZE_PARAMETER, MAX_PAGE_SIZE))
-
-            if page_size <= 0 or page_size > MAX_PAGE_SIZE:
-                raise exceptions.ParseError()
-
             get_parameters['patient'] = patient_id
-            get_parameters['startIndex'] = start_index
-            get_parameters['_count'] = page_size
         elif resource_type == 'Coverage':
             get_parameters['beneficiary'] = 'Patient/' + patient_id
         elif resource_type == 'Patient':