jonaszbigda/menui_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

additional validation of data

Browse Source
This commit is contained in:
Jonasz Bigda
2021-02-04 18:07:17 +01:00
parent 3b7ca3ccb3
commit 97aa4ae4d3
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
models/restaurant.js
View File

@@ -39,7 +39,8 @@ const restaurantSchema = mongoose.Schema({
}, },
imgUrl: { imgUrl: {
type: String, type: String,
maxlength: 128 maxlength: 128,
required: true
}, },
workingHours: { workingHours: {
pn: { pn: {

6
routes/routeRestaurant.js
View File

@@ -23,7 +23,7 @@ const {
checkPassword, checkPassword,
} = require("../services/services.js"); } = require("../services/services.js");
const Restaurant = require("../models/restaurant.js"); const Restaurant = require("../models/restaurant.js");
const { validateRestaurant } = require("../services/validations.js"); const { validateRestaurantData, validateLunchSet } = require("../services/validations.js");
var router = express.Router(); var router = express.Router();
@@ -45,7 +45,7 @@ router.post("/", async (req, res) => {
try { try {
const token = req.headers["x-auth-token"]; const token = req.headers["x-auth-token"];
const user = validateUserToken(token); const user = validateUserToken(token);
validateRestaurant(req.body); validateRestaurantData(req.body);
const restaurant = await createRestaurant(req.body).catch((err) => { const restaurant = await createRestaurant(req.body).catch((err) => {
throw newError("Nie udało się zapisać zdjęcia.", 500); throw newError("Nie udało się zapisać zdjęcia.", 500);
}); });
@@ -63,6 +63,7 @@ router.put("/", async (req, res) => {
try { try {
const token = req.headers["x-auth-token"]; const token = req.headers["x-auth-token"];
const user = validateUserToken(token); const user = validateUserToken(token);
validateRestaurantData(req.body);
const oldRestaurant = await fetchRestaurant(req.body.restaurantId); const oldRestaurant = await fetchRestaurant(req.body.restaurantId);
const newRestaurant = await createRestaurant(req.body, oldRestaurant); const newRestaurant = await createRestaurant(req.body, oldRestaurant);
await verifyRestaurantAccess(req.body.restaurantId, user); await verifyRestaurantAccess(req.body.restaurantId, user);
@@ -113,6 +114,7 @@ router.post("/lunchSet", async (req, res) => {
try { try {
const token = req.headers["x-auth-token"]; const token = req.headers["x-auth-token"];
const user = validateUserToken(token); const user = validateUserToken(token);
validateLunchSet(req.body.set);
await validateRestaurant(req.body.restaurantId); await validateRestaurant(req.body.restaurantId);
await verifyRestaurantAccess(req.body.restaurantId, user); await verifyRestaurantAccess(req.body.restaurantId, user);
await changeLunchMenuSet( await changeLunchMenuSet(

21
services/validations.js
View File

@@ -43,11 +43,25 @@ const validateSearch = function(string){
} }
} }
const validateRestaurant = function(requestBody){ const validateRestaurantData = function(requestBody){
const name = validator.isLength(requestBody.name, { max: 64 }) const name = validator.isLength(requestBody.name, { max: 64 })
const city = validator.isLength(requestBody.city, { max: 64 }) const city = validator.isLength(requestBody.city, { max: 64 })
const adress = validator.isLength(requestBody.adress, { max: 64 }) const adress = validator.isLength(requestBody.adress, { max: 64 })
const imgURL = validator.isURL(requestBody.imgUrl) && validator.contains(requestBody.imgUrl, "https://menuicdn.fra1.digitaloceanspaces.com/") const type = validator.isLength(requestBody.type, { max: 64 })
const description = true;
if(requestBody.description){
description = validator.isLength(requestBody.description, { max: 400 })
}
if(!name || !city || !adress || !type || !description){
throw newError("Dane nieprawidłowe", 400)
}
}
const validateLunchSet = function(set){
const name = validator.isLength(set.lunchSetName, { min: 2, max: 64 })
if(!name){
throw newError("Nieprawidłowe dane", 400)
}
} }
// EXPORTS // EXPORTS
@@ -56,4 +70,5 @@ exports.validateLogin = validateLogin;
exports.validateRegister = validateRegister; exports.validateRegister = validateRegister;
exports.validatePassword = validatePassword; exports.validatePassword = validatePassword;
exports.validateSearch = validateSearch; exports.validateSearch = validateSearch;
exports.validateRestaurant = validateRestaurant; exports.validateRestaurantData = validateRestaurantData;
exports.validateLunchSet = validateLunchSet;