move a conditional to the handler

DEFRA · Jul 17, 2024 · ff8be5a · ff8be5a
1 parent 91f5a85
commit ff8be5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/server/routes/alerts-and-warnings.js b/server/routes/alerts-and-warnings.js
@@ -108,10 +108,8 @@ module.exports = [{
   method: 'GET',
   path: `/${route}`,
   handler: (request, h) => {
-    if (request.query.q) {
-      if (isLocationEngland(util.cleanseLocation(request.query.q))) {
-        return h.redirect(`/${route}`)
-      }
+    if (request.query.q && isLocationEngland(util.cleanseLocation(request.query.q))) {
+      return h.redirect(`/${route}`)
     }
 
     return routeHandler(request, h)

diff --git a/server/routes/river-and-sea-levels.js b/server/routes/river-and-sea-levels.js
@@ -75,10 +75,6 @@ async function locationQueryHandler (request, h) {
     return h.view(route, { model: emptyResultsModel() })
   }
 
-  if (isLocationEngland(location)) {
-    return h.redirect(`/${route}`)
-  }
-
   const rivers = await request.server.methods.flood.getRiversByName(location)
   let places = await findPlaces(location)