Remove error saving and collection

controllers/ingredientData.js

@@ -11,15 +11,7 @@ module.exports = {
                 return res.json(ingredients);
             })
             .catch((err)=>{
-                let errorMessage = "Unable to retrieve ingredients";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve ingredients");
             });
     },
 
@@ -34,15 +26,7 @@ module.exports = {
                 return res.json(ingredients);
             })
             .catch((err)=>{
-                let errorMessage = "There was an error and the ingredients could not be created";
-                let error = new Error({
-                    code: 547,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: new ingredients could not be created");
             });
     },
 
@@ -74,39 +58,15 @@ module.exports = {
                                 return res.json(item);
                             })
                             .catch((err)=>{
-                                let errorMessage = "There was an error and the data could not be saved";
-                                let error = new Error({
-                                    code: 547,
-                                    displayMessage: errorMessage,
-                                    error: err
-                                });
-                                error.save();
-                
-                                return res.json(errorMessage);
+                                return res.json("Error: ingredient could not be saved");
                             });
                     })
                     .catch((err)=>{
-                        let errorMessage = "There was an error and your data could not be retrieved";
-                        let error = new Error({
-                            code: 626,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-        
-                        return res.json(errorMessage);
+                        return res.json("Error: could not retrieve user data");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "There was an error and the ingredient could not be created";
-                let error = new Error({
-                    code: 547,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: could not create new ingredient");
             });
     }
 }

controllers/merchantData.js

@@ -1,7 +1,6 @@
 const axios = require("axios");
 const bcrypt = require("bcryptjs");
 
-const Error = require("../models/error");
 const Merchant = require("../models/merchant");
 const Recipe = require("../models/recipe");
 const InventoryAdjustment = require("../models/inventoryAdjustment");
@@ -61,15 +60,7 @@ module.exports = {
 
                         Recipe.create(newRecipes)
                             .catch((err)=>{
-                                let errorMessage = "There was an error and your new recipes could not be saved";
-                                let error = new Error({
-                                    code: 547,
-                                    displayMessage: errorMessage,
-                                    error: err
-                                });
-                                error.save();
-
-                                return res.json(errorMessage);
+                                return res.json("Error: unable to create recipes");
                             });
 
                         merchant.save()
@@ -80,51 +71,19 @@ module.exports = {
                                         return res.json(newestMerchant);
                                     })
                                     .catch((err)=>{
-                                        let errorMessage = "Unable to retrieve recipe ingredients";
-                                        let error = new Error({
-                                            code: 626,
-                                            displayMessage: errorMessage,
-                                            error: err
-                                        });
-                                        error.save();
-
-                                        return res.json(errorMessage);
+                                        return res.json("Error: unable to retrieve user data");
                                     });
                             })
                             .catch((err)=>{
-                                let errorMessage = "Unable to save changes from Clover";
-                                let error = new Error({
-                                    code: 547,
-                                    displayMessage: errorMessage,
-                                    error: err
-                                });
-                                error.save();
-
-                                return res.json(errorMessage);
+                                return res.json("Error: unable to retrieve user data");
                             });
                     })
                     .catch((err)=>{
-                        let errorMessage = "Unable to retrieve data from Clover";
-                        let error = new Error({
-                            code: 111,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-
-                        return res.json(errorMessage);
+                        return res.json("Error: unable to retrieve data from Clover");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "Unable to retrieve merchant data";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve user data");
             });
     },
 
@@ -189,39 +148,21 @@ module.exports = {
                                 return res.redirect("/inventory");
                             })
                             .catch((err)=>{
-                                let errorMessage = "There was an error and your account could not be created";
-                                let error = new Error({
-                                    code: 547,
-                                    displayMessage: errorMessage,
-                                    error: err
-                                });
-                                error.save();
+                                req.session.error = "Error: your data could not be saved";
 
-                                return;
+                                return res.redirect("/");
                             });
                     })
                     .catch((err)=>{
-                        let errorMessage = "There was an error and your recipes could not be saved";
-                        let error = new Error({
-                            code: 547,
-                            displaymessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-
-                        return;
+                        req.session.error = "Error: your recipes could not be created";
+                        
+                        return res.redirect("/");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "Unable to retrieve your data from Clover";
-                let error = new Error({
-                    code: 111,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save()
+                req.session.error = "Error: Unable to retrieve your data from Clover";
 
-                return;
+                return res.redirect("/");
             });
     },
 
@@ -282,27 +223,15 @@ module.exports = {
                         return res.redirect("/inventory");
                     })
                     .catch((err)=>{
-                        let errorMessage = "There was an error and your account could not be created";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
+                        req.session.error = "Error: unable to save user data";
 
-                        return;
+                        return res.redirect("/");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "There was an error while trying to save your recipes";
-                let error = new Error({
-                    code: 547,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
+                req.session.error = "Error: unable to create recipes";
 
-                return;
+                return res.redirect("/");
             });
     },
 
@@ -331,15 +260,7 @@ module.exports = {
                     .then((newMerchant)=>{
                         newMerchant.populate("inventory.ingredient", (err)=>{
                             if(err){
-                                let errorMessage = "Ingredient updated, page refresh required to display";
-                                let error = new Error({
-                                    code: 626,
-                                    displayMessage: errorMessage,
-                                    error: err
-                                });
-                                error.save();
-
-                                return res.json(errorMessage);
+                                return res.json("Warning: refresh page to view updates");
                             }else{
                                 let newIngredient = newMerchant.inventory.find(i => i.ingredient._id.toString() === req.body.ingredient);
                                 return res.json(newIngredient);
@@ -347,29 +268,11 @@ module.exports = {
                         });
                     })
                     .catch((err)=>{
-                        let errorMessage = "Unable to save new ingredient";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-                        console.log(err);
-
-                        return res.json(errorMessage);
+                        return res.json("Error: unable to save new ingredient");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "Unable to retrieve merchant data";
-                let error = new Error({
-                    code: 547,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-                console.log("error2");
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve user data");
             });
     },
 
@@ -397,27 +300,11 @@ module.exports = {
                         return res.json(req.body);
                     })
                     .catch((err)=>{
-                        let errorMessage = "Unable to update ingredients";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-
-                        return res.json(errorMessage);
+                        return res.json("Error: unable to save user data");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "Unable to retrieve merchant data";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve user data");
             });
     },
 
@@ -441,27 +328,11 @@ module.exports = {
                         res.json({});
                     })
                     .catch((err)=>{
-                        let errorMessage = "Error: your data could not be saved";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-
-                        return res.json(errorMessage);
+                        return res.json("Error: your data could not be saved");
                     })
             })
             .catch((err)=>{
-                let errorMessage = "Error: your data could not be retrieved";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: your data could not be retrieved");
             });
 
         let invAdj = new InventoryAdjustment({
@@ -471,15 +342,7 @@ module.exports = {
             quantity: req.body.quantityChange
         });
 
-        invAdj.save()
-            .catch((err)=>{
-                let error = new Error({
-                    code: 547,
-                    displayMessage: "none",
-                    error: err
-                });
-                error.save();
-            });
+        invAdj.save().catch((err)=>{});
     },
 
     //POST - Adds an ingredient to a recipe
@@ -505,15 +368,7 @@ module.exports = {
                     .then((recipe)=>{
                         recipe.populate("ingredients.ingredient", (err)=>{
                             if(err){
-                                let errorMessage = "Error: could not retrieve ingredients.  Please refresh page to see changes";
-                                let error = new Error({
-                                    code: 626,
-                                    displayMessage: errorMessage,
-                                    error: err
-                                });
-                                error.save();
-
-                                return res.json(errorMessage);
+                                return res.json("Error: could not retrieve ingredients.  Please refresh page to see changes");
                             }
                             res.json(recipe);
 
@@ -522,41 +377,17 @@ module.exports = {
                                 ingredient: req.body.item.ingredient,
                                 change: req.body.item.quantity
                             });
-                            rc.save()
-                                .catch((err)=>{
-                                    let error = new Error({
-                                        code: 120,
-                                        displayMessage: "none",
-                                        error: err
-                                    });
-                                    error.save();
-                                });
+                            rc.save().catch((err)=>{});
 
                             return;
                         })
                     })
                     .catch((err)=>{
-                        let errorMessage = "There was an error and the recipe could not be updated";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-
-                        return res.json(errorMessage);
+                        return res.json("Error: unable to save recipe data");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "There was an error and the recipe could not be updated"
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve recipe data");
             });
     },
 
@@ -587,42 +418,18 @@ module.exports = {
                                     ingredient: ingredient.ingredient,
                                     change: change
                                 });
