Merge pull request #441 from boostcampwm-2024/refactor/clean

♻️ refactor: 이름 변경 및 필요없는 코드 제거, 디렉토리 경로 변경

Author: Jo-Minseok

server/src/activity/module/activity.module.ts

@@ -5,8 +5,8 @@ import { ActivityService } from '../service/activity.service';
 import { UserModule } from '../../user/module/user.module';
 
 @Module({
-  controllers: [ActivityController],
   imports: [UserModule],
+  controllers: [ActivityController],
   providers: [ActivityRepository, ActivityService],
   exports: [ActivityService],
 })

server/src/admin/controller/admin.controller.ts

@@ -15,7 +15,7 @@ import { RegisterAdminRequestDto } from '../dto/request/register-admin.dto';
 import { ApiTags } from '@nestjs/swagger';
 import { ApiResponse } from '../../common/response/common.response';
 import { LoginAdminRequestDto } from '../dto/request/login-admin.dto';
-import { CookieAuthGuard } from '../../common/guard/auth.guard';
+import { AdminAuthGuard } from '../../common/guard/auth.guard';
 import { ApiLoginAdmin } from '../api-docs/loginAdmin.api-docs';
 import { ApiReadSessionIdAdmin } from '../api-docs/readSessionIdAdmin.api-docs';
 import { ApiLogoutAdmin } from '../api-docs/logoutAdmin.api-docs';
@@ -41,7 +41,7 @@ export class AdminController {
   }
 
   @ApiLogoutAdmin()
-  @UseGuards(CookieAuthGuard)
+  @UseGuards(AdminAuthGuard)
   @HttpCode(HttpStatus.OK)
   @Post('/logout')
   async logoutAdmin(
@@ -55,7 +55,7 @@ export class AdminController {
   }
 
   @ApiCreateAdmin()
-  @UseGuards(CookieAuthGuard)
+  @UseGuards(AdminAuthGuard)
   @Post('/register')
   async createAdmin(@Body() registerAdminBodyDto: RegisterAdminRequestDto) {
     await this.adminService.createAdmin(registerAdminBodyDto);
@@ -67,7 +67,7 @@ export class AdminController {
   @ApiReadSessionIdAdmin()
   @Get('/sessionId')
   @HttpCode(HttpStatus.OK)
-  @UseGuards(CookieAuthGuard)
+  @UseGuards(AdminAuthGuard)
   async readSessionIdAdmin() {
     return ApiResponse.responseWithNoContent('정상적인 sessionId 입니다.');
   }

server/src/app.module.ts

@@ -36,19 +36,19 @@ import { LikeModule } from './like/module/like.module';
       useFactory: (configService: ConfigService) =>
         loadDBSetting(configService),
     }),
-    AdminModule,
-    RedisModule,
     WinstonLoggerModule,
+    RedisModule,
+    TestModule,
+    EmailModule,
+    MetricsModule,
+    AdminModule,
     RssModule,
     FeedModule,
     ChatModule,
     UserModule,
     ActivityModule,
-    TestModule,
     StatisticModule,
-    EmailModule,
     CommentModule,
-    MetricsModule,
     LikeModule,
   ],
   controllers: [],

server/src/common/auth/jwt.module.ts

@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { JwtGuard, RefreshJwtGuard } from '../guard/jwt.guard';
 import { JwtRefreshStrategy, JwtStrategy } from './jwt.strategy';
+import { InjectUserInterceptor } from './jwt.interceptor';
 
 @Module({
   providers: [
@@ -10,6 +11,7 @@ import { JwtRefreshStrategy, JwtStrategy } from './jwt.strategy';
     RefreshJwtGuard,
     JwtStrategy,
     JwtRefreshStrategy,
+    InjectUserInterceptor,
   ],
   exports: [JwtService],
 })

server/src/common/database/load.config.ts

@@ -15,7 +15,7 @@ export function loadDBSetting(configService: ConfigService) {
     entities: [`${__dirname}/../../**/*.entity.{js,ts}`],
 
     synchronize: isDev || isTest,
-    migrations: [`${__dirname}/../../migration/*.{js,ts}`],
+    migrations: [`${__dirname}/migration/*.{js,ts}`],
     migrationsRun: !(isDev || isTest),
     logging: isDev,
   };