limit & filter recomends

webresto · Aug 23, 2024 · fb4d29e · fb4d29e
1 parent 4875373
commit fb4d29e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/models/Dish.js b/models/Dish.js
@@ -374,7 +374,7 @@ let Model = {
         }
         return updatedDishes;
     },
-    getRecommended: async function (ids, limit = 12, includeReverse = true) {
+    getRecommended: async function (ids, limit = 12, includeReverse = false) {
         if (!Array.isArray(ids) || ids.length === 0) {
             throw new Error('You must provide an array of IDs.');
         }
@@ -402,6 +402,7 @@ let Model = {
             });
         }
         recommendedDishes = [...new Set(recommendedDishes.map((dish) => dish.id))].map(id => recommendedDishes.find((dish) => dish.id === id));
+        recommendedDishes = recommendedDishes.filter((dish) => !ids.includes(dish.id));
         // Fisher-Yates shifle
         recommendedDishes = recommendedDishes.sort(() => Math.random() - 0.5);
         if (limit && Number.isInteger(limit) && limit > 0) {

diff --git a/models/Dish.ts b/models/Dish.ts
@@ -466,7 +466,7 @@ let Model = {
   },
 
 
-  getRecommended: async function(ids: string[], limit = 12, includeReverse = true): Promise<Dish[]> {
+  getRecommended: async function(ids: string[], limit = 12, includeReverse = false): Promise<Dish[]> {
     if (!Array.isArray(ids) || ids.length === 0) {
       throw new Error('You must provide an array of IDs.');
     }
@@ -490,7 +490,7 @@ let Model = {
     });
 
 
-    let recommendedDishes = dishes.reduce((acc: Dish[], dish:Dish) => {
+    let recommendedDishes: Dish[] = dishes.reduce((acc: Dish[], dish:Dish) => {
       return acc.concat(dish.recommendations);
     }, []);
 
@@ -505,6 +505,8 @@ let Model = {
       recommendedDishes.find((dish: Dish) => dish.id === id)
     );
 
+    recommendedDishes = recommendedDishes.filter((dish: Dish) => !ids.includes(dish.id));
+
     // Fisher-Yates shifle
     recommendedDishes = recommendedDishes.sort(() => Math.random() - 0.5);