fix: delete group

gsainfoteam · Aug 29, 2024 · 21a7150 · 21a7150
1 parent 28014a7
commit 21a7150
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/src/group/group.controller.ts b/src/group/group.controller.ts
@@ -120,7 +120,7 @@ export class GroupController {
     @Param('uuid') uuid: string,
     @GetUser() user: User,
   ): Promise<void> {
-    this.groupService.deleteGroup(uuid, user.uuid);
+    return this.groupService.deleteGroup(uuid, user.uuid);
   }
 
   @ApiOperation({

diff --git a/src/group/group.repository.ts b/src/group/group.repository.ts
@@ -255,16 +255,38 @@ export class GroupRepository {
       });
   }
 
-  async deleteGroup(uuid: string): Promise<void> {
+  async deleteGroup(uuid: string, userUuid: string): Promise<void> {
     this.logger.log(`deleteGroup: ${uuid}`);
-    await this.prismaService.group.update({
-      where: {
-        uuid,
-      },
-      data: {
-        deletedAt: new Date(),
-      },
-    });
+
+    await this.prismaService.group
+      .update({
+        where: {
+          uuid,
+          UserRole: {
+            some: {
+              userUuid,
+              Role: {
+                authorities: {
+                  has: Authority.GROUP_DELETE,
+                },
+              },
+            },
+          },
+        },
+        data: {
+          deletedAt: new Date(),
+        },
+      })
+      .catch((error) => {
+        if (error instanceof PrismaClientKnownRequestError) {
+          if (error.code === 'P2025') {
+            throw new ForbiddenException();
+          }
+          this.logger.log(error);
+          throw new InternalServerErrorException('unknown database error');
+        }
+        throw new InternalServerErrorException('unknown error');
+      });
   }
 
   async addUserToGroup(uuid: string, userUuid: string): Promise<void> {

diff --git a/src/group/group.service.ts b/src/group/group.service.ts
@@ -72,18 +72,15 @@ export class GroupService {
 
   async deleteGroup(uuid: string, userUuid: string): Promise<void> {
     this.logger.log(`deleteGroup: ${uuid}`);
-    if (
-      !(await this.groupRepository.validateAuthority(
-        uuid,
-        [Authority.GROUP_DELETE],
-        userUuid,
-      ))
-    ) {
-      throw new ForbiddenException(
-        'You do not have permission to delete group',
-      );
+
+    const checkGroupExistence =
+      await this.groupRepository.checkGroupExistenceByUuid(uuid);
+
+    if (!checkGroupExistence) {
+      throw new NotFoundException('Group not found');
     }
-    await this.groupRepository.deleteGroup(uuid);
+
+    await this.groupRepository.deleteGroup(uuid, userUuid);
   }
 
   /**