Merge pull request #150 from gsainfoteam/siwonpada/issue149

[BUG] third party useInfo api response 수정

Author: siwonpada

src/third-party/dto/res/userRoleInfoRes.dto.ts

@@ -1,23 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
-import {
-  $Enums,
-  ExternalPermission,
-  RoleExternalPermission,
-} from '@prisma/client';
-import { UserRoleInfo } from 'src/third-party/types/userRoleInfo.type';
-
-class ExternalPermissionDto implements ExternalPermission {
-  @ApiProperty()
-  clientUuid: string;
-
-  @ApiProperty()
-  permission: string;
-}
+import { $Enums, Role, RoleExternalPermission } from '@prisma/client';
+import { UserGroupInfo } from 'src/third-party/types/userGroupInfo.type';
 
 class RoleExternalPermissionDto implements RoleExternalPermission {
-  @ApiProperty({ type: ExternalPermissionDto })
-  ExternalPermission: ExternalPermissionDto;
-
   @ApiProperty()
   clientUuid: string;
 
@@ -31,7 +16,7 @@ class RoleExternalPermissionDto implements RoleExternalPermission {
   roleGroupUuid: string;
 }
 
-export class UserRoleInfoResDto implements UserRoleInfo {
+class RoleDto implements Role {
   @ApiProperty({ type: [RoleExternalPermissionDto] })
   RoleExternalPermission: RoleExternalPermissionDto[];
 
@@ -47,3 +32,34 @@ export class UserRoleInfoResDto implements UserRoleInfo {
   @ApiProperty({ enum: $Enums.Permission, isArray: true })
   permissions: $Enums.Permission[];
 }
+export class UserGroupInfoResDto implements UserGroupInfo {
+  @ApiProperty({ type: [RoleDto] })
+  Role: RoleDto[];
+
+  @ApiProperty()
+  name: string;
+
+  @ApiProperty()
+  description: string | null;
+
+  @ApiProperty()
+  uuid: string;
+
+  @ApiProperty()
+  createdAt: Date;
+
+  @ApiProperty()
+  verifiedAt: Date | null;
+
+  @ApiProperty()
+  presidentUuid: string;
+
+  @ApiProperty()
+  deletedAt: Date | null;
+
+  @ApiProperty()
+  notionPageId: string | null;
+
+  @ApiProperty()
+  profileImageKey: string | null;
+}

src/third-party/third-party.controller.ts

@@ -31,7 +31,7 @@ import { TokenResDto } from './dto/res/tokenRes.dto';
 import { UserGuard } from 'src/auth/guard/user.guard';
 import { GetUser } from 'src/auth/decorator/getUser.decorator';
 import { User } from '@prisma/client';
-import { UserRoleInfoResDto } from './dto/res/userRoleInfoRes.dto';
+import { UserGroupInfoResDto } from './dto/res/userRoleInfoRes.dto';
 import { ThirdPartyGuard } from './guard/third-party.guard';
 
 @ApiTags('Third Party')
@@ -85,8 +85,9 @@ export class ThirdPartyController {
       'Retrieves user role information for the specified third-party client.',
   })
   @ApiOkResponse({
-    description: 'Returns user role information for the third-party client.',
-    type: [UserRoleInfoResDto],
+    description:
+      'Returns user group and role information for the third-party client.',
+    type: [UserGroupInfoResDto],
   })
   @ApiUnauthorizedResponse({ description: 'Invalid request' })
   @ApiInternalServerErrorResponse({ description: 'Internal server error' })
@@ -96,7 +97,7 @@ export class ThirdPartyController {
   async userinfo(
     @GetUser()
     { userUuid, clientUuid }: { userUuid: string; clientUuid: string },
-  ): Promise<UserRoleInfoResDto[]> {
+  ): Promise<UserGroupInfoResDto[]> {
     return this.thirdPartyService.userinfo(userUuid, clientUuid);
   }
 }

src/third-party/third-party.repository.ts

@@ -6,7 +6,7 @@ import {
 } from '@nestjs/common';
 import { Client } from '@prisma/client';
 import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
-import { UserRoleInfo } from './types/userRoleInfo.type';
+import { UserGroupInfo } from './types/userGroupInfo.type';
 
 @Injectable()
 export class ThirdPartyRepository {
@@ -28,25 +28,33 @@ export class ThirdPartyRepository {
       });
   }
 
-  async findRoleByClientUuidAndUserUuid(
+  async findGroupByClientUuidAndUserUuid(
     clientUuid: string,
     userUuid: string,
-  ): Promise<UserRoleInfo[]> {
-    return this.prismaService.role.findMany({
+  ): Promise<UserGroupInfo[]> {
+    return this.prismaService.group.findMany({
       where: {
-        userRole: {
+        UserRole: {
           some: {
             userUuid,
           },
         },
       },
       include: {
-        RoleExternalPermission: {
+        Role: {
           where: {
-            clientUuid,
+            userRole: {
+              some: {
+                userUuid,
+              },
+            },
           },
           include: {
-            ExternalPermission: true,
+            RoleExternalPermission: {
+              where: {
+                clientUuid,
+              },
+            },
           },
         },
       },

src/third-party/third-party.service.ts

@@ -10,7 +10,7 @@ import { AuthorizeCache } from './types/authorizeCache.type';
 import { JwtService } from '@nestjs/jwt';
 import { ConfigService } from '@nestjs/config';
 import * as ms from 'ms';
-import { UserRoleInfoResDto } from './dto/res/userRoleInfoRes.dto';
+import { UserGroupInfoResDto } from './dto/res/userRoleInfoRes.dto';
 import { Loggable } from '@lib/logger';
 
 @Loggable()
@@ -90,9 +90,9 @@ export class ThirdPartyService {
   async userinfo(
     userUuid: string,
     clientUuid: string,
-  ): Promise<UserRoleInfoResDto[]> {
+  ): Promise<UserGroupInfoResDto[]> {
     const userRoleInfo =
-      await this.thirdPartyRepository.findRoleByClientUuidAndUserUuid(
+      await this.thirdPartyRepository.findGroupByClientUuidAndUserUuid(
         clientUuid,
         userUuid,
       );

src/third-party/types/userGroupInfo.type.ts

@@ -0,0 +1,11 @@
+import { Prisma } from '@prisma/client';
+
+export type UserGroupInfo = Prisma.GroupGetPayload<{
+  include: {
+    Role: {
+      include: {
+        RoleExternalPermission: true;
+      };
+    };
+  };
+}>;