Merge pull request #526 from boostcampwm2023/BE-ChangeBlockUser-#524

[BE/#524] 탈퇴한 사용자도 차단할 수 있도록 수정
boostcampwm2023 · Dec 13, 2023 · 554fe12 · 554fe12
2 parents e58d846 + b962cc5
commit 554fe12
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/BE/src/post/post.service.ts b/BE/src/post/post.service.ts
@@ -50,6 +50,7 @@ export class PostService {
       await this.blockUserRepository.find({
         where: { blocker: userId },
         relations: ['blockedUser'],
+        withDeleted: true,
       })
     ).map((blockedUser) => blockedUser.blockedUser.user_hash);
 

diff --git a/BE/src/users-block/users-block.service.ts b/BE/src/users-block/users-block.service.ts
@@ -5,6 +5,12 @@ import { Repository } from 'typeorm';
 import { UserEntity } from 'src/entities/user.entity';
 import { ConfigService } from '@nestjs/config';
 
+interface BlockedUser {
+  user_id: string;
+  nickname?: string;
+  profile_img?: string;
+}
+
 @Injectable()
 export class UsersBlockService {
   constructor(
@@ -18,6 +24,7 @@ export class UsersBlockService {
   async addBlockUser(id: string, userId: string) {
     const isExistUser = await this.userRepository.findOne({
       where: { user_hash: id },
+      withDeleted: true,
     });
 
     if (!isExistUser) {
@@ -51,15 +58,19 @@ export class UsersBlockService {
     });
 
     const blockedUsers = res.reduce((acc, cur) => {
-      const user = {
-        nickname: cur.blockedUser.nickname,
-        profile_img:
+      const user: BlockedUser = {
+        user_id: cur.blocked_user,
+      };
+      if (cur.blockedUser === null) {
+        user.nickname = null;
+        user.profile_img = null;
+      } else {
+        user.nickname = cur.blockedUser.nickname;
+        user.profile_img =
           cur.blockedUser.profile_img === null
             ? this.configService.get('DEFAULT_PROFILE_IMAGE')
-            : cur.blockedUser.profile_img,
-        user_id: cur.blockedUser.user_hash,
-      };
-
+            : cur.blockedUser.profile_img;
+      }
       acc.push(user);
       return acc;
     }, []);

diff --git a/BE/src/users/users.service.ts b/BE/src/users/users.service.ts
@@ -73,7 +73,6 @@ export class UsersService {
   async deleteCascadingUser(userId, userHash) {
     await this.blockPostRepository.softDelete({ blocker: userHash });
     await this.blockUserRepository.softDelete({ blocker: userHash });
-    await this.blockUserRepository.softDelete({ blocked_user: userHash });
     await this.userRepository.softDelete({ id: userId });
   }