Request wine front & backend talk nicer togheter.

- requestWineController validates wine object and returns helpfull
 error repsonse if anything is missing.
 - requestWine uses new endpoint and calls api from within itself.
 - Linting.

api/controllers/requestController.js

@@ -1,10 +1,11 @@
 const path = require("path");
-const RequestRepository = require(path.join(__dirname, "../request"));
+const requestRepository = require(path.join(__dirname, "../request"));
 
 function addRequest(req, res) {
   const { wine } = req.body;
 
-  return RequestRepository.addNew(wine)
+  return verifyWineValues(wine)
+    .then(_ => requestRepository.addNew(wine))
     .then(wine =>
       res.json({
         message: "Successfully added new request",
@@ -23,7 +24,8 @@ function addRequest(req, res) {
 }
 
 function allRequests(req, res) {
-  return RequestRepository.getAll()
+  return requestRepository
+    .getAll()
     .then(wines =>
       res.json({
         wines: wines,
@@ -31,12 +33,10 @@ function allRequests(req, res) {
       })
     )
     .catch(error => {
-      console.log("error in getAllRequests:", error);
-
-      const message = "Unable to fetch all requested wines.";
-      return res.status(500).json({
+      const { message, statusCode } = error;
+      return res.status(statusCode || 500).json({
         success: false,
-        message: message
+        message: message || "Unable to fetch all requested wines."
       });
     });
 }
@@ -44,7 +44,8 @@ function allRequests(req, res) {
 function deleteRequest(req, res) {
   const { id } = req.params;
 
-  return RequestRepository.deleteById(id)
+  return requestRepository
+    .deleteById(id)
     .then(_ =>
       res.json({
         message: `Slettet vin med id: ${id}`,
@@ -61,6 +62,41 @@ function deleteRequest(req, res) {
     });
 }
 
+function verifyWineValues(wine) {
+  return new Promise((resolve, reject) => {
+    if (wine == undefined) {
+      reject({
+        message: "No wine object found in request body.",
+        status: 400
+      });
+    }
+
+    if (wine.id == null) {
+      reject({
+        message: "Wine object missing value id.",
+        status: 400
+      });
+    } else if (wine.name == null) {
+      reject({
+        message: "Wine object missing value name.",
+        status: 400
+      });
+    } else if (wine.vivinoLink == null) {
+      reject({
+        message: "Wine object missing value vivinoLink.",
+        status: 400
+      });
+    } else if (wine.image == null) {
+      reject({
+        message: "Wine object missing value image.",
+        status: 400
+      });
+    }
+
+    resolve();
+  });
+}
+
 module.exports = {
   addRequest,
   allRequests,

api/request.js

@@ -1,24 +1,20 @@
 const path = require("path");
-const RequestedWine = require(path.join(
-  __dirname, "/schemas/RequestedWine"
-));
-const Wine = require(path.join(
-  __dirname, "/schemas/Wine"
-));
+const RequestedWine = require(path.join(__dirname, "/schemas/RequestedWine"));
+const Wine = require(path.join(__dirname, "/schemas/Wine"));
 
 class RequestedWineNotFound extends Error {
-  constructor(message="Wine with this id was not found.") {
+  constructor(message = "Wine with this id was not found.") {
     super(message);
     this.name = "RequestedWineNotFound";
     this.statusCode = 404;
   }
 }
 
-const addNew = async (wine) => {
-  let thisWineIsLOKO = await Wine.findOne({id: wine.id})
+const addNew = async wine => {
+  let foundWine = await Wine.findOne({ id: wine.id });
 
-  if(thisWineIsLOKO == undefined){
-    thisWineIsLOKO = new Wine({
+  if (foundWine == undefined) {
+    foundWine = new Wine({
       name: wine.name,
       vivinoLink: wine.vivinoLink,
       rating: null,
@@ -26,44 +22,44 @@ const addNew = async (wine) => {
       image: wine.image,
       id: wine.id
     });
-    await thisWineIsLOKO.save()
+    await foundWine.save();
   }
 
-  let requestedWine = await RequestedWine.findOne({ "wineId": wine.id})
+  let requestedWine = await RequestedWine.findOne({ wineId: wine.id });
 
-  if(requestedWine == undefined){
+  if (requestedWine == undefined) {
     requestedWine = new RequestedWine({
       count: 1,
       wineId: wine.id,
-      wine: thisWineIsLOKO
-    })
+      wine: foundWine
+    });
   } else {
     requestedWine.count += 1;
   }
-  await requestedWine.save()
+  await requestedWine.save();
 
   return requestedWine;
-}
+};
 
-const getById = (id) => {
-  return RequestedWine.findOne({ wineId: id }).populate("wine")
+const getById = id => {
+  return RequestedWine.findOne({ wineId: id })
+    .populate("wine")
     .then(wine => {
       if (wine == null) {
         throw new RequestedWineNotFound();
       }
 
       return wine;
-    })
-}
+    });
+};
 
-const deleteById = (id) => {
-  return getById(id)
-    .then(wine => RequestedWine.deleteOne({ wineId: wine.id }))
-}
+const deleteById = id => {
+  return getById(id).then(requestedWine => RequestedWine.deleteOne({ _id: requestedWine._id }));
+};
 
 const getAll = () => {
   return RequestedWine.find({}).populate("wine");
-}
+};
 
 module.exports = {
   addNew,