fix: resource permission indexes (#2890)

labring · Oct 12, 2024 · fe6c889 · fe6c889
1 parent 0dcda98
commit fe6c889
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/packages/service/support/permission/controller.ts b/packages/service/support/permission/controller.ts
@@ -47,10 +47,10 @@ export const getResourcePermission = async ({
   const tmbPer = (
     await MongoResourcePermission.findOne(
       {
-        tmbId,
-        teamId,
         resourceType,
-        resourceId
+        teamId,
+        resourceId,
+        tmbId
       },
       'permission'
     ).lean()
@@ -109,9 +109,9 @@ export async function getResourceAllClbs({
 )): Promise<ResourcePermissionType[]> {
   return MongoResourcePermission.find(
     {
-      resourceId,
       resourceType: resourceType,
       teamId: teamId,
+      resourceId,
       groupId: {
         $exists: false
       }
@@ -131,8 +131,8 @@ export const delResourcePermission = ({
   ...props
 }: {
   resourceType: PerResourceTypeEnum;
-  resourceId: string;
   teamId: string;
+  resourceId: string;
   tmbId: string;
   session?: ClientSession;
 }) => {

diff --git a/packages/service/support/permission/schema.ts b/packages/service/support/permission/schema.ts
@@ -44,12 +44,33 @@ try {
     {
       resourceType: 1,
       teamId: 1,
-      tmbId: 1,
       resourceId: 1,
       groupId: 1
     },
     {
-      unique: true
+      unique: true,
+      partialFilterExpression: {
+        groupId: {
+          $exists: true
+        }
+      }
+    }
+  );
+
+  ResourcePermissionSchema.index(
+    {
+      resourceType: 1,
+      teamId: 1,
+      resourceId: 1,
+      tmbId: 1
+    },
+    {
+      unique: true,
+      partialFilterExpression: {
+        tmbId: {
+          $exists: true
+        }
+      }
     }
   );