Merge pull request #199 from julianpoy/fix-recipe-totalCount

Added fromUser query for by-page route
julianpoy · Mar 24, 2019 · a3d318e · a3d318e
2 parents a83dc1d + 60e7796
commit a3d318e
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Backend/routes/recipes.js b/Backend/routes/recipes.js
@@ -174,10 +174,13 @@ router.get(
 
   let recipeAttributes = ['id', 'title', 'description', 'source', 'url', 'image', 'folder', 'fromUserId', 'createdAt', 'updatedAt'];
   let labelAttributes = ['id', 'title'];
+  let fromUserAttributes = ['name', 'email'];
 
   let recipeSelect = recipeAttributes.map(el => `"Recipe"."${el}" AS "${el}"`).join(', ');
   let labelSelect = labelAttributes.map(el => `"Label"."${el}" AS "labels.${el}"`).join(', ');
+  let fromUserSelect = fromUserAttributes.map(el => `"FromUser"."${el}" AS "fromUser.${el}"`).join(', ');
   let fields = `${recipeSelect}, ${labelSelect}`;
+  if (req.query.folder === 'inbox') fields += `, ${fromUserSelect}`;
 
   let countQuery = labelFilter.length > 0 ?
     `SELECT count("Recipe".id)
@@ -208,6 +211,7 @@ router.get(
     INNER JOIN "Recipes" AS "Recipe" ON "Recipe".id = pag.id
     INNER JOIN "Recipe_Labels" AS "Recipe_Label" ON "Recipe_Label"."recipeId" = pag.id
     INNER JOIN "Labels" AS "Label" ON "Label".id = "Recipe_Label"."labelId"
+    ${req.query.folder === 'inbox' ? 'LEFT OUTER JOIN "Users" AS "FromUser" ON "FromUser".id = "Recipe"."fromUserId"' : ''}
     ORDER BY ${sort}`
     :
     `SELECT ${fields} FROM (SELECT "Recipe".id
@@ -220,6 +224,7 @@ router.get(
     INNER JOIN "Recipes" AS "Recipe" ON "Recipe".id = pag.id
     LEFT OUTER JOIN "Recipe_Labels" AS "Recipe_Label" ON "Recipe_Label"."recipeId" = pag.id
     LEFT OUTER JOIN "Labels" AS "Label" ON "Label".id = "Recipe_Label"."labelId"
+    ${req.query.folder === 'inbox' ? 'LEFT OUTER JOIN "Users" AS "FromUser" ON "FromUser".id = "Recipe"."fromUserId"' : ''}
     ORDER BY ${sort}`;
 
   let countQueryOptions = {
@@ -249,6 +254,12 @@ router.get(
     }]
   }
 
+  if (req.query.folder === 'inbox') fetchQueryOptions.include.push({
+    model: User,
+    as: 'fromUser',
+    attributes: fromUserAttributes
+  })
+
   Recipe._validateIncludedElements(fetchQueryOptions);
 
   Promise.all([