fix: withCollection scopes on UserPermission, GroupPermission

2023-09-27 23:08:06 -04:00
parent 6eab716779
commit 5a89edbcb2
4 changed files with 69 additions and 14 deletions
--- a/server/models/UserPermission.ts
+++ b/server/models/UserPermission.ts
@@ -25,15 +25,14 @@ import Fix from "./decorators/Fix";
    ],
  },
  withCollection: {
+    where: {
+      collectionId: {
+        [Op.ne]: null,
+      },
+    },
    include: [
      {
-        model: Collection,
-        as: "collection",
-        where: {
-          collectionId: {
-            [Op.ne]: null,
-          },
-        },
+        association: "collection",
      },
    ],
  },