-                                rc.save()
-                                    .catch((err)=>{
-                                        let error = new Error({
-                                            code: 120,
-                                            errorMessage: "none",
-                                            error: err
-                                        });
-                                        error.save();
-                                    });
+                                rc.save().catch((err)=>{});
 
                                 return;
                             })
                             .catch((err)=>{
-                                let errorMessage = "There was an error and the recipe could not be updated";
-                                let error = new Error({
-                                    code: 547,
-                                    displayMessage: errorMessage,
-                                    error: err
-                                });
-                                error.save();
-                
-                                return res.json(errorMessage);
+                                return res.json("Error: Could not save recipe data");
                             });
                     }
                 }
             })
             .catch((err)=>{
-                let errorMessage = "There was an error and the recipe could not be updated";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve recipe data");
             });
     },
 
@@ -656,40 +463,16 @@ module.exports = {
                             ingredient: req.body.ingredientId,
                             change: -req.body.quantity
                         });
-                        rc.save()
-                            .catch((err)=>{
-                                let error = new Error({
-                                    code: 120,
-                                    displayMessage: "none",
-                                    error: err
-                                });
-                                error.save();
-                            });
+                        rc.save().catch((err)=>{});
 
                         return;
                     })
                     .catch((err)=>{
-                        let errorMessage = "There was an error and the ingredient could not be remove from the recipe";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-        
-                        return res.json(errorMessage);
+                        return res.json("Error: unable to save recipe data");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "There was an error and the ingredient could not be removed from the recipe";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve recipe data");
             });
     },
 

