fix(permission): fix permission error

src/permissions/permissions.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { PermissionsService } from './permissions.service';
+import { Group } from 'src/groups/entities/group.entity';
 import { PermissionsController } from './permissions.controller';
 import { UserPermission } from './entities/user-permission.entity';
 import { GroupPermission } from './entities/group-permission.entity';
@@ -19,6 +20,7 @@ import { NamespaceMember } from 'src/namespaces/entities/namespace-member.entity
       GroupPermission,
       Resource,
       GroupUser,
+      Group,
       NamespaceMember,
     ]),
     UserModule,

src/permissions/permissions.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { Group } from 'src/groups/entities/group.entity';
 import { DataSource, EntityManager, In, IsNull, Repository } from 'typeorm';
 import { PermissionDto } from './dto/permission.dto';
 import { ListRespDto, UserPermissionDto } from './dto/list-resp.dto';
@@ -28,6 +29,8 @@ export class PermissionsService {
     private readonly groupUserRepository: Repository<GroupUser>,
     @InjectRepository(Resource)
     private readonly resourceRepository: Repository<Resource>,
+    @InjectRepository(Group)
+    private readonly GroupRepository: Repository<Group>,
     @InjectRepository(NamespaceMember)
     private readonly namespaceMembersRepository: Repository<NamespaceMember>,
     private readonly dataSource: DataSource,
@@ -55,9 +58,21 @@ export class PermissionsService {
       curPermi,
       ...plainToInstance(UserPermissionDto, userPermissions),
     ];
-    const groups = await this.groupPermiRepo.find({
+    let groups: GroupPermission[] = [];
+    const groupsPermi = await this.groupPermiRepo.find({
       where: { namespaceId, resourceId },
     });
+    if (groupsPermi.length > 0) {
+      groups = await Promise.all(
+        groupsPermi.map((groupPermi) =>
+          groupPermi.groupId
+            ? this.GroupRepository.findOneBy({ id: groupPermi.groupId }).then(
+                (group) => Promise.resolve({ ...groupPermi, group }),
+              )
+            : Promise.resolve(groupPermi),
+        ),
+      );
+    }
     const globalLevel = await this.getGlobalPermissionLevel(
       namespaceId,
       resourceId,
@@ -194,6 +209,7 @@ export class PermissionsService {
     userId: string,
   ): Promise<UserPermissionDto> {
     while (true) {
+      const user = await this.userService.find(userId);
       const permission = await this.userPermiRepo.findOne({
         where: {
           namespaceId,
@@ -202,11 +218,13 @@ export class PermissionsService {
         },
       });
       if (permission) {
-        return plainToInstance(UserPermissionDto, permission);
+        return plainToInstance(UserPermissionDto, {
+          user,
+          ...permission,
+        });
       }
       const parentId = await this.getParentId(namespaceId, resourceId);
       if (!parentId) {
-        const user = await this.userService.find(userId);
         return plainToInstance(UserPermissionDto, {
           user,
           level: PermissionLevel.NO_ACCESS,