fix conflicts and rework routes

api/request.js

@@ -1,43 +1,41 @@
 const express = require("express");
 const path = require("path");
-const router = express.Router();
-const fetch = require('node-fetch');
-const { send } = require("process");
 const RequestedWine = require(path.join(
   __dirname + "/../schemas/RequestedWine"
 ));
 const Wine = require(path.join(
   __dirname + "/../schemas/Wine"
 ));
-const mustBeAuthenticated = require(path.join(
-  __dirname + "/../middleware/mustBeAuthenticated"
-));
 
-router.use((req, res, next) => {
-  next();
-});
+const deleteRequestedWineById = async (req, res) => {
+  const { id } = req.params;
+  if(id == null){
+    return res.json({
+      message: "Id er ikke definert",
+      success: false
+    })
+  }
 
-router.route("/request/").delete(mustBeAuthenticated, async (req, res) => {
-  await RequestedWine.deleteOne({wineId: req.body.id})
-  res.json(true);
-})
+  await RequestedWine.deleteOne({wineId: id})
+  return res.json({
+    message: `Slettet vin med id: ${id}`,
+    success: true
+  }); 
+}
 
-router.route("/request").get(async (req, res) => {
-  const rWines = await RequestedWine.find({}).populate("wine")
-  return res.send(rWines)
-})
-
-router.route("/request/all").get(async (req, res) => {
+const getAllRequestedWines = async (req, res) => {
   const allWines = await RequestedWine.find({}).populate("wine");
+  
+  return res.json(allWines);
+}
 
-  res.json(allWines);
-});
-
-router.route("/request").post(async (req, res) => {
+const requestNewWine = async (req, res) => {
   const {wine} = req.body
 
+  console.log(req.body)
+  
   let thisWineIsLOKO = await Wine.findOne({id: wine.id})
-
+  
   if(thisWineIsLOKO == undefined){
     thisWineIsLOKO = new Wine({
       name: wine.name,
@@ -49,7 +47,7 @@ router.route("/request").post(async (req, res) => {
     });
     await thisWineIsLOKO.save()
   }
-
+  
   let requestedWine = await RequestedWine.findOne({ "wineId": wine.id})
   
   if(requestedWine == undefined){
@@ -62,9 +60,12 @@ router.route("/request").post(async (req, res) => {
     requestedWine.count += 1;
   }
   await requestedWine.save()
+  
+  return res.send(requestedWine);
+}
 
-  res.send(requestedWine);
-
-});
-
-module.exports = router;
+module.exports = {
+  requestNewWine,
+  getAllRequestedWines,
+  deleteRequestedWineById
+};