controllers/otherData.js

@@ -42,41 +42,18 @@ module.exports = {
                         res.json({});
                     })
                     .catch((err)=>{
-                        let errorMessage = "There was an error and your transactions could not be saved";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-
-                        return res.json(errorMessage);
+                        return res.json("Error: unable to save user data");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "There was an error and your data could not be retrieved";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to retrieve user data");
             });
 
         transaction.save()
             .then((transaction)=>{
                 return;
             })
-            .catch((err)=>{
-                let error = new Error({
-                    code: 120,
-                    displayMessage: "none",
-                    error: err
-                });
-                error.save();
-            });
+            .catch((err)=>{});
     },
 
     //POST - Creates a new purchase for a merchant
@@ -100,27 +77,11 @@ module.exports = {
                         res.json({});
                     })
                     .catch((err)=>{
-                        let errorMessage = "Error: Unable to save data";
-                        let error = new Error({
-                            code: 547,
-                            displayMessage: errorMessage,
-                            error: err
-                        });
-                        error.save();
-
-                        return res.json(errorMessage);
+                        return res.json("Error: Unable to save data");
                     });
             })
             .catch((err)=>{
-                let errorMessage = "Error: Unable to retrieve user data";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: Unable to retrieve user data");
             });
 
             let purchase = new Purchase({
@@ -128,16 +89,7 @@ module.exports = {
                 date: Date.now(),
                 ingredients: req.body
             });
-
-            purchase.save()
-                .catch((err)=>{
-                    let error = new Error({
-                        code: 120,
-                        displayMessage: "none",
-                        error: err
-                    });
-                    error.save();
-                });
+            purchase.save().catch((err)=>{});
     },
 
     //POST - logs the user in
@@ -165,12 +117,6 @@ module.exports = {
             })
             .catch((err)=>{
                 req.session.error = "There was an error and your data could not be retrieved";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: req.session.error,
-                    error: err
-                });
-                error.save();
 
                 return res.redirect("/");
             });
@@ -194,29 +140,21 @@ module.exports = {
             .then((merchant)=>{
                 if(merchant){
                     return res.json(false);
-                }else{
-                    return res.json(true);
                 }
-                
+
+                return res.json(true);
             })
             .catch((err)=>{
-                let errorMessage = "Error: unable to validate email address";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: errorMessage,
-                    error: err
-                });
-                error.save();
-
-                return res.json(errorMessage);
+                return res.json("Error: unable to validate email address");
             });
     },
 
-    //Get - Redirects user to Clover OAuth page
+    //GET - Redirects user to Clover OAuth page
     clover: function(req, res){
         return res.redirect(`${process.env.CLOVER_ADDRESS}/oauth/authorize?client_id=${process.env.SUBLINE_CLOVER_APPID}&redirect_uri=${process.env.SUBLINE_CLOVER_URI}`);
     },
 
