Merge pull request #101 from cipick/feature/fix-get-candidates-types

Fix get candidates params types
code4romania · Nov 23, 2020 · 5425b1a · 5425b1a · vercel · Nov 23, 2020
2 parents 67d7f43 + d31e378
commit 5425b1a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@code4ro/reusable-components",
-  "version": "0.1.51",
+  "version": "0.1.52",
   "description": "Component library for code4ro",
   "keywords": [
     "code4ro",

diff --git a/src/stories/APIIntegration.stories.tsx b/src/stories/APIIntegration.stories.tsx
@@ -124,7 +124,9 @@ ElectionScopeComponent.argTypes = {
 
 export const ElectionCandidatesComponent = (args: { api: string; apiUrl: string }) => {
   const electionApi: ElectionAPI = useApi(args.api, args.apiUrl);
-  const { data, loading, error } = useApiResponse(() => electionApi.getCandidates(1, 1, 1), [electionApi]);
+  const { data, loading, error } = useApiResponse(() => electionApi.getCandidates(1, { type: "county", countyId: 1 }), [
+    electionApi,
+  ]);
 
   return (
     <>

diff --git a/src/util/electionApi.ts b/src/util/electionApi.ts
@@ -26,11 +26,7 @@ export interface ElectionAPI extends ElectionScopeAPI, ElectionMapAPI {
   getBallot: (id: number, scope: ElectionScope) => APIInvocation<ElectionBallot>;
   getBallots: () => APIInvocation<ElectionBallotMeta[]>;
   getNewsFeed: (id: number) => APIInvocation<ElectionNewsFeed>;
-  getCandidates: (
-    ballotId: number,
-    division: number,
-    countyId: number,
-  ) => APIInvocation<ElectionResultsPartyCandidates[]>;
+  getCandidates: (ballotId: number, scope: ElectionScope) => APIInvocation<ElectionResultsPartyCandidates[]>;
 }
 
 const scopeToQuery = (scope: ElectionScope) => {
@@ -77,7 +73,7 @@ export const makeElectionApi = (options?: {
           return fetch("GET", "/winners/countries", { query: { BallotId: ballotId } });
       }
     },
-    getCandidates: (ballotId: number, division: number, countyId: number) =>
-      fetch("GET", `/ballots/${ballotId}/candidates`, { query: { division: division, countyId: countyId } }),
+    getCandidates: (ballotId: number, scope: ElectionScope) =>
+      fetch("GET", `/ballots/${ballotId}/candidates`, { query: scopeToQuery(scope) }),
   };
 };
diff --git a/src/util/mocks.ts b/src/util/mocks.ts
@@ -2399,7 +2399,7 @@ export const mockElectionAPI = makeElectionApi({
 
     [
       "GET",
-      "/ballots/*/candidates",
+      "/ballots/1/candidates",
       (async () => {
         await delay(1000);
         return mockCandidatesList;