Merge pull request #63 from turnaroundwoo/master

Feat: #60 Friends API 추가

nestjs/src/app.module.ts

@@ -11,13 +11,15 @@ import * as redisStore from "cache-manager-redis-store";
 import { MapModule } from "./maps/maps.module";
 import { BlockUserModule } from "./blockUsers/blockUsers.module";
 import { MailModule } from "./mails/mails.module";
+import { FriendsModule } from "./friends/friends.module";
 
 @Module({
   imports: [
+    AuthModule,
     BlockUserModule,
+    FriendsModule,
     MailModule,
     MapModule,
-    AuthModule,
     UsersModule,
     GraphQLModule.forRootAsync<ApolloDriverConfig>({
       driver: ApolloDriver,

nestjs/src/blockUsers/blockUsers.resolver.ts

@@ -36,7 +36,6 @@ export class BlockUserResolver {
     return this.blockUsersService.deleteBlock({ blockUserId });
   }
 
-  // 신고
   @Mutation(() => User)
   async reportOpponent(
     @Args("reportedId") reportedId: string, //

nestjs/src/blockUsers/blockUsers.service.ts

@@ -36,15 +36,13 @@ export class BlockUserService {
     });
   }
 
-  // 물리 삭제로 적용
   async deleteBlock({ blockUserId }) {
     const result = await this.blockUsersRepository.delete({
       blockUserId,
     });
     return result;
   }
 
-  // 신고
   async createReport({ reportedId }) {
     const user = await this.usersRepository.findOne({
       where: { id: reportedId },

nestjs/src/users/dto/create-friend.input.ts → nestjs/src/friends/dto/create-friend.input.ts

@@ -3,8 +3,5 @@ import { Field, InputType } from "@nestjs/graphql";
 @InputType()
 export class CreateFriendInput {
   @Field(() => String)
-  id: string;
-
-  @Field(() => String)
-  email: string;
+  opponentId: string;
 }

nestjs/src/friends/entities/friend.entity.ts

@@ -17,7 +17,7 @@ export class Friend {
 
   @Column()
   @Field(() => String)
-  friend_id: string;
+  opponentId: string;
 
   @JoinColumn()
   @ManyToOne(() => User)

nestjs/src/friends/friends.module.ts

@@ -1,13 +1,20 @@
 import { Module } from "@nestjs/common";
 import { TypeOrmModule } from "@nestjs/typeorm";
+import { User } from "src/users/entities/user.entity";
 import { Friend } from "./entities/friend.entity";
+import { FriendsResolver } from "./friends.resolver";
+import { FriendsService } from "./friends.service";
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([
       Friend, //
+      User,
     ]),
   ],
-  providers: [],
+  providers: [
+    FriendsResolver, //
+    FriendsService,
+  ],
 })
 export class FriendsModule {}

nestjs/src/friends/friends.resolver.ts

@@ -1,5 +1,26 @@
-// 친구 추가
+import { Args, Mutation, Query, Resolver } from "@nestjs/graphql";
+import { Friend } from "./entities/friend.entity";
+import { FriendsService } from "./friends.service";
 
-// 친구 목록 조회
+@Resolver()
+export class FriendsResolver {
+  constructor(private readonly friendsService: FriendsService) {}
 
-// 친구 삭제
+  @Mutation(() => Friend)
+  addFriend(
+    @Args("userId") userId: string,
+    @Args("opponentId") opponentId: string,
+  ) {
+    return this.friendsService.createFriend({ userId, opponentId });
+  }
+
+  @Query(() => [Friend])
+  fetchFriends() {
+    return this.friendsService.findFriendAll();
+  }
+
+  @Mutation(() => Boolean)
+  deleteFriend(@Args("opponentId") opponentId: string): Promise<boolean> {
+    return this.friendsService.delete({ opponentId });
+  }
+}

nestjs/src/friends/friends.service.ts

@@ -0,0 +1,47 @@
+import { Injectable, NotAcceptableException } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { User } from "src/users/entities/user.entity";
+import { Repository } from "typeorm";
+import { Friend } from "./entities/friend.entity";
+import { IFriendsServiceDelete } from "./interfaces/friend-service.interface";
+
+@Injectable()
+export class FriendsService {
+  constructor(
+    @InjectRepository(Friend)
+    private readonly friendsRepository: Repository<Friend>,
+
+    @InjectRepository(User)
+    private readonly usersRepository: Repository<User>,
+  ) {}
+
+  findFriendOne({ opponentId }) {
+    return this.friendsRepository.findOne({ where: opponentId });
+  }
+
+  findFriendAll() {
+    return this.friendsRepository.find();
+  }
+
+  async createFriend({ userId, opponentId }) {
+    const user = await this.friendsRepository.findOne({
+      where: {
+        user: { id: userId },
+        opponentId: opponentId,
+      },
+    });
+    if (user) throw new NotAcceptableException();
+    return this.friendsRepository.save({
+      user: { id: userId },
+      opponentId,
+      success: false,
+    });
+  }
+
+  async delete({ opponentId }: IFriendsServiceDelete): Promise<boolean> {
+    const result = await this.friendsRepository.delete({
+      opponentId,
+    });
+    return result.affected ? true : false;
+  }
+}

nestjs/src/friends/interfaces/friend-service.interface.ts

@@ -0,0 +1,3 @@
+export interface IFriendsServiceDelete {
+  opponentId: string;
+}

nestjs/src/users/interfaces/user-service.interface.ts

@@ -1,4 +1,3 @@
-import { CreateFriendInput } from "../dto/create-friend.input";
 import { CreateUserInput } from "../dto/create-user.dto";
 import { UpdateAllInput } from "../dto/update-all.input";
 import { UpdateUserPwdInput } from "../dto/update-user.input";
@@ -17,11 +16,6 @@ export interface IUsersServiceUpdateAllInput {
   updateAllInput: UpdateAllInput;
 }
 
-export interface IUsersServiceAddFriendInput {
-  id: string;
-  createFriendInput: CreateFriendInput;
-}
-
 export interface IUsersServiceFindOneById {
   id: string;
 }

nestjs/src/users/users.resolver.ts

@@ -43,18 +43,15 @@ export class UsersResolver {
     @Args("updateUserPwdInput") updateUserPwdInput: UpdateUserPwdInput,
   ): Promise<User> {
     const id = context.req.user.id;
-    console.log("✅", id);
     return this.usersService.update({ id, updateUserPwdInput });
   }
 
-  // 회원 정보 업데이트 (age, interest, image)
   @Mutation(() => User)
   updateUser(
     @Context() context: IContext,
     @Args("updateAllInput") updateAllInput: UpdateAllInput,
   ): Promise<User> {
     const id = context.req.user.id;
-    console.log("✅", id);
     return this.usersService.updateAll({ id, updateAllInput });
   }
 

nestjs/src/users/users.service.ts

@@ -1,8 +1,4 @@
-import {
-  ConflictException,
-  Injectable,
-  NotAcceptableException,
-} from "@nestjs/common";
+import { ConflictException, Injectable } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
 import { User } from "./entities/user.entity";
@@ -51,14 +47,6 @@ export class UsersService {
     });
   }
 
-  async addFriends({ createFriendInput }) {
-    const friend = await this.usersRepository.findOne({
-      where: { id: createFriendInput.id },
-    });
-    if (friend) throw new NotAcceptableException();
-    return this.usersRepository.save({ ...createFriendInput });
-  }
-
   async update({
     id,
     updateUserPwdInput,