Merge pull request #53 from modern-agile-team/feature/board-user

refactor(2swo/Board-user) 케이스 적용

src/boards/controllers/Boards.controller.ts

@@ -30,7 +30,7 @@ export class BoardsController {
 
   @Post()
   async create(
-    @Headers('accessToken') accessToken: string,
+    @Headers('access_token') accessToken: string,
     @Body() createBoardDto: CreateBoardDto,
   ): Promise<Board> {
     const userId = await this.tokenService.decodeToken(accessToken);
@@ -76,7 +76,7 @@ export class BoardsController {
 
   @Delete(':boardId')
   async deleteBoard(
-    @Headers('accessToken') accessToken: string,
+    @Headers('access_token') accessToken: string,
     @Param('boardId') boardId: number,
   ) {
     const userId = await this.tokenService.decodeToken(accessToken);

src/friends/controllers/friends.controller.ts

@@ -1,7 +1,6 @@
-import { Body, Controller, Headers, Post } from "@nestjs/common";
-import { FriendsService } from "../services/friends.service";
-import { TokenService } from "src/auth/services/token.service";
-import { User } from "src/users/entities/user.entity";
+import { Controller, Headers, Post } from '@nestjs/common';
+import { FriendsService } from '../services/friends.service';
+import { TokenService } from 'src/auth/services/token.service';
 
 @Controller('friends')
 export class FriendsController {
@@ -11,7 +10,10 @@ export class FriendsController {
   ) {}
 
   @Post()
-  async friendRequest(@Headers('access_token') accessToken: string, @Headers('friend_id') friendId:User) {
+  async friendRequest(
+    @Headers('access_token') accessToken: string,
+    @Headers('friend_id') friendId: number,
+  ) {
     const userId = await this.tokenService.decodeToken(accessToken);
     return await this.friendsService.friendRequest(userId, friendId);
   }

src/friends/entities/friends.entity.ts

@@ -18,13 +18,23 @@ export class Friend {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @ManyToOne(() => User)
+  @Column({ name: 'requester_id' })
+  requesterId: number;
+
+  @Column({ name: 'respondent_id' })
+  respondentId: number;
+
+  @ManyToOne(() => User, (userId: User) => userId.requester, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'requester_id' })
-  requesterId: User;
+  requester: User;
 
-  @ManyToOne(() => User)
+  @ManyToOne(() => User, (userId: User) => userId.respondent, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn({ name: 'respondent_id' })
-  respondentId: User;
+  respondent: User;
 
   @Column({ type: 'enum', enum: Status, default: Status.PENDING })
   status!: Status;

src/friends/repositories/friends.repository.ts

@@ -1,20 +1,17 @@
-import { Injectable } from "@nestjs/common";
-import { EntityManager } from "typeorm";
-import { Friend, Status } from "../entities/friends.entity";
-import { User } from "src/users/entities/user.entity";
+import { Injectable } from '@nestjs/common';
+import { EntityManager } from 'typeorm';
+import { Friend, Status } from '../entities/friends.entity';
 
 @Injectable()
 export class FriendsRepository {
-  constructor(
-    private readonly entityManager: EntityManager,
-  ) {}
+  constructor(private readonly entityManager: EntityManager) {}
 
-  async friendRequest(userId: User, friendId: User): Promise<Friend> {
+  async friendRequest(userId: number, friendId: number): Promise<Friend> {
     const friend = new Friend();
     friend.requesterId = userId;
     friend.respondentId = friendId;
     friend.status = Status.PENDING;
 
     return await this.entityManager.save(friend);
   }
-}
+}

src/friends/services/friends.service.ts

@@ -1,14 +1,11 @@
-import { Injectable } from "@nestjs/common";
-import { FriendsRepository } from "../repositories/friends.repository";
-import { User } from "src/users/entities/user.entity";
+import { Injectable } from '@nestjs/common';
+import { FriendsRepository } from '../repositories/friends.repository';
 
 @Injectable()
 export class FriendsService {
-  constructor(
-    private readonly friendsRepository: FriendsRepository,
-  ) {}
+  constructor(private readonly friendsRepository: FriendsRepository) {}
 
-  async friendRequest(userId: User, friendId: User) {
+  async friendRequest(userId: number, friendId: number) {
     return await this.friendsRepository.friendRequest(userId, friendId);
   }
-}
+}

src/users/entities/user.entity.ts

@@ -9,6 +9,7 @@ import {
 import { UserImage } from './user-image.entity';
 import { Token } from 'src/auth/entities/token.entity';
 import { Board } from 'src/boards/entities/board.entity';
+import { Friend } from 'src/friends/entities/friends.entity';
 
 @Entity({
   name: 'user',
@@ -43,4 +44,16 @@ export class User {
     onDelete: 'CASCADE',
   })
   token: Token;
+
+  @OneToMany(() => Friend, (friend) => friend.requesterId, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'requester_id' })
+  requester: Friend;
+
+  @OneToMany(() => Friend, (friend) => friend.respondentId, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'respondent_id' })
+  respondent: Friend;
 }