split services / delete dish / mail init

services/azureServices.js

@@ -1,5 +1,6 @@
 import azureBlob from "@azure/storage-blob";
 import getStream from "into-stream";
+import { newError } from "./services.js";
 
 // SETUP
 const containerURL = `https://${process.env.AZURE_STORAGE_ACCOUNT_NAME}.blob.core.windows.net/img/`;
@@ -17,14 +18,18 @@ const blobServiceClient = new azureBlob.BlobServiceClient(
 );
 
 // CODE
-export function renameBlob(blobURL) {
-  const blobName = blobURL.replace(containerURL, "");
-  const containerClient = blobServiceClient.getContainerClient(container);
-  const tempBlob = containerClient.getBlobClient(blobName);
-  const newBlob = containerClient.getBlobClient(removePrefix(blobName));
+export async function renameBlob(blobURL) {
+  try {
+    const blobName = blobURL.replace(containerURL, "");
+    const containerClient = blobServiceClient.getContainerClient(container);
+    const tempBlob = containerClient.getBlobClient(blobName);
+    const newBlob = containerClient.getBlobClient(removePrefix(blobName));
 
-  newBlob.syncCopyFromURL(tempBlob.url);
-  return newBlob.url;
+    await newBlob.syncCopyFromURL(tempBlob.url);
+    return newBlob.url;
+  } catch (e) {
+    throw newError("Unable to save image", 500);
+  }
 }
 
 export async function uploadBlob(request, resp) {
@@ -50,6 +55,7 @@ export async function uploadBlob(request, resp) {
       });
   } catch (err) {
     console.log(err);
+    throw newError("Unable to save image", 500);
   }
 }
 

services/dataPrepServices.js

@@ -0,0 +1,138 @@
+import { hashPass, newError, saveImage } from "./services.js";
+import sanitizer from "string-sanitizer";
+import mongoose from "mongoose";
+import Dish from "../models/dish.js";
+import User from "../models/users.js";
+import Restaurant from "../models/restaurant.js";
+
+export function composeNewContact(request) {
+  const contact = {
+    lead_score: "100",
+    tags: ["newUser"],
+    properties: [
+      {
+        type: "SYSTEM",
+        name: "first_name",
+        value: request.firstname,
+      },
+      {
+        type: "SYSTEM",
+        name: "last_name",
+        value: request.lastname,
+      },
+      {
+        type: "SYSTEM",
+        name: "email",
+        subtype: "work",
+        value: request.email,
+      },
+      {
+        type: "CUSTOM",
+        name: "UserID",
+        value: request._id,
+      },
+    ],
+  };
+  return contact;
+}
+
+export async function createUser(request) {
+  const password = await hashPass(request.body.password);
+  const user = new User({
+    _id: new mongoose.Types.ObjectId(),
+    email: request.body.email,
+    password: password,
+    firstname: request.body.firstname,
+    lastname: request.body.lastname,
+  });
+  return user;
+}
+
+export function createRestaurant(request) {
+  try {
+    const restaurant = new Restaurant({
+      _id: new mongoose.Types.ObjectId(),
+      name: sanitizer.sanitize.keepUnicode(request.name),
+      city: sanitizer.sanitize.keepUnicode(request.city),
+      adress: sanitizer.sanitize.keepUnicode(request.adress),
+      location: request.location,
+      imgUrl: saveImage(request.imgURL),
+      workingHours: request.workingHours,
+      description: sanitizer.sanitize.keepUnicode(request.description),
+      tags: request.tags,
+      links: request.links,
+      phone: request.phone,
+      hidden: request.hidden,
+    });
+    return restaurant;
+  } catch (error) {
+    throw newError("Invalid input data", 206);
+  }
+}
+
+export function prepareSafeUser(user) {
+  const safeUser = {
+    firstname: user.firstname,
+    lastname: user.lastname,
+    email: user.email,
+    id: user._id,
+    restaurants: user.restaurants,
+  };
+  return safeUser;
+}
+
+export async function createDish(dish, restaurantId, generateId) {
+  try {
+    if (generateId) {
+      const img = await saveImage(dish.imgUrl);
+      const newDish = new Dish({
+        _id: new mongoose.Types.ObjectId(),
+        restaurantId: restaurantId,
+        name: sanitizer.sanitize.keepUnicode(dish.name),
+        category: dish.category,
+        price: dish.price,
+        notes: sanitizer.sanitize.keepUnicode(dish.notes),
+        imgUrl: img,
+        weight: dish.weight,
+        allergens: {
+          gluten: dish.allergens.gluten,
+          lactose: dish.allergens.lactose,
+          soy: dish.allergens.soy,
+          eggs: dish.allergens.eggs,
+          seaFood: dish.allergens.seaFood,
+          peanuts: dish.allergens.peanuts,
+          sesame: dish.allergens.sesame,
+        },
+        ingredients: dish.ingredients,
+        vegan: dish.vegan,
+        vegetarian: dish.vegetarian,
+      });
+      return newDish;
+    } else {
+      const newDish = new Dish({
+        restaurantId: restaurantId,
+        name: sanitizer.sanitize.keepUnicode(dish.name),
+        category: dish.category,
+        price: dish.price,
+        notes: sanitizer.sanitize.keepUnicode(dish.notes),
+        imgUrl: dish.imgUrl,
+        weight: dish.weight,
+        allergens: {
+          gluten: dish.allergens.gluten,
+          lactose: dish.allergens.lactose,
+          soy: dish.allergens.soy,
+          eggs: dish.allergens.eggs,
+          seaFood: dish.allergens.seaFood,
+          peanuts: dish.allergens.peanuts,
+          sesame: dish.allergens.sesame,
+        },
+        ingredients: dish.ingredients,
+        vegan: dish.vegan,
+        vegetarian: dish.vegetarian,
+      });
+      return newDish;
+    }
+  } catch (e) {
+    throw newError("Cannot create dish", 500);
+  }
+}

