[WIP]Refactor elections endpoint to handle candidate finance totals export function

tests/test_downloads.py

@@ -143,8 +143,8 @@ def test_download_cached(self, export, get_cached):
         assert not export.delay.called
 
     def test_download_forbidden(self):
-        with pytest.raises(ApiError):
-            self.client.post_json(api.url_for(resource.DownloadView, path='elections', office='house', cycle=2018))
+        response = self.app.get(api.url_for(resource.DownloadView, path='elections', office='house', cycle=2018))
+        self.assertEqual(response.status_code, 405)
 
     @mock.patch('webservices.resources.download.MAX_RECORDS', 2)
     @mock.patch('webservices.resources.download.get_cached_file')

tests/test_elections.py

@@ -173,8 +173,8 @@ def test_conditional_missing_params(self):
         self.assertEquals(response.status_code, 200)
 
     def test_empty_query(self):
-        results = self._results(api.url_for(ElectionView, office='senate', cycle=2012, state='ZZ', per_page=0))
-        self.assertEqual(len(results), 0)
+        results = self._results(api.url_for(ElectionView, office='senate', cycle=2012, state='ZZ'))
+        assert len(results) == 0
 
     def test_elections(self):
         results = self._results(api.url_for(ElectionView, office='senate', cycle=2012, state='NY'))
@@ -245,7 +245,6 @@ def test_electionview_excludes_jfc(self):
         assert_dicts_subset(results[0], expected)
         assert set(results[0]['committee_ids']) == set(each.committee_id for each in self.committees)
 
-
     def test_election_summary(self):
         results = self._response(api.url_for(ElectionSummary, office='senate', cycle=2012, state='NY'))
         totals = [each for each in self.totals if each.cycle == 2012]

tests/test_utils.py

@@ -132,18 +132,13 @@ def test_hide_null_election(self):
 
         ]
         db.session.flush()
-        arg_map = {}
-        arg_map['office'] = 'senate'
-        arg_map['cycle'] = 2016
-        arg_map['state'] = 'MO'
-        #arg_map['district'] = '00'
 
         electionView = elections.ElectionView()
-        query, columns = sorting.sort(electionView._get_records(arg_map), 'total_disbursements', model=None)
+        query, columns = sorting.sort(electionView.build_query(office='senate', cycle=2016, state='MO'), 'total_disbursements', model=None)
 
         #print(str(query.statement.compile(dialect=postgresql.dialect())))
         self.assertEqual(len(query.all()), len(candidates))
-        query, columns = sorting.sort(electionView._get_records(arg_map), 'total_disbursements', model=None, hide_null=True)
+        query, columns = sorting.sort(electionView.build_query(office='senate', cycle=2016, state='MO'), 'total_disbursements', model=None, hide_null=True)
         #Taking this assert statement out because I believe, at least how the FEC interprets null (i.e. none) primary
         #committees for a candidate is that they have in fact raised/spent 0.0 dollars, this can be shown as true
         #using the Alabama special election as an example

webservices/resources/elections.py

@@ -115,17 +115,20 @@ def _filter_zip(self, query, kwargs):
     description=docs.ELECTIONS,
     tags=['financial']
 )
-class ElectionView(utils.Resource):
-
-    @use_kwargs(args.paging)
-    @use_kwargs(args.elections)
-    @use_kwargs(args.make_sort_args(default='-total_receipts'))
-    @marshal_with(schemas.ElectionPageSchema())
-    def get(self, **kwargs):
-        query = self._get_records(kwargs)
-        return utils.fetch_page(query, kwargs, cap=0)
+class ElectionView(ApiResource):
+    schema = schemas.ElectionSchema
+    page_schema = schemas.ElectionPageSchema
+    @property
+    def args(self):
+        return utils.extend(
+            args.paging,
+            args.elections,
+            args.make_sort_args(
+                default='-total_receipts',
+            ),
+        )
 
-    def _get_records(self, kwargs):
+    def build_query(self, **kwargs):
         utils.check_election_arguments(kwargs)
         totals_model = office_totals_map[kwargs['office']]
         pairs = self._get_pairs(totals_model, kwargs).subquery()
@@ -179,7 +182,7 @@ def _get_latest(self, pairs):
         ).subquery()
         return db.session.query(
             latest.c.candidate_id,
-            sa.func.sum(sa.func.coalesce(latest.c.cash_on_hand_end_period,0.0)).label('cash_on_hand_end_period'),
+            sa.func.sum(sa.func.coalesce(latest.c.cash_on_hand_end_period, 0.0)).label('cash_on_hand_end_period'),
         ).group_by(
             latest.c.candidate_id,
         )

webservices/schemas.py

@@ -934,6 +934,8 @@ class ElectionSchema(ma.Schema):
     coverage_end_date = ma.fields.Date()
 augment_schemas(ElectionSchema)
 
+ElectionPageSchema = make_page_schema(ElectionSchema)
+register_schema(ElectionPageSchema)
 
 class ScheduleABySizeCandidateSchema(ma.Schema):
     candidate_id = ma.fields.Str()