refactoring validations

smart-window · Mar 29, 2020 · 4c6c64d · 4c6c64d
1 parent db5972b
commit 4c6c64d
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 71 deletions.
diff --git a/backend/src/controllers/middlewares/validations.js b/backend/src/controllers/middlewares/validations.js
@@ -0,0 +1,59 @@
+const { celebrate, Segments, Joi } = require("celebrate");
+
+module.exports = {
+  sessions: celebrate({
+    [Segments.BODY]: Joi.object().keys({
+      id: Joi.string().required()
+    })
+  }),
+
+  createOngs: celebrate({
+    [Segments.BODY]: Joi.object().keys({
+      name: Joi.string().required(),
+      email: Joi.string()
+        .required()
+        .email(),
+      whatsapp: Joi.string()
+        .required()
+        .min(10)
+        .max(11),
+      city: Joi.string().required(),
+      uf: Joi.string()
+        .required()
+        .length(2)
+    })
+  }),
+
+  profile: celebrate({
+    [Segments.HEADERS]: Joi.object({
+      authorization: Joi.string().required()
+    }).unknown()
+  }),
+
+  createIncident: celebrate({
+    [Segments.HEADERS]: Joi.object({
+      authorization: Joi.string().required()
+    }).unknown(),
+    [Segments.BODY]: Joi.object().keys({
+      title: Joi.string()
+        .required()
+        .min(3),
+      description: Joi.string()
+        .required()
+        .min(3),
+      value: Joi.number().required()
+    })
+  }),
+
+  indexIncidents: celebrate({
+    [Segments.QUERY]: Joi.object().keys({
+      page: Joi.number()
+    })
+  }),
+
+  deleteIncident: celebrate({
+    [Segments.PARAMS]: Joi.object().keys({
+      id: Joi.number().required()
+    })
+  })
+};
diff --git a/backend/src/database/db.sqlite b/backend/src/database/db.sqlite
diff --git a/backend/src/routes.js b/backend/src/routes.js
@@ -1,88 +1,24 @@
 const express = require("express");
-const { celebrate, Segments, Joi } = require("celebrate");
 const OngController = require("./controllers/OngController");
 const IncidentController = require("./controllers/IncidentController");
 const ProfileController = require("./controllers/ProfileController");
 const SessionController = require("./controllers/SessionController");
+const Validation = require("./controllers/middlewares/validations");
 
 const routes = express.Router();
 
-routes.post(
-  "/sessions",
-  celebrate({
-    [Segments.BODY]: Joi.object().keys({
-      id: Joi.string().required()
-    })
-  }),
-  SessionController.create
-);
+routes.post("/sessions", Validation.sessions, SessionController.create);
 
-routes.post(
-  "/ongs",
-  celebrate({
-    [Segments.BODY]: Joi.object().keys({
-      name: Joi.string().required(),
-      email: Joi.string()
-        .required()
-        .email(),
-      whatsapp: Joi.string()
-        .required()
-        .min(10)
-        .max(11),
-      city: Joi.string().required(),
-      uf: Joi.string()
-        .required()
-        .length(2)
-    })
-  }),
-  OngController.create
-);
+routes.post("/ongs", Validation.createOngs, OngController.create);
 routes.get("/ongs", OngController.index);
 
-routes.get(
-  "/profile",
-  celebrate({
-    [Segments.HEADERS]: Joi.object({
-      authorization: Joi.string().required()
-    }).unknown()
-  }),
-  ProfileController.index
-);
+routes.get("/profile", Validation.profile, ProfileController.index);
 
-routes.post(
-  "/incidents",
-  celebrate({
-    [Segments.HEADERS]: Joi.object({
-      authorization: Joi.string().required()
-    }).unknown(),
-    [Segments.BODY]: Joi.object().keys({
-      title: Joi.string()
-        .required()
-        .min(3),
-      description: Joi.string()
-        .required()
-        .min(3),
-      value: Joi.number().required()
-    })
-  }),
-  IncidentController.create
-);
-routes.get(
-  "/incidents",
-  celebrate({
-    [Segments.QUERY]: Joi.object().keys({
-      page: Joi.number()
-    })
-  }),
-  IncidentController.index
-);
+routes.post("/incidents", Validation.createIncident, IncidentController.create);
+routes.get("/incidents", Validation.indexIncidents, IncidentController.index);
 routes.delete(
   "/incidents/:id",
-  celebrate({
-    [Segments.PARAMS]: Joi.object().keys({
-      id: Joi.number().required()
-    })
-  }),
+  Validation.deleteIncident,
   IncidentController.delete
 );