services/databaseServices.js

@@ -0,0 +1,73 @@
+import Restaurant from "../models/restaurant.js";
+import Dish from "../models/dish.js";
+import User from "../models/users.js";
+import mongoose from "mongoose";
+import sanitizer from "string-sanitizer";
+import { newError } from "./services.js";
+
+export async function changeUserPass(userId, newPass) {
+  User.findByIdAndUpdate(userId, { $set: { password: newPass } }).catch((e) => {
+    throw newError("Cannot change password", 500);
+  });
+}
+
+export async function removeDish(dishId) {
+  const deletedDoc = await Dish.findByIdAndDelete(dishId).catch((e) => {
+    throw newError("Unable to delete Dish", 500);
+  });
+  await Restaurant.findByIdAndUpdate(deletedDoc.restaurantId, {
+    $pull: { dishes: dishId },
+  }).catch((error) => {
+    throw newError("Unable to remove Dish from restaurant", 500);
+  });
+}
+
+export async function addDishToRestaurant(restaurantId, dishId) {
+  await Restaurant.updateOne(
+    { _id: restaurantId },
+    { $push: { dishes: dishId } }
+  ).catch((error) => {
+    throw newError("Couldn't add dish to restaurant", 500);
+  });
+}
+
+export async function addRestaurantToUser(user, restaurant) {
+  await User.findByIdAndUpdate(user.id, {
+    $push: { restaurants: restaurant._id },
+  }).catch((e) => {
+    throw newError("Couldn't add restaurant to user", 500);
+  });
+}
+
+export async function fetchRestaurant(id) {
+  let data;
+  await Restaurant.findById(id, (err, result) => {
+    data = result;
+  }).catch((e) => {
+    throw newError("Couldn't fetch restaurant", 500);
+  });
+  return data;
+}
+
+export async function fetchAllDishesForRestaurant(restaurant) {
+  let dishes = [];
+  for (const dish of restaurant.dishes) {
+    let res = await fetchDish(dish._id);
+    if (res !== null) dishes.push(res);
+  }
+  return dishes;
+}
+
+export async function fetchDish(id) {
+  let data = await Dish.findById(id).catch((e) => {
+    throw newError(`Couldn't fetch ${id}`, 404);
+  });
+  return data;
+}
+
+export async function fetchUser(email) {
+  if (!email) throw newError("No input", 204);
+  const user = await User.findOne({ email: email });
+  if (!user) throw newError("No such user...", 404);
+  return user;
+}

