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

Refactoring day3

Browse Source
This commit is contained in:
Jonasz Bigda
2020-08-24 21:59:37 +02:00
parent 3c0d0c63fb
commit 3674e4ce3c
9 changed files with 132 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
routes/routeCity.js
View File

@@ -1,14 +0,0 @@
import express from "express";
import Restaurant from "../models/restaurant.js";
var router = express.Router();
router.get("/", (req, res) => {
Restaurant.find({ city: req.query.city }, (err, data) => {
if (err) {
res.sendStatus(404);
} else res.send(data);
});
});
export default router;

98
routes/routeDish.js
View File

@@ -1,7 +1,6 @@
import express from "express";
import Restaurant from "../models/restaurant.js";
import * as services from "../services/services.js";
import sanitizer from "string-sanitizer";
import Dish from "../models/dish.js";
var router = express.Router();
@@ -12,89 +11,38 @@ router.get("/", (req, res) => {
Dish.findById(req.query.dishId, (err, data) => {
if (err) {
res.sendStatus(404);
} else
res
.cookie("img", encodeURI(data.imgUrl), { maxAge: 1000 * 600 })
.send(data);
} else res.send(data);
});
});
// ADD NEW DISH
router.post("/", (req, res) => {
services.validateRestaurant(req.body.restaurantId, (result) => {
if (!result) {
res.sendStatus(400);
} else {
const token = req.headers["x-auth-token"];
if (!token) {
res.sendStatus(401);
return;
}
services.validateUserToken(token, (result) => {
if (!result) {
res.sendStatus(401);
} else {
const dish = services.createDish(
req.body.dish,
req.cookies["img"],
true
);
dish.save((err) => {
if (err) {
res.sendStatus(400);
} else {
Restaurant.updateOne(
{ _id: req.body.restaurantId },
{ $push: { dishes: dish._id } },
(err) => {
if (err) {
res.sendStatus(400);
} else {
res.clearCookie("img").status(201).send();
}
}
);
}
});
}
});
}
});
router.post("/", async (req, res) => {
try {
await services.validateRestaurant(req.body.restaurantId);
const token = req.headers["x-auth-token"];
services.validateUserToken(token);
const dish = services.createDish(req.body.dish, true);
await dish.save();
await services.addDishToRestaurant(req.body.restaurantId, dish._id);
} catch (error) {
services.handleError(error, res);
}
});
// UPDATE DISH
router.put("/", (req, res) => {
services.validateDishId(req.body.dishId, (result) => {
if (!result) {
res.sendStatus(204);
} else {
const token = req.headers["x-auth-token"];
if (!token) {
res.sendStatus(401);
return;
}
services.validateUserToken(token, (result) => {
if (!result) {
res.sendStatus(401);
} else {
const dish = services.createDish(
req.body.dish,
req.cookies["img"],
false
);
Dish.replaceOne({ _id: req.body.dishId }, dish, (err) => {
if (err) {
res.sendStatus(304);
} else {
res.clearCookie("img").status(200).send();
}
});
}
});
}
});
router.put("/", async (req, res) => {
try {
services.validateDishId(req.body.dishId);
const token = req.headers["x-auth-token"];
services.validateUserToken(token);
const dish = services.createDish(req.body.dish, false);
await Dish.replaceOne({ _id: req.body.dishId }, dish);
res.sendStatus(200);
} catch (error) {
services.handleError(error, res);
}
});
export default router;

15
routes/routeImg.js
View File

@@ -20,17 +20,12 @@ const uploadStrategy = multer({
// POST
router.post("/", uploadStrategy, async (req, res) => {
const token = req.headers["x-auth-token"];
if (!token) {
res.sendStatus(401);
return;
}
const auth = Boolean(services.validateUserToken(token));
if (!auth) {
res.sendStatus(401);
return;
} else {
try {
const token = req.headers["x-auth-token"];
services.validateUserToken(token);
await uploadBlob(req, res);
} catch (error) {
services.handleError(error, res);
}
});

52
routes/routeRestaurant.js
View File

@@ -1,8 +1,6 @@
import express from "express";
import * as services from "../services/services.js";
import Restaurant from "../models/restaurant.js";
import sanitizer from "string-sanitizer";
import mongoose from "mongoose";
var router = express.Router();
@@ -12,49 +10,24 @@ router.get("/", async (req, res) => {
try {
const query = services.decodeAndSanitize(req.query.restaurantId);
await services.validateRestaurant(query);
Restaurant.findById(query, (err, data) => {
if (err) {
res.sendStatus(404);
} else res.send(data);
});
Restaurant.findById(query).then((data) => res.send(data));
} catch (error) {
res.sendStatus(404);
services.handleError(error, res);
}
});
// ADD NEW RESTAURANT
router.post("/", (req, res) => {
const token = req.headers["x-auth-token"];
if (!token) {
res.sendStatus(401);
return;
router.post("/", async (req, res) => {
try {
const token = req.headers["x-auth-token"];
services.validateUserToken(token);
const restaurant = services.createRestaurant(req);
await restaurant.save();
res.sendStatus(201);
} catch (error) {
services.handleError(error, res);
}
services.validateUserToken(token, (result) => {
if (!result) {
res.sendStatus(401);
} else {
const restaurant = new Restaurant({
_id: new mongoose.Types.ObjectId(),
name: sanitizer.sanitize.keepUnicode(req.body.name),
city: sanitizer.sanitize.keepUnicode(req.body.city),
imgUrl: services.saveImage(req.body.imgURL),
workingHours: req.body.workingHours,
description: sanitizer.sanitize.keepUnicode(req.body.description),
tags: req.body.tags,
links: req.body.links,
phone: req.body.phone,
hidden: req.body.hidden,
});
restaurant.save((err) => {
if (err) {
res.sendStatus(400);
} else {
res.clearCookie("img").status(201).send();
}
});
}
});
});
// GET ALL DISHES FROM A RESTAURANT ID
@@ -67,8 +40,7 @@ router.get("/dishes", async (req, res) => {
let dishes = await services.fetchAllDishesForRestaurant(restaurant);
res.send(dishes);
} catch (error) {
console.log(error);
res.sendStatus(400);
services.handleError(error, res);
}
});

11
routes/routeTest.js
View File

@@ -4,14 +4,9 @@ import * as services from "../services/services.js";
var router = express.Router();
router.post("/", async (req, res) => {
await services
.fetchUser()
.then((response) => {
res.send(response);
})
.catch((e) => {
services.handleError(e, res);
});
await services.checkEmailTaken("jonasz@bankai.pl").catch((e) => {
services.handleError(e, res);
});
});
export default router;

38
routes/routeUser.js
View File

@@ -1,20 +1,11 @@
import express from "express";
import mongoose from "mongoose";
import User from "../models/users.js";
import bcrypt from "bcrypt";
import * as services from "../services/services.js";
import * as config from "../config/index.js";
import AgileCRMManager from "agile_crm";
const { API_KEY, jwtSecret } = config;
const { CRM_USER, CRM_EMAIL, CRM_KEY } = config;
var router = express.Router();
var agileAPI = new AgileCRMManager("bankai", API_KEY, "bankai@bankai.pl");
var success = function (data) {
console.log("Task successfull");
};
var error = function (err) {
console.log("Task failed successfully");
};
var agileAPI = new AgileCRMManager(CRM_USER, CRM_KEY, CRM_EMAIL);
// LOGIN
router.post("/login", async (req, res) => {
@@ -23,16 +14,10 @@ router.post("/login", async (req, res) => {
throw services.newError("No input data", 204);
}
const user = await services.fetchUser(req.body.email);
/* await services.checkPassword(req.body.password, user.password);
const userNoPass = {
firstname: user.firstname,
lastname: user.lastname,
email: user.email,
id: user._id,
};
var token = services.generateAuthToken(userNoPass);
res.header("x-auth-token", token).status(202).send(userNoPass); */
res.send(user);
await services.checkPassword(req.body.password, user.password);
const safeUser = services.prepareSafeUser(user);
var token = services.generateAuthToken(safeUser);
res.header("x-auth-token", token).status(202).send(safeUser);
} catch (error) {
services.handleError(error, res);
}
@@ -42,17 +27,10 @@ router.post("/login", async (req, res) => {
router.post("/register", async (req, res) => {
try {
await services.checkEmailTaken(req.body.email);
const password = await services.hashPass(req.body.password);
const user = new User({
_id: new mongoose.Types.ObjectId(),
email: req.body.email,
password: password,
firstname: req.body.firstname,
lastname: req.body.lastname,
});
const user = await services.createUser(req);
await user.save();
const contact = services.composeNewContact(user);
agileAPI.contactAPI.add(contact, success, error);
agileAPI.contactAPI.add(contact, null, null);
res.sendStatus(201);
} catch (e) {
services.handleError(e, res);