refactor: org pathId (#3516)

packages/global/support/user/team/org/constant.ts

@@ -1,6 +1,10 @@
+import { OrgSchemaType } from './type';
+
 export const OrgCollectionName = 'team_orgs';
 export const OrgMemberCollectionName = 'team_org_members';
 
+export const getChildrenPath = (org: OrgSchemaType) => `${org.path}/${org.pathId}`;
+
 // export enum OrgMemberRole {
 //   owner = 'owner',
 //   admin = 'admin',

packages/global/support/user/team/org/type.d.ts

@@ -4,6 +4,7 @@ import { ResourcePermissionType } from '../type';
 type OrgSchemaType = {
   _id: string;
   teamId: string;
+  pathId: string;
   path: string;
   name: string;
   avatar?: string;

packages/service/support/permission/org/controllers.ts

@@ -3,6 +3,7 @@ import type { OrgSchemaType } from '@fastgpt/global/support/user/team/org/type';
 import type { ClientSession } from 'mongoose';
 import { MongoOrgModel } from './orgSchema';
 import { MongoOrgMemberModel } from './orgMemberSchema';
+import { getChildrenPath } from '@fastgpt/global/support/user/team/org/constant';
 
 export const getOrgsByTmbId = async ({ teamId, tmbId }: { teamId: string; tmbId: string }) =>
   MongoOrgMemberModel.find({ teamId, tmbId }, 'orgId').lean();
@@ -42,7 +43,7 @@ export const getChildrenByOrg = async ({
   teamId: string;
   session?: ClientSession;
 }) => {
-  return MongoOrgModel.find({ teamId, path: { $regex: `^${org.path}/${org._id}` } }, undefined, {
+  return MongoOrgModel.find({ teamId, path: { $regex: `^${getChildrenPath(org)}` } }, undefined, {
     session
   }).lean();
 };

packages/service/support/permission/org/orgSchema.ts

@@ -2,8 +2,8 @@ import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
 import { OrgCollectionName } from '@fastgpt/global/support/user/team/org/constant';
 import type { OrgSchemaType } from '@fastgpt/global/support/user/team/org/type';
 import { connectionMongo, getMongoModel } from '../../../common/mongo';
-import { ResourcePermissionCollectionName } from '../schema';
 import { OrgMemberCollectionName } from './orgMemberSchema';
+import { getNanoid } from '@fastgpt/global/common/string/tools';
 const { Schema } = connectionMongo;
 
 function requiredStringPath(this: OrgSchemaType) {
@@ -17,6 +17,12 @@ export const OrgSchema = new Schema(
       ref: TeamCollectionName,
       required: true
     },
+    pathId: {
+      // path id, only used for path
+      type: String,
+      required: true,
+      default: () => getNanoid()
+    },
     path: {
       type: String,
       required: requiredStringPath // allow empty string, but not null
@@ -57,6 +63,15 @@ try {
     teamId: 1,
     path: 1
   });
+  OrgSchema.index(
+    {
+      teamId: 1,
+      pathId: 1
+    },
+    {
+      unique: true
+    }
+  );
 } catch (error) {
   console.log(error);
 }