Merge pull request #71 from turnaroundwoo/master

Feat: #47 deleteBlock 수정
code-bootcamp · Mar 23, 2023 · bbdd27a · bbdd27a
2 parents 3b48db9 + d6a7bf8
commit bbdd27a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,3 @@
+export interface IBlockUsersServiceDelete {
+  blockUserId: string;
+}
diff --git 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,