check deleted resource perms

opengovsg · Dec 20, 2024 · c70b580 · c70b580
1 parent ffb7c85
commit c70b580
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/apps/studio/src/server/modules/permissions/permissions.service.ts b/apps/studio/src/server/modules/permissions/permissions.service.ts
@@ -26,6 +26,7 @@ export const definePermissionsForResource = async ({
     .selectFrom("ResourcePermission")
     .where("userId", "=", userId)
     .where("siteId", "=", siteId)
+    .where("deletedAt", "is", null)
 
   if (!resourceId) {
     query = query.where("resourceId", "is", null)
@@ -50,6 +51,7 @@ export const definePermissionsForSite = async ({
     .where("userId", "=", userId)
     .where("siteId", "=", siteId)
     .where("resourceId", "is", null)
+    .where("deletedAt", "is", null)
     .select("role")
     .execute()
 

diff --git a/apps/studio/src/server/modules/resource/resource.router.ts b/apps/studio/src/server/modules/resource/resource.router.ts
@@ -469,6 +469,7 @@ export const resourceRouter = router({
         .selectFrom("ResourcePermission")
         .where("userId", "=", ctx.user.id)
         .where("siteId", "=", siteId)
+        .where("deletedAt", "is", null)
 
       if (!resourceId) {
         query.where("resourceId", "is", null)

diff --git a/apps/studio/src/server/modules/site/site.router.ts b/apps/studio/src/server/modules/site/site.router.ts
@@ -28,6 +28,7 @@ export const siteRouter = router({
     return db
       .selectFrom("Site")
       .innerJoin("ResourcePermission", "Site.id", "ResourcePermission.siteId")
+      .where("ResourcePermission.deletedAt", "is", null)
       .where("ResourcePermission.userId", "=", ctx.user.id)
       .select(["Site.id", "Site.name", "Site.config"])
       .groupBy(["Site.id", "Site.name", "Site.config"])