+    //GET - Get access token from clover and  redirect to mearchant creation
     cloverAuth: function(req, res){
         let dataArr = req.url.slice(req.url.indexOf("?") + 1).split("&");
         let authorizationCode = "";

controllers/renderer.js

@@ -1,6 +1,5 @@
 const axios = require("axios");
 
-const Error = require("../models/error");
 const Merchant = require("../models/merchant");
 const Ingredient = require("../models/ingredient");
 const Transaction = require("../models/transaction");
@@ -83,26 +82,14 @@ module.exports = {
                                     return;
                                 })
                                 .catch((err)=>{
-                                    let errorMessage = "There was an error and your transactions could not be updated";
-                                    let error = new Error({
-                                        code: 547,
-                                        displayMessage: errorMessage,
-                                        error: err
-                                    });
-                                    error.save()
-
+                                    let errorMessage = "Error: unable to save user data";
+                                    
                                     merchant.password = undefined;
                                     return res.render("inventoryPage/inventory", {merchant: updatedMerchant, error: errorMessage});
                                 });
                         })
                         .catch((err)=>{
                             let errorMessage = "There was an error and we could not retrieve your transactions from Clover";
-                            let error = new Error({
-                                code: 111,
-                                displayMessage: errorMessage,
-                                error: err
-                            });
-                            error.save()
 
                             merchant.password = undefined;
                             return res.render("inventoryPage/inventory", {merchant: merchant, error: errorMessage});
@@ -111,26 +98,14 @@ module.exports = {
                     merchant.password = undefined;
                     return res.render("inventoryPage/inventory", {merchant: merchant, error: undefined})
                 }else{
-                    req.session.error = "There was an error and your data could not be retrieved";
-                    let error = new Error({
-                        code: 626,
-                        displayMessage: req.session.error,
-                        error: "merchant.pos did not conform to expectations"
-                    });
-                    error.save();
-
+                    req.session.error = "Error: WEBSITE PANIC";
+                    
                     return res.redirect("/");
                 }
             })
             .catch((err)=>{
-                req.session.error = "There was an error and your data could not be retrieved";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: req.session.error,
-                    error: err
-                });
-                error.save();
-
+                req.session.error = "Error: could not retrieve user data";
+                
                 return res.redirect("/");
             });
     },
@@ -157,26 +132,14 @@ module.exports = {
                         return res.render("merchantSetupPage/merchantSetup", {ingredients: ingredients, recipes: recipes.data, error: errorMessage});
                     })
                     .catch((err)=>{
-                        req.session.error = "We were unable to retrieve your data from Clover"
-                        let error = new Error({
-                            code: 111,
-                            displayMessage: req.session.error,
-                            error: err
-                        });
-                        error.save();
-
+                        req.session.error = "Error: unable to retrieve data from Clover";
+                        
                         return res.redirect("/");
                     });
             })
             .catch((err)=>{
-                req.session.error = "Data for new merchants could not be retrieved";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: req.session.error,
-                    error: err
-                });
-                error.save();
-
+                req.session.error = "Error: data for new merchants could not be retrieved";
+                
                 return res.redirect("/");
             });
     },
@@ -201,13 +164,9 @@ module.exports = {
                 return res.render("merchantSetupPage/merchantSetup", {ingredients: ingredients, recipes: null, error: errorMessage});
             })
             .catch((err)=>{
-                req.session.error = "Data for new merchants could not be retrieved";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: req.session.error,
-                    error: err
-                });
-                error.save();
+                req.session.error = "Error: data for new merchants could not be retrieved";
+
+                return res.redirect("/");
             });
     },
 
@@ -236,14 +195,8 @@ module.exports = {
                 return res.render("recipesPage/recipes", {merchant: merchant});
             })
             .catch((err)=>{
-                req.session.error = "There was an error and your data could not be retrieved";
-                let error = new Error({
-                    code: 626,
-                    displayMessage: req.session.error,
-                    error: err
-                });
-                error.save();
-
+                req.session.error = "Error: unable to retrieve user data";
+            
                 return res.redirect("/");
             });
     },

models/error.js

@@ -1,13 +0,0 @@
-const mongoose = require("mongoose");
-
-const ErrorSchema = new mongoose.Schema({
-    code: Number,
-    date: {
-        type: Date,
-        default: Date.now
-    },
-    displayMessage: String,
-    error: {}
-});
-
-module.exports = mongoose.model("Error", ErrorSchema);