From bc19536e8763298e6a5314da98fa3d396a777819 Mon Sep 17 00:00:00 2001
From: turnaroundwoo <seowooo3117@gmail.com>
Date: Thu, 23 Mar 2023 14:16:30 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20#47=20=20deleteBlock=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nestjs/src/blockUsers/blockUsers.resolver.ts               | 6 ++----
 nestjs/src/blockUsers/blockUsers.service.ts                | 7 +++++--
 .../src/blockUsers/interfaces/block-service.interface.ts   | 3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 nestjs/src/blockUsers/interfaces/block-service.interface.ts

diff --git a/nestjs/src/blockUsers/blockUsers.resolver.ts b/nestjs/src/blockUsers/blockUsers.resolver.ts
index 0d1be55..2ed2f68 100644
--- a/nestjs/src/blockUsers/blockUsers.resolver.ts
+++ b/nestjs/src/blockUsers/blockUsers.resolver.ts
@@ -29,10 +29,8 @@ export class BlockUserResolver {
     return this.blockUsersService.createBlock({ userId, blockUserId });
   }
 
-  @Mutation(() => BlockUser)
-  unblockOpponent(
-    @Args("blockUserId") blockUserId: string, //
-  ) {
+  @Mutation(() => Boolean)
+  unblockOpponent(@Args("blockUserId") blockUserId: string): Promise<boolean> {
     return this.blockUsersService.deleteBlock({ blockUserId });
   }
 
diff --git a/nestjs/src/blockUsers/blockUsers.service.ts b/nestjs/src/blockUsers/blockUsers.service.ts
index 23ec537..b7fa506 100644
--- a/nestjs/src/blockUsers/blockUsers.service.ts
+++ b/nestjs/src/blockUsers/blockUsers.service.ts
@@ -3,6 +3,7 @@ import { InjectRepository } from "@nestjs/typeorm";
 import { User } from "src/users/entities/user.entity";
 import { Repository } from "typeorm";
 import { BlockUser } from "./entities/blockUsers.entity";
+import { IBlockUsersServiceDelete } from "./interfaces/block-service.interface";
 
 @Injectable()
 export class BlockUserService {
@@ -36,11 +37,13 @@ export class BlockUserService {
     });
   }
 
-  async deleteBlock({ blockUserId }) {
+  async deleteBlock({
+    blockUserId,
+  }: IBlockUsersServiceDelete): Promise<boolean> {
     const result = await this.blockUsersRepository.delete({
       blockUserId,
     });
-    return result;
+    return result.affected ? true : false;
   }
 
   async createReport({ reportedId }) {
diff --git a/nestjs/src/blockUsers/interfaces/block-service.interface.ts b/nestjs/src/blockUsers/interfaces/block-service.interface.ts
new file mode 100644
index 0000000..d642235
--- /dev/null
+++ b/nestjs/src/blockUsers/interfaces/block-service.interface.ts
@@ -0,0 +1,3 @@
+export interface IBlockUsersServiceDelete {
+  blockUserId: string;
+}

From d6a7bf8ad90be1614bf4345b4feabaf2e11673b1 Mon Sep 17 00:00:00 2001
From: turnaroundwoo <seowooo3117@gmail.com>
Date: Thu, 23 Mar 2023 18:18:00 +0900
Subject: [PATCH 2/2] Feat: friend API

---
 nestjs/src/friends/friends.service.ts | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/nestjs/src/friends/friends.service.ts b/nestjs/src/friends/friends.service.ts
index b98507a..10a8f9c 100644
--- a/nestjs/src/friends/friends.service.ts
+++ b/nestjs/src/friends/friends.service.ts
@@ -15,29 +15,26 @@ export class FriendsService {
     private readonly usersRepository: Repository<User>,
   ) {}
 
-  findFriendOne({ opponentId }) {
-    return this.friendsRepository.findOne({ where: opponentId });
-  }
-
-  findFriendAll() {
-    return this.friendsRepository.find();
-  }
-
-  async createFriend({ userId, opponentId }) {
+  async createFriend({ opponentId, userId }) {
     const user = await this.friendsRepository.findOne({
       where: {
         user: { id: userId },
         opponentId: opponentId,
       },
     });
-    if (user) throw new NotAcceptableException();
-    return this.friendsRepository.save({
+    if (!user) new NotAcceptableException();
+
+    return await this.friendsRepository.save({
       user: { id: userId },
       opponentId,
       success: false,
     });
   }
 
+  findFriendAll() {
+    return this.friendsRepository.find();
+  }
+
   async delete({ opponentId }: IFriendsServiceDelete): Promise<boolean> {
     const result = await this.friendsRepository.delete({
       opponentId,