Merge pull request #498 from boostcampwm2023/BE-Refactoring-#497

[BE/#497] 리팩토링 #497

BE/src/app.controller.spec.ts

@@ -1,14 +1,12 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { AppController } from './app.controller';
-import { AppService } from './app.service';
 
 describe('AppController', () => {
   let appController: AppController;
 
   beforeEach(async () => {
     const app: TestingModule = await Test.createTestingModule({
       controllers: [AppController],
-      providers: [AppService],
     }).compile();
 
     appController = app.get<AppController>(AppController);

BE/src/app.controller.ts

@@ -1,14 +1,8 @@
 import { Controller, Get, Redirect } from '@nestjs/common';
-import { AppService } from './app.service';
 
 @Controller()
 export class AppController {
-  constructor(private readonly appService: AppService) {}
-
-  // @Get()
-  // home(): string {
-  //   return this.appService.getHello();
-  // }
+  constructor() {}
 
   @Get('API')
   @Redirect(

BE/src/app.module.ts

@@ -4,7 +4,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { WinstonModule } from 'nest-winston';
 import * as process from 'process';
 import { AppController } from './app.controller';
-import { AppService } from './app.service';
 import { winstonTransportsOption } from './config/winston.config';
 import { MysqlConfigProvider } from './config/mysql.config';
 import { PostModule } from './post/post.module';
@@ -44,7 +43,6 @@ import { ReportModule } from './report/report.module';
   ],
   controllers: [AppController],
   providers: [
-    AppService,
     Logger,
     {
       provide: APP_PIPE,

BE/src/chat/chat.controller.ts

@@ -8,10 +8,10 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ChatService } from './chat.service';
-import { AuthGuard } from '../utils/auth.guard';
-import { UserHash } from '../utils/auth.decorator';
-import { CreateRoomDto } from './createRoom.dto';
-import { FcmHandler } from '../utils/fcmHandler';
+import { AuthGuard } from '../common/guard/auth.guard';
+import { UserHash } from '../common/decorator/auth.decorator';
+import { CreateRoomDto } from './dto/createRoom.dto';
+import { FcmHandler } from '../common/fcmHandler';
 
 @Controller('chat')
 export class ChatController {

BE/src/chat/chat.module.ts

@@ -5,7 +5,7 @@ import { ChatsGateway } from './chats.gateway';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ChatRoomEntity } from '../entities/chatRoom.entity';
 import { PostEntity } from '../entities/post.entity';
-import { FcmHandler } from '../utils/fcmHandler';
+import { FcmHandler } from '../common/fcmHandler';
 import { RegistrationTokenEntity } from '../entities/registrationToken.entity';
 import { ChatEntity } from 'src/entities/chat.entity';
 import { UserEntity } from 'src/entities/user.entity';

BE/src/chat/chat.service.ts

@@ -5,7 +5,7 @@ import { ChatRoomEntity } from '../entities/chatRoom.entity';
 import { ChatEntity } from 'src/entities/chat.entity';
 import { ChatDto } from './dto/chat.dto';
 import { UserEntity } from 'src/entities/user.entity';
-import { FcmHandler, PushMessage } from '../utils/fcmHandler';
+import { FcmHandler, PushMessage } from '../common/fcmHandler';
 import * as jwt from 'jsonwebtoken';
 import { ConfigService } from '@nestjs/config';
 import { JwtPayload } from 'jsonwebtoken';

BE/src/chat/dto/chat.dto.ts

@@ -1,4 +1,4 @@
-import { IsBoolean, IsNumber, IsString } from 'class-validator';
+import { IsNumber, IsString } from 'class-validator';
 
 export class ChatDto {
   @IsString()

BE/src/utils/price.decorator.ts → BE/src/common/decorator/price.decorator.ts

@@ -8,7 +8,7 @@ export function IsPriceCorrect(
   property: string,
   validationOptions?: ValidationOptions,
 ) {
-  return (object: Object, propertyName: string) => {
+  return (object, propertyName: string) => {
     registerDecorator({
       name: 'IsPriceCorrect',
       target: object.constructor,

BE/src/utils/httpLogger.interceptor.ts → BE/src/common/interceptor/httpLogger.interceptor.ts

@@ -4,7 +4,6 @@ import {
   NestInterceptor,
   Injectable,
   Logger,
-  HttpException,
 } from '@nestjs/common';
 import { Observable, throwError } from 'rxjs';
 import { tap, catchError } from 'rxjs/operators';

BE/src/entities/post.entity.ts

@@ -12,7 +12,6 @@ import {
 import { UserEntity } from './user.entity';
 import { PostImageEntity } from './postImage.entity';
 import { BlockPostEntity } from './blockPost.entity';
-import { ChatRoomEntity } from './chatRoom.entity';
 import { ReportEntity } from './report.entity';
 
 @Entity('post')

BE/src/login/login.controller.ts

@@ -10,7 +10,8 @@ import {
 } from '@nestjs/common';
 import { LoginService, SocialProperties } from './login.service';
 import { AppleLoginDto } from './dto/appleLogin.dto';
-import { AuthGuard } from '../utils/auth.guard';
+import { AuthGuard } from '../common/guard/auth.guard';
+
 
 @Controller()
 export class LoginController {

BE/src/login/login.module.ts

@@ -5,8 +5,8 @@ import { JwtModule } from '@nestjs/jwt';
 import { JwtConfig } from '../config/jwt.config';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { UserEntity } from '../entities/user.entity';
-import { AuthGuard } from 'src/utils/auth.guard';
-import { FcmHandler } from '../utils/fcmHandler';
+import { AuthGuard } from 'src/common/guard/auth.guard';
+import { FcmHandler } from '../common/fcmHandler';
 import { RegistrationTokenEntity } from '../entities/registrationToken.entity';
 
 @Module({

BE/src/login/login.service.ts

@@ -1,14 +1,14 @@
-import { HttpException, Inject, Injectable, Logger } from '@nestjs/common';
+import { HttpException, Inject, Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { InjectRepository } from '@nestjs/typeorm';
 import { UserEntity } from '../entities/user.entity';
 import { Repository } from 'typeorm';
 import { ConfigService } from '@nestjs/config';
-import { hashMaker } from '../utils/hashMaker';
+import { hashMaker } from '../common/hashMaker';
 import { AppleLoginDto } from './dto/appleLogin.dto';
 import * as jwt from 'jsonwebtoken';
 import * as jwksClient from 'jwks-rsa';
-import { FcmHandler } from '../utils/fcmHandler';
+import { FcmHandler } from '../common/fcmHandler';
 import { CACHE_MANAGER, CacheStore } from '@nestjs/cache-manager';
 
 export interface SocialProperties {
@@ -24,7 +24,6 @@ export interface JwtTokens {
 @Injectable()
 export class LoginService {
   private jwksClient: jwksClient.JwksClient;
-  private readonly logger = new Logger('ChatsGateway');
   constructor(
     @InjectRepository(UserEntity)
     private userRepository: Repository<UserEntity>,
@@ -87,13 +86,12 @@ export class LoginService {
   async verifyUserRegistration(
     socialProperties: SocialProperties,
   ): Promise<UserEntity> {
-    const user = await this.userRepository.findOne({
+    return await this.userRepository.findOne({
       where: {
         OAuth_domain: socialProperties.OAuthDomain,
         social_id: socialProperties.socialId,
       },
     });
-    return user;
   }
 
   generateAccessToken(user: UserEntity): string {
@@ -119,12 +117,7 @@ export class LoginService {
     const identityTokenParts = identityToken.split('.');
     const identityTokenPayload = identityTokenParts[1];
 
-    const payloadClaims = Buffer.from(
-      identityTokenPayload,
-      'base64',
-    ).toString();
-
-    return payloadClaims;
+    return Buffer.from(identityTokenPayload, 'base64').toString();
   }
 
   async getApplePublicKey(kid: string) {
@@ -133,9 +126,7 @@ export class LoginService {
     });
 
     const key = await client.getSigningKey(kid);
-    const signingKey = key.getPublicKey();
-
-    return signingKey;
+    return key.getPublicKey();
   }
 
   async appleOAuth(body: AppleLoginDto): Promise<SocialProperties> {

BE/src/main.ts

@@ -4,7 +4,7 @@ import { setupSwagger } from './config/swagger.config';
 import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 import { winstonLogger } from './config/winston.config';
 import { ValidationPipe } from '@nestjs/common';
-import { HttpLoggerInterceptor } from './utils/httpLogger.interceptor';
+import { HttpLoggerInterceptor } from './common/interceptor/httpLogger.interceptor';
 import { WsAdapter } from '@nestjs/platform-ws';
 
 async function bootstrap() {

BE/src/post/dto/postCreate.dto.ts

@@ -1,5 +1,5 @@
 import { IsBoolean, IsString, MaxLength } from 'class-validator';
-import { IsPriceCorrect } from '../../utils/price.decorator';
+import { IsPriceCorrect } from '../../common/decorator/price.decorator';
 
 export class PostCreateDto {
   @IsString()

BE/src/post/post.controller.ts

@@ -18,11 +18,11 @@ import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { UpdatePostDto } from './dto/postUpdate.dto';
 import { FilesInterceptor } from '@nestjs/platform-express';
 import { PostCreateDto } from './dto/postCreate.dto';
-import { MultiPartBody } from '../utils/multiPartBody.decorator';
+import { MultiPartBody } from '../common/decorator/multiPartBody.decorator';
 import { PostListDto } from './dto/postList.dto';
-import { AuthGuard } from 'src/utils/auth.guard';
-import { UserHash } from 'src/utils/auth.decorator';
-import { FilesSizeValidator } from '../utils/files.validator';
+import { AuthGuard } from 'src/common/guard/auth.guard';
+import { UserHash } from 'src/common/decorator/auth.decorator';
+import { FilesSizeValidator } from '../common/files.validator';
 
 @Controller('posts')
 @ApiTags('posts')
@@ -32,8 +32,7 @@ export class PostController {
 
   @Get()
   async postsList(@Query() query: PostListDto, @UserHash() userId: string) {
-    const posts = await this.postService.findPosts(query, userId);
-    return posts;
+    return await this.postService.findPosts(query, userId);
   }
 
   @Get('/titles')

BE/src/post/post.module.ts

@@ -3,11 +3,11 @@ import { PostController } from './post.controller';
 import { PostService } from './post.service';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { PostEntity } from '../entities/post.entity';
-import { S3Handler } from '../utils/S3Handler';
+import { S3Handler } from '../common/S3Handler';
 import { PostImageEntity } from '../entities/postImage.entity';
 import { BlockUserEntity } from '../entities/blockUser.entity';
 import { BlockPostEntity } from '../entities/blockPost.entity';
-import { AuthGuard } from 'src/utils/auth.guard';
+import { AuthGuard } from 'src/common/guard/auth.guard';
 
 @Module({
   imports: [

BE/src/post/post.service.ts

@@ -4,7 +4,7 @@ import { PostEntity } from '../entities/post.entity';
 import { LessThan, Like, Repository } from 'typeorm';
 import { UpdatePostDto } from './dto/postUpdate.dto';
 import { PostImageEntity } from 'src/entities/postImage.entity';
-import { S3Handler } from '../utils/S3Handler';
+import { S3Handler } from '../common/S3Handler';
 import { PostListDto } from './dto/postList.dto';
 import { BlockUserEntity } from '../entities/blockUser.entity';
 import { BlockPostEntity } from '../entities/blockPost.entity';
@@ -138,28 +138,6 @@ export class PostService {
     };
   }
 
-  async changeImages(postId: number, images: string[]) {
-    try {
-      await this.postImageRepository.delete({ post_id: postId });
-      for (const img of images) {
-        await this.postImageRepository.save({
-          post_id: postId,
-          image_url: img,
-        });
-      }
-    } catch {
-      throw new HttpException('서버 오류입니다.', 500);
-    }
-  }
-
-  async changeExceptImages(postId: number, updatePostDto: UpdatePostDto) {
-    try {
-      await this.postRepository.update({ id: postId }, updatePostDto);
-    } catch (e) {
-      throw new HttpException('서버 오류입니다.', 500);
-    }
-  }
-
   async checkAuth(postId, userId) {
     const isDataExists = await this.postRepository.findOne({
       where: { id: postId },

BE/src/posts-block/posts-block.controller.ts

@@ -8,8 +8,8 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { PostsBlockService } from './posts-block.service';
-import { AuthGuard } from 'src/utils/auth.guard';
-import { UserHash } from 'src/utils/auth.decorator';
+import { AuthGuard } from 'src/common/guard/auth.guard';
+import { UserHash } from 'src/common/decorator/auth.decorator';
 
 @Controller('posts/block')
 @UseGuards(AuthGuard)

BE/src/posts-block/posts-block.module.ts

@@ -4,7 +4,7 @@ import { PostsBlockService } from './posts-block.service';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { BlockPostEntity } from '../entities/blockPost.entity';
 import { PostEntity } from '../entities/post.entity';
-import { AuthGuard } from 'src/utils/auth.guard';
+import { AuthGuard } from 'src/common/guard/auth.guard';
 
 @Module({
   imports: [TypeOrmModule.forFeature([BlockPostEntity, PostEntity])],

BE/src/report/report.controller.ts

@@ -1,8 +1,8 @@
 import { Body, Controller, Post, UseGuards } from '@nestjs/common';
-import { CreateReportDto } from './createReport.dto';
+import { CreateReportDto } from './dto/createReport.dto';
 import { ReportService } from './report.service';
-import { AuthGuard } from '../utils/auth.guard';
-import { UserHash } from '../utils/auth.decorator';
+import { AuthGuard } from '../common/guard/auth.guard';
+import { UserHash } from '../common/decorator/auth.decorator';
 
 @Controller('report')
 @UseGuards(AuthGuard)

BE/src/report/report.service.ts

@@ -1,5 +1,5 @@
 import { HttpException, Injectable } from '@nestjs/common';
-import { CreateReportDto } from './createReport.dto';
+import { CreateReportDto } from './dto/createReport.dto';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { ReportEntity } from '../entities/report.entity';

BE/src/users-block/users-block.controller.ts

@@ -7,8 +7,8 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { UsersBlockService } from './users-block.service';
-import { AuthGuard } from 'src/utils/auth.guard';
-import { UserHash } from 'src/utils/auth.decorator';
+import { AuthGuard } from 'src/common/guard/auth.guard';
+import { UserHash } from 'src/common/decorator/auth.decorator';
 
 @Controller('users/block')
 @UseGuards(AuthGuard)

BE/src/users-block/users-block.module.ts

@@ -4,7 +4,7 @@ import { UsersBlockController } from './users-block.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { BlockUserEntity } from 'src/entities/blockUser.entity';
 import { UserEntity } from 'src/entities/user.entity';
-import { AuthGuard } from 'src/utils/auth.guard';
+import { AuthGuard } from 'src/common/guard/auth.guard';
 
 @Module({
   imports: [TypeOrmModule.forFeature([BlockUserEntity, UserEntity])],

BE/src/users/users.controller.ts

@@ -11,19 +11,16 @@ import {
   HttpException,
   UseGuards,
   Body,
-  ParseFilePipe,
-  MaxFileSizeValidator,
-  Header,
   Headers,
 } from '@nestjs/common';
 import { UsersService } from './users.service';
-import { CreateUserDto } from './createUser.dto';
+import { CreateUserDto } from './dto/createUser.dto';
 import { FileInterceptor } from '@nestjs/platform-express';
-import { MultiPartBody } from 'src/utils/multiPartBody.decorator';
-import { UpdateUsersDto } from './usersUpdate.dto';
-import { AuthGuard } from 'src/utils/auth.guard';
-import { UserHash } from '../utils/auth.decorator';
-import { FileSizeValidator } from '../utils/files.validator';
+import { MultiPartBody } from 'src/common/decorator/multiPartBody.decorator';
+import { UpdateUsersDto } from './dto/usersUpdate.dto';
+import { AuthGuard } from 'src/common/guard/auth.guard';
+import { UserHash } from '../common/decorator/auth.decorator';
+import { FileSizeValidator } from '../common/files.validator';
 
 @Controller('users')
 @UseGuards(AuthGuard)