Sfoglia il codice sorgente

Update renderer to only retrieve and return the necessary data from the merchant

Lee Morgan 6 anni fa
parent
commit
a289562dc6

+ 0 - 1
controllers/ingredientData.js

@@ -65,7 +65,6 @@ module.exports = {
                 return res.json(newIngredient);
             })
             .catch((err)=>{
-                console.log(err);
                 return res.json("ERROR: UNABLE TO CREATE NEW INGREDIENT");
             });
     }

+ 2 - 3
controllers/recipeData.js

@@ -158,10 +158,9 @@ module.exports = {
             return res.redirect("/");
         }
 
-        Merchant.find({_id: req.session.user})
+        Merchant.findOne({_id: req.session.user})
             .populate("recipes")
-            .then((response)=>{
-                merchant = response[0];
+            .then((merchant)=>{
                 axios.get(`https://apisandbox.dev.clover.com/v3/merchants/${merchant.posId}/items?access_token=${merchant.posAccessToken}`)
                     .then((result)=>{
                         let deletedRecipes = merchant.recipes.slice();

+ 18 - 1
controllers/renderer.js

@@ -52,7 +52,18 @@ module.exports = {
             .save()
             .catch(()=>{});
 
-        Merchant.findOne({_id: req.session.user}, {password: 0, createdAt: 0})
+        Merchant.findOne(
+            {_id: req.session.user},
+            {
+                name: 1,
+                pos: 1,
+                posId: 1,
+                posAccessToken: 1,
+                lastUpdatedTime: 1,
+                inventory: 1,
+                recipes: 1
+            }
+        )
             .populate("inventory.ingredient")
             .populate("recipes")
             .then(async (merchant)=>{
@@ -164,11 +175,17 @@ module.exports = {
                     }}
                 ])
                     .then((transactions)=>{
+                        response[0]._id = undefined;
+                        response[0].posAccessToken = undefined;
+                        response[0].lastUpdatedTime = undefined;
+                        response[0].accountStatus = undefined;
+
                         return res.render("dashboardPage/dashboard", {merchant: response[0], transactions: transactions});
                     })
                     .catch((err)=>{});
             })
             .catch((err)=>{
+                console.log(err);
                 req.session.error = "ERROR: UNABLE TO RETRIEVE USER DATA";
                 return res.redirect("/");
             });

+ 0 - 2
views/dashboardPage/sidebars/sidebars.js

@@ -326,7 +326,6 @@ let newIngredientComp = {
 
         let unit = unitSelector.value;
 
-        console.log(options[unitSelector.selectedIndex].getAttribute("type"));
         let newIngredient = {
             ingredient: {
                 name: document.getElementById("newIngName").value,
@@ -350,7 +349,6 @@ let newIngredientComp = {
             .then((response) => response.json())
             .then((response)=>{
                 if(typeof(response) === "string"){
-                    console.log(response);
                     banner.createError(response);
                 }else{
                     merchant.editIngredients([{