feat: Change scope so the filtered resources have all tags included

openstad · Oct 14, 2024 · 0953c95 · 0953c95
1 parent 03fb15e
commit 0953c95
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/apps/api-server/src/models/Resource.js b/apps/api-server/src/models/Resource.js
@@ -668,18 +668,14 @@ module.exports = function (db, sequelize, DataTypes) {
 
       selectTags: function (tags) {
         return {
-          include: [
-            {
-              model: db.Tag,
-              attributes: ['id', 'name'],
-              through: { attributes: [] },
-              where: {
-                id: {
-                  [db.Sequelize.Op.in]: tags,
-                },
-              },
+          where: {
+            id: {
+              [db.Sequelize.Op.in]: db.Sequelize.literal(`
+                (SELECT resourceId FROM resource_tags 
+                WHERE tagId IN (${tags.map(tag => `'${tag}'`).join(', ')}))
+              `),
             },
-          ],
+          },
         };
       },