Merge pull request #368 from ProgramEquity/gov-filtering-cicero-api

Updated gov filtering to work with Cicero API

Author: paramsiddharth

server/routes/api/representatives.js

@@ -9,10 +9,11 @@ const router = express.Router()
 const { CICERO_API_KEY } = process.env
 
 const JURISDICTION_FILTER_MAP = {
-  federal: 'country',
-  state: 'administrativeArea1',
-  county: 'administrativeArea2',
-  municipality: 'locality'
+  federal: ['NATIONAL_UPPER', 'NATIONAL_LOWER'],
+  state: ['STATE_EXEC', 'STATE_UPPER', 'STATE_LOWER'],
+  county: ['COUNTY'],
+  local: ['LOCAL_EXEC', 'LOCAL'],
+  school: ['SCHOOL']
 }
 const ALLOWED_JURISDICTION_FILTERS = Object.keys(JURISDICTION_FILTER_MAP)
 
@@ -40,27 +41,24 @@ router.get('/:zipCode', async (req, res) => {
   }
 
   try {
+    const params = {
+      search_postal: zipCode,
+      search_country: 'US',
+      order: 'district_type', // https://cicero.azavea.com/docs/#order-by-district-type
+      sort: 'asc',
+      max: 200,
+      format: 'json',
+      key: CICERO_API_KEY
+    }
+
+    if (filter != null) {
+      params.district_type = JURISDICTION_FILTER_MAP[filter]
+    }
+
     const {
       data: { response }
     } = await axios.get('https://cicero.azavea.com/v3.1/official', {
-      params: {
-        search_postal: zipCode,
-        search_country: 'US',
-        district_type: [
-          'NATIONAL_UPPER',
-          'NATIONAL_LOWER',
-          'STATE_EXEC',
-          'STATE_UPPER',
-          'STATE_LOWER',
-          'LOCAL_EXEC',
-          'LOCAL'
-        ],
-        order: 'district_type', // https://cicero.azavea.com/docs/#order-by-district-type
-        sort: 'asc',
-        max: 200,
-        format: 'json',
-        key: CICERO_API_KEY
-      },
+      params,
       paramsSerializer: (params) =>
         qs.stringify(params, { arrayFormat: 'repeat' })
     })

src/components/SearchReps.vue

@@ -47,6 +47,19 @@
                     State
                   </v-btn>
 
+                  <v-btn
+                    rounded
+                    dark
+                    class="ui button toggle search-reps-button"
+                    :style="{
+                      backgroundColor:
+                        currentFilter === 'local' && isActive ? 'blue' : 'gray'
+                    }"
+                    @click="FilterList('local')"
+                  >
+                    Local
+                  </v-btn>
+
                   <v-btn
                     class="search-reps-button"
                     rounded
@@ -62,18 +75,17 @@
                   </v-btn>
 
                   <v-btn
+                    class="search-reps-button"
                     rounded
                     dark
-                    class="ui button toggle search-reps-button"
+                    :class="{ active: isActive }"
                     :style="{
                       backgroundColor:
-                        currentFilter === 'municipality' && isActive
-                          ? 'blue'
-                          : 'gray'
+                        currentFilter === 'school' && isActive ? 'blue' : 'gray'
                     }"
-                    @click="FilterList('municipality')"
+                    v-on:click="FilterList('school')"
                   >
-                    Local
+                    School
                   </v-btn>
                 </v-col>
               </v-row>