Change orders.js to fetch orders from different route.

Create more generic function on backend for getting orders.
Update the routes.

controllers/orderData.js

@@ -6,105 +6,59 @@ const helper = require("./helper.js");
 const ObjectId = require("mongoose").Types.ObjectId;
 const xlsx = require("xlsx");
 const fs = require("fs");
-const { base } = require("../models/merchant.js");
-const { parse } = require("path");
 
 module.exports = {
+    
     /*
-    GET - get the 25 most recent orders
-    return = [
-        _id: id of order,
-        name: user created id for order,
-        date: date order was created,
-        ingredients: [{
-            _id: unused id of this object,
-            ingredient: id of the ingredient,
-            price: price per unit of the ingredient,
-            quantity: quantity of ingredient in this order
-        }]
-    ]
-    */
-    getOrders: function(req, res){
-        if(!req.session.user){
-            req.session.error = "MUST BE LOGGED IN TO DO THAT";
-            return res.redirect("/");
-        }
-
-        Order.aggregate([
-            {$match: {merchant: ObjectId(req.session.user)}},
-            {$sort: {date: -1}},
-            {$limit: 25},
-            {$project: {
-                name: 1,
-                date: 1,
-                taxes: 1,
-                fees: 1,
-                ingredients: 1
-            }}
-        ])
-            .then((orders)=>{
-                return res.json(orders);
-            })
-            .catch((err)=>{
-                if(typeof(err) === "string"){
-                    return res.json(err);
-                }
-                if(err.name === "ValidationError"){
-                    return res.json(err.errors[Object.keys(err.errors)[0]].properties.message);
-                }
-                return res.json("ERROR: UNABLE TO RETRIEVE YOUR ORDERS");
-            });
-    },
-
-    /*
-    POST - retrieves a list of transactions based on the filter
+    GET: gets orders based on queries
     req.body = {
-        startDate: starting date to filter on,
-        endDate: ending date to filter on,
-        ingredients: list of recipes.to filter on
+        from: Date (starting date/time)
+        to: Date (ending date/time)
+        ingredients: [id] (list of transactions to search for)
+            empty list gets all
     }
     */
-    orderFilter: function(req, res){
+    getOrders: function(req, res){
         if(!req.session.user){
             req.session.error = "MUST BE LOGGED IN TO DO THAT";
             return res.redirect("/");
         }
+        let from = new Date(req.body.from);
+        let to = new Date(req.body.to);
 
+        let match = {};
         let objectifiedIngredients = [];
-        for(let i = 0; i < req.body.ingredients.length; i++){
-            objectifiedIngredients.push(new ObjectId(req.body.ingredients[i]));
+        if(req.body.ingredients.length === 0){
+            match = {$exists: true};
+        }else{  
+            for(let i = 0; i < req.body.ingredients; i++){
+                objectifiedIngredients.push(new ObjectId(req.body.ingredients[i]));
+            }
+
+            match = {
+                $elemMatch: {
+                    ingredient: {
+                        $in: objectifiedIngredients
+                    }
+                }
+            }
         }
-        let startDate = new Date(req.body.startDate);
-        let endDate = new Date(req.body.endDate);
-        endDate = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate() + 1);
+
         Order.aggregate([
-            {$match: {
+            {$match:{
                 merchant: new ObjectId(req.session.user),
                 date: {
-                    $gte: startDate,
-                    $lt: endDate
+                    $gte: from,
+                    $lt: to
                 },
-                ingredients: {
-                    $elemMatch: {
-                        ingredient: {
-                            $in: objectifiedIngredients
-                        }
-                    }
-                }
-            }},
-            {$sort: {date: -1}}
+                ingredients: match
+            }}
         ])
             .then((orders)=>{
                 return res.json(orders);
             })
             .catch((err)=>{
-                if(typeof(err) === "string"){
-                    return res.json(err);
-                }
-                if(err.name === "ValidationError"){
-                    return res.json(err.errors[Object.keys(err.errors)[0]].properties.message);
-                }
-                return res.json("ERROR: UNABLE TO RETRIEVE YOUR TRANSACTIONS");
+                return res.json("ERROR: UNABLE TO RETRIEVE YOUR ORDERS");
             });
     },
 

routes.js

@@ -43,8 +43,9 @@ module.exports = function(app){
     app.get("/recipes/download/spreadsheet", recipeData.spreadsheetTemplate);
 
     //Orders
-    app.get("/order", orderData.getOrders);
-    app.post("/order", orderData.orderFilter);
+    // app.get("/order", orderData.getOrders);
+    app.post("/orders/get", orderData.getOrders);
+    // app.post("/order", orderData.orderFilter);
     app.post("/order/create", orderData.createOrder);
     app.post("/orders/create/spreadsheet", upload.single("orders"), orderData.createFromSpreadsheet);
     app.get("/orders/download/spreadsheet", orderData.spreadsheetTemplate);

views/dashboardPage/bundle.js

@@ -3681,44 +3681,54 @@ let orders = {
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        return fetch("/order", {
-            method: "get",
+        let to = new Date();
+        let from = new Date(to.getFullYear(), to.getMonth(), to.getDate() - 30);
+        from.setHours(0, 0, 0, 0);
+
+        let body = {
+            to: to.toUTCString(),
+            from: from.toUTCString(),
+            ingredients: []};
+
+        return fetch("/orders/get", {
+            method: "post",
+            body: JSON.stringify(body),
             headers: {
                 "Content-Type": "application/json;charset=utf-8"
             }
         })
-        .then(response => response.json())
-        .then((response)=>{
-            if(typeof(response) === "string"){
-                controller.createBanner(response, "error");
-            }else{
-                let orders = [];
+            .then(response => response.json())
+            .then((response)=>{
+                if(typeof(response) === "string"){
+                    controller.createBanner(response, "error");
+                }else{
+                    let orders = [];
 
-                for(let i = 0; i < response.length; i++){
-                    orders.push(new Order(
-                        response[i]._id,
-                        response[i].name,
-                        response[i].date,
-                        response[i].taxes,
-                        response[i].fees,
-                        response[i].ingredients,
-                        merchant
-                    ));
-                }
+                    for(let i = 0; i < response.length; i++){
+                        orders.push(new Order(
+                            response[i]._id,
+                            response[i].name,
+                            response[i].date,
+                            response[i].taxes,
+                            response[i].fees,
+                            response[i].ingredients,
+                            merchant
+                        ));
+                    }
 
-                if(merchant.orders.length === 0){
-                    merchant.setOrders(orders);
-                }
+                    if(merchant.orders.length === 0){
+                        merchant.setOrders(orders);
+                    }
 
-                return orders;
-            }
-        })
-        .catch((err)=>{
-            controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
-        })
-        .finally(()=>{
-            loader.style.display = "none";
-        });
+                    return orders;
+                }
+            })
+            .catch((err)=>{
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
+            })
+            .finally(()=>{
+                loader.style.display = "none";
+            });
     }
 }
 

views/dashboardPage/js/strands/orders.js

@@ -30,44 +30,54 @@ let orders = {
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        return fetch("/order", {
-            method: "get",
+        let to = new Date();
+        let from = new Date(to.getFullYear(), to.getMonth(), to.getDate() - 30);
+        from.setHours(0, 0, 0, 0);
+
+        let body = {
+            to: to.toUTCString(),
+            from: from.toUTCString(),
+            ingredients: []};
+
+        return fetch("/orders/get", {
+            method: "post",
+            body: JSON.stringify(body),
             headers: {
                 "Content-Type": "application/json;charset=utf-8"
             }
         })
-        .then(response => response.json())
-        .then((response)=>{
-            if(typeof(response) === "string"){
-                controller.createBanner(response, "error");
-            }else{
-                let orders = [];
+            .then(response => response.json())
+            .then((response)=>{
+                if(typeof(response) === "string"){
+                    controller.createBanner(response, "error");
+                }else{
+                    let orders = [];
 
-                for(let i = 0; i < response.length; i++){
-                    orders.push(new Order(
-                        response[i]._id,
-                        response[i].name,
-                        response[i].date,
-                        response[i].taxes,
-                        response[i].fees,
-                        response[i].ingredients,
-                        merchant
-                    ));
-                }
+                    for(let i = 0; i < response.length; i++){
+                        orders.push(new Order(
+                            response[i]._id,
+                            response[i].name,
+                            response[i].date,
+                            response[i].taxes,
+                            response[i].fees,
+                            response[i].ingredients,
+                            merchant
+                        ));
+                    }
 
-                if(merchant.orders.length === 0){
-                    merchant.setOrders(orders);
-                }
+                    if(merchant.orders.length === 0){
+                        merchant.setOrders(orders);
+                    }
 
-                return orders;
-            }
-        })
-        .catch((err)=>{
-            controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
-        })
-        .finally(()=>{
-            loader.style.display = "none";
-        });
+                    return orders;
+                }
+            })
+            .catch((err)=>{
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
+            })
+            .finally(()=>{
+                loader.style.display = "none";
+            });
     }
 }