services/mailServices.js

@@ -0,0 +1,2 @@
+import nodemailer from "nodemailer";
+import makeResetPassMessage from "../config/mailTemplateReset";

services/services.js

@@ -1,4 +1,5 @@
 import Restaurant from "../models/restaurant.js";
+import {} from "./dataPrepServices.js";
 import Dish from "../models/dish.js";
 import User from "../models/users.js";
 import mongoose from "mongoose";
@@ -18,7 +19,8 @@ export function newError(message, status) {
 }
 
 export function handleError(error, responseObject) {
-  if (!error.message) {
+  if (!error.status) {
+    console.log(error);
     responseObject.sendStatus(500);
   } else {
     responseObject.status(error.status).send(error.message);
@@ -32,39 +34,6 @@ export async function validateRestaurant(id) {
   return true;
 }
 
-export async function fetchRestaurant(id) {
-  let data;
-  await Restaurant.findById(id, (err, result) => {
-    data = result;
-  }).catch((e) => {
-    throw newError("Couldn't fetch restaurant", 500);
-  });
-  return data;
-}
-
-export async function fetchAllDishesForRestaurant(restaurant) {
-  let dishes = [];
-  for (const dish of restaurant.dishes) {
-    let res = await fetchDish(dish._id);
-    if (res !== null) dishes.push(res);
-  }
-  return dishes;
-}
-
-export async function fetchDish(id) {
-  let data = await Dish.findById(id).catch((e) => {
-    throw newError(`Couldn't fetch ${id}`, 404);
-  });
-  return data;
-}
-
-export async function fetchUser(email) {
-  if (!email) throw newError("No input", 204);
-  const user = await User.findOne({ email: email });
-  if (!user) throw newError("No such user...", 404);
-  return user;
-}
-
 export function decodeAndSanitize(query) {
   if (!query) throw newError("Nothing to sanitize...", 204);
   return sanitizer.sanitize.keepUnicode(decodeURI(query));
@@ -75,23 +44,13 @@ export async function checkPassword(password, hash) {
   if (!result) throw newError("Wrong password :(", 401);
 }
 
-export function prepareSafeUser(user) {
-  const safeUser = {
-    firstname: user.firstname,
-    lastname: user.lastname,
-    email: user.email,
-    id: user._id,
-  };
-  return safeUser;
-}
-
 export function generateAuthToken(user) {
   const token = jwt.sign(
     {
       email: user.email,
       firstname: user.firstname,
       lastname: user.lastname,
-      id: user._id,
+      id: user.id,
       restaurants: user.restaurants,
     },
     jwtSecret,
@@ -113,9 +72,10 @@ export function validateUserToken(token) {
   if (!token) throw newError("Invalid user token", 401);
   const verified = jwt.verify(token, jwtSecret, { ignoreExpiration: false });
   if (!verified) throw newError("Invalid user token", 401);
+  return verified;
 }
 
-export function validateDishId(id) {
+export async function validateDishId(id) {
   if (!mongoose.Types.ObjectId.isValid(id)) {
     throw newError("Invalid ID", 400);
   }
@@ -123,95 +83,16 @@ export function validateDishId(id) {
   if (!dishDoesExist) throw newError("Dish doesn't exist", 404);
 }
 
-export async function addDishToRestaurant(restaurantId, dishId) {
-  await Restaurant.updateOne(
-    { _id: restaurantId },
-    { $push: { dishes: dishId } }
-  ).catch((error) => {
-    throw newError("Couldn't add dish to restaurant", 500);
-  });
-}
-
-export function createDish(dish, generateId) {
-  // TEST THIS ONE!!!!!
-  if (generateId) {
-    const newDish = new Dish({
-      _id: new mongoose.Types.ObjectId(),
-      name: sanitizer.sanitize.keepUnicode(dish.name),
-      category: dish.category,
-      price: dish.price,
-      notes: sanitizer.sanitize.keepUnicode(dish.notes),
-      imgUrl: dish.imgUrl,
-      weight: dish.weight,
-      allergens: {
-        gluten: dish.allergens.gluten,
-        lactose: dish.allergens.lactose,
-        soy: dish.allergens.soy,
-        eggs: dish.allergens.eggs,
-        seaFood: dish.allergens.seaFood,
-        peanuts: dish.allergens.peanuts,
-        sesame: dish.allergens.sesame,
-      },
-      ingredients: dish.ingredients,
-      vegan: dish.vegan,
-      vegetarian: dish.vegetarian,
-    });
-    return newDish;
-  } else {
-    const newDish = new Dish({
-      name: sanitizer.sanitize.keepUnicode(dish.name),
-      category: dish.category,
-      price: dish.price,
-      notes: sanitizer.sanitize.keepUnicode(dish.notes),
-      imgUrl: dish.imgUrl,
-      weight: dish.weight,
-      allergens: {
-        gluten: dish.allergens.gluten,
-        lactose: dish.allergens.lactose,
-        soy: dish.allergens.soy,
-        eggs: dish.allergens.eggs,
-        seaFood: dish.allergens.seaFood,
-        peanuts: dish.allergens.peanuts,
-        sesame: dish.allergens.sesame,
-      },
-      ingredients: dish.ingredients,
-      vegan: dish.vegan,
-      vegetarian: dish.vegetarian,
-    });
-    return newDish;
-  }
-}
-
-export function createRestaurant(request) {
-  try {
-    const restaurant = new Restaurant({
-      _id: new mongoose.Types.ObjectId(),
-      name: sanitizer.sanitize.keepUnicode(request.body.name),
-      city: sanitizer.sanitize.keepUnicode(request.body.city),
-      imgUrl: services.saveImage(request.body.imgURL),
-      workingHours: request.body.workingHours,
-      description: sanitizer.sanitize.keepUnicode(request.body.description),
-      tags: request.body.tags,
-      links: request.body.links,
-      phone: request.body.phone,
-      hidden: request.body.hidden,
-    });
-    return restaurant;
-  } catch (error) {
-    throw newError("Invalid input data", 206);
-  }
-}
-
-export async function createUser(request) {
-  const password = await hashPass(request.body.password);
-  const user = new User({
-    _id: new mongoose.Types.ObjectId(),
-    email: request.body.email,
-    password: password,
-    firstname: request.body.firstname,
-    lastname: request.body.lastname,
-  });
-  return user;
+export async function verifyDishAccess(dishId, decodedToken) {
+  const fetch = await User.findById(decodedToken.id, "restaurants");
+  const restaurants = fetch.restaurants;
+  const restaurantId = await Dish.findById(dishId, "restaurantId").catch(
+    (error) => {
+      throw newError("Couldn't fetch Dish", 404);
+    }
+  );
+  const valid = restaurants.includes(restaurantId.restaurantId);
+  if (!valid) throw newError("You don't have access to this Dish.", 401);
 }
 
 export function yearFromNowDate() {
@@ -230,7 +111,6 @@ export function halfYearFromNowDate() {
     date.setDate(date.getDate() + days);
     return date;
   };
-
   var nowDate = new Date();
   var resultDate = nowDate.addDays(183);
   return toShortDate(resultDate);
@@ -254,38 +134,6 @@ export function dueDateBasedOnSubscription(subscriptionActive) {
   }
 }
 
-export function composeNewContact(request) {
-  const dateNow = new Date();
-  const contact = {
-    lead_score: "100",
-    tags: ["newUser"],
-    properties: [
-      {
-        type: "SYSTEM",
-        name: "first_name",
-        value: request.firstname,
-      },
-      {
-        type: "SYSTEM",
-        name: "last_name",
-        value: request.lastname,
-      },
-      {
-        type: "SYSTEM",
-        name: "email",
-        subtype: "work",
-        value: request.email,
-      },
-      {
-        type: "CUSTOM",
-        name: "UserID",
-        value: request._id,
-      },
-    ],
-  };
-  return contact;
-}
-
 export function toShortDate(date) {
   if (!date) return false;
   const shortDate =
@@ -293,7 +141,7 @@ export function toShortDate(date) {
   return shortDate;
 }
 
-export function saveImage(url) {
-  const newURL = renameBlob(url);
+export async function saveImage(url) {
+  const newURL = await renameBlob(url);
   return newURL;
 }