Remove redundant function from transactionData.js

controllers/transactionData.js

@@ -28,10 +28,11 @@ module.exports = {
         }
         let startDate = new Date(req.body.startDate);
         let endDate = new Date(req.body.endDate);
-        endDate = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate() + 1);
+        endDate.setDate(endDate.getDate() + 1);
+
         Transaction.aggregate([
             {$match: {
-                merchant: new ObjectId(req.session.user),
+                merchant: ObjectId(req.session.user),
                 date: {
                     $gte: startDate,
                     $lt: endDate
@@ -135,34 +136,6 @@ module.exports = {
             });
     },
 
-    getTransactionsByDate: function(req, res){
-        if(!req.session.user){
-            req.session.error = "MUST BE LOGGED IN TO DO THAT";
-            return res.redirect("/");
-        }
-
-        const from = new Date(req.body.from);
-        let to = new Date(req.body.to);
-        to.setDate(to.getDate() + 1);
-
-        Transaction.aggregate([
-            {$match: {
-                merchant: ObjectId(req.session.user),
-                date: {
-                    $gte: from,
-                    $lt: to
-                }
-            }},
-            {$sort: {date: 1}}
-        ])
-            .then((transactions)=>{
-                return res.json(transactions);
-            })
-            .catch((err)=>{
-                return res.json("ERROR: UNABLE TO RETRIEVE YOUR DATA");
-            });
-    },
-
     /*
     GET - Creates 5000 transactions for logged in merchant for testing
     */

routes.js

@@ -50,7 +50,6 @@ module.exports = function(app){
     app.post("/transaction", transactionData.getTransactions);
     app.post("/transaction/create", transactionData.createTransaction);
     app.delete("/transaction/:id", transactionData.remove);
-    app.post("/transaction/retrieve", transactionData.getTransactionsByDate);
     app.get("/populatesometransactions", transactionData.populate);
 
     //Other

views/dashboardPage/bundle.js

@@ -3124,30 +3124,35 @@ let analytics = {
     },
 
     changeDates: function(Transaction){
-        let dates = {
-            from: document.getElementById("analStartDate").valueAsDate,
-            to: document.getElementById("analEndDate").valueAsDate
+        let data = {
+            startDate: document.getElementById("analStartDate").valueAsDate,
+            endDate: document.getElementById("analEndDate").valueAsDate,
+            recipes: []
         }
 
-        if(dates.from > dates.to || dates.from === "" || dates.to === "" || dates.to > new Date()){
+        if(data.from > data.to || data.from === "" || data.to === "" || data.to > new Date()){
             banner.createError("INVALID DATE");
             return;
         }
 
+        for(let i = 0; i < merchant.recipes.length; i++){
+            data.recipes.push(merchant.recipes[i].id);
+        }
+
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        fetch("/transaction/retrieve", {
+        fetch("/transaction", {
             method: "post",
             headers: {
                 "Content-Type": "application/json;charset=utf-8"
             },
-            body: JSON.stringify(dates)
+            body: JSON.stringify(data)
         })
             .then(response => response.json())
             .then((response)=>{
                 if(typeof(response) === "string"){
-                    banner.createError(response.data);
+                    banner.createError(response);
                 }else{
                     this.transactions = [];
 

views/dashboardPage/js/strands/analytics.js

@@ -263,30 +263,35 @@ let analytics = {
     },
 
     changeDates: function(Transaction){
-        let dates = {
-            from: document.getElementById("analStartDate").valueAsDate,
-            to: document.getElementById("analEndDate").valueAsDate
+        let data = {
+            startDate: document.getElementById("analStartDate").valueAsDate,
+            endDate: document.getElementById("analEndDate").valueAsDate,
+            recipes: []
         }
 
-        if(dates.from > dates.to || dates.from === "" || dates.to === "" || dates.to > new Date()){
+        if(data.from > data.to || data.from === "" || data.to === "" || data.to > new Date()){
             banner.createError("INVALID DATE");
             return;
         }
 
+        for(let i = 0; i < merchant.recipes.length; i++){
+            data.recipes.push(merchant.recipes[i].id);
+        }
+
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        fetch("/transaction/retrieve", {
+        fetch("/transaction", {
             method: "post",
             headers: {
                 "Content-Type": "application/json;charset=utf-8"
             },
-            body: JSON.stringify(dates)
+            body: JSON.stringify(data)
         })
             .then(response => response.json())
             .then((response)=>{
                 if(typeof(response) === "string"){
-                    banner.createError(response.data);
+                    banner.createError(response);
                 }else{
                     this.transactions = [];