Convert query params to REST endpoints

lib/routes/cases.js

@@ -1,14 +1,20 @@
-import { findAllCases } from '../services/cases'
-import { assertNoQueryParamMissing } from '../utils/errors'
+import { findAllCases, findCasesByStateId } from '../services/cases'
 
 import express from 'express'
 const router = express.Router()
 
 router.get('/', async (req, res, next) => {
   try {
-    const { stateId } = req.query
-    assertNoQueryParamMissing({ stateId })
-    res.json(await findAllCases(stateId))
+    res.json(await findAllCases())
+  } catch (err) {
+    next(err)
+  }
+})
+
+router.get('/:stateId', async (req, res, next) => {
+  try {
+    const { stateId } = req.params
+    res.json(await findCasesByStateId(stateId))
   } catch (err) {
     next(err)
   }

lib/routes/mapdata.js

@@ -1,14 +1,25 @@
-import { getMapdata } from '../services/mapdata'
+import { findAllMapdata, findMapdataByStateId } from '../services/mapdata'
 import { assertNoQueryParamMissing } from '../utils/errors'
 
 import express from 'express'
 const router = express.Router()
 
 router.get('/', async (req, res, next) => {
   try {
-    const { stateId, resolution, zoom } = req.query
-    assertNoQueryParamMissing({ stateId, resolution, zoom })
-    res.json(await getMapdata(stateId, resolution, zoom))
+    const { resolution, zoom } = req.query
+    assertNoQueryParamMissing({ resolution, zoom })
+    res.json(await findAllMapdata(resolution, zoom))
+  } catch (err) {
+    next(err)
+  }
+})
+
+router.get('/:stateId', async (req, res, next) => {
+  try {
+    const { stateId } = req.params
+    const { resolution, zoom } = req.query
+    assertNoQueryParamMissing({ resolution, zoom })
+    res.json(await findMapdataByStateId(stateId, resolution, zoom))
   } catch (err) {
     next(err)
   }

lib/routes/options.js

@@ -1,13 +1,11 @@
 import { findOption, saveOption } from '../services/options'
-import { assertNoQueryParamMissing } from '../utils/errors'
 
 import express from 'express'
 const router = express.Router()
 
-router.get('/', async (req, res, next) => {
+router.get('/:guid', async (req, res, next) => {
   try {
-    const { guid } = req.query
-    assertNoQueryParamMissing({ guid })
+    const { guid } = req.params
     res.json(await findOption(guid))
   } catch (err) {
     next(err)

lib/services/cases.js

@@ -1,9 +1,13 @@
-import sequelize from 'sequelize'
-
 import Case from '../models/Case'
 
-export function findAllCases (stateId) {
+export function findAllCases () {
+  return Case.findAll()
+}
+
+export function findCasesByStateId (stateId) {
   return Case.findAll({
-    where: sequelize.literal(`"stateId" = ${stateId} OR ${stateId} = 0`)
+    where: {
+      stateId: stateId
+    }
   })
 }

lib/services/mapdata.js

@@ -2,7 +2,15 @@ import sequelize from 'sequelize'
 
 import Mapdata from '../models/Mapdata'
 
-export async function getMapdata (stateId, resolution, zoom) {
+export function findAllMapdata (resolution, zoom) {
+  return getMapdata(resolution, zoom)
+}
+
+export function findMapdataByStateId (stateId, resolution, zoom) {
+  return getMapdata(resolution, zoom, { where: { stateId: stateId } })
+}
+
+async function getMapdata (resolution, zoom, options) {
   // Wichtig: Erst zoom, dann resolution!
   const mapdata = await Mapdata.findAll({
     attributes: [
@@ -11,7 +19,7 @@ export async function getMapdata (stateId, resolution, zoom) {
         sequelize.fn('ST_Scale', sequelize.col('geometry'), ...getScaleFactor(zoom)), getEpsilon(resolution)),
       'geometry']
     ],
-    where: sequelize.literal(`"stateId" = ${stateId} OR ${stateId} = 0`)
+    ...options
   })
 
   return mapdata.filter(data => data.geometry !== null)

lib/utils/rki.js

@@ -10,10 +10,10 @@ async function get (url) {
   return response.data
 }
 
-export async function fetchCases () {
-  return await get(CASES_URL)
+export function fetchCases () {
+  return get(CASES_URL)
 }
 
-export async function fetchMapdata () {
-  return await get(MAPDATA_URL)
+export function fetchMapdata () {
+  return get(MAPDATA_URL)
 }

public/main.js

@@ -21,9 +21,11 @@ form.onsubmit = event => {
 form.dispatchEvent(new Event('change'))
 
 function getFormURL () {
-  const url = new URL(form.action)
-  const queryParams = new URLSearchParams(new FormData(form))
-  url.search = queryParams
+  const params = new URLSearchParams(new FormData(form))
+  const stateId = params.get('stateId')
+  const url = stateId === '0' ? new URL(form.action) : new URL(`${form.action}/${stateId}`)
+  params.delete('stateId')
+  url.search = params
   return url
 }