Siwonpada/issue143

.github/workflows/production.yml

@@ -49,6 +49,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./apps/api/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/staging.yml

@@ -3,7 +3,7 @@ name: Update Kubernetes Cluster (Dev)
 on:
   push:
     paths:
-      - src/**
+      - apps/api/**
       - prisma/schema.prisma
     branches:
       - main
@@ -52,6 +52,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./apps/api/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.vscode/settings.json

@@ -10,14 +10,18 @@
     "gitops",
     "gsainfoteam",
     "infoteam",
+    "libheif",
+    "linuxmusl",
+    "localtime",
     "LOGGABLE",
     "metatype",
     "nestjs",
     "noreply",
     "openai",
     "prisma",
     "rxjs",
-    "ziggle"
+    "ziggle",
+    "zoneinfo"
   ],
   "git.branchProtection": ["main"]
 }

src/ai/ai.controller.ts → apps/api/src/ai/ai.controller.ts

@@ -14,9 +14,9 @@ import {
   ApiOperation,
   ApiTags,
 } from '@nestjs/swagger';
-import { IdPGuard } from 'src/user/guard/idp.guard';
 import { TranslateDto } from './dto/req/translate.dto';
 import { TranslateResDto } from './dto/res/translateRes.dto';
+import { IdPGuard } from '../user/guard/idp.guard';
 
 @ApiTags('ai')
 @ApiOAuth2(['email', 'profile', 'openid'], 'oauth2')

src/ai/ai.module.ts → apps/api/src/ai/ai.module.ts

@@ -1,9 +1,9 @@
 import { Module } from '@nestjs/common';
 import { AiService } from './ai.service';
 import { AiController } from './ai.controller';
-import { UserModule } from 'src/user/user.module';
 import { LoggerModule } from '@lib/logger';
 import { CustomConfigModule } from '@lib/custom-config';
+import { UserModule } from '../user/user.module';
 
 @Module({
   imports: [CustomConfigModule, UserModule, LoggerModule],

src/app.controller.ts → apps/api/src/api.controller.ts

@@ -2,7 +2,7 @@ import { Controller, Get } from '@nestjs/common';
 import { ApiResponse } from '@nestjs/swagger';
 
 @Controller()
-export class AppController {
+export class ApiController {
   @ApiResponse({
     status: 200,
     description: 'Send the message "pong" when the server is active.',

src/app.module.ts → apps/api/src/api.module.ts

@@ -1,5 +1,4 @@
 import { Module } from '@nestjs/common';
-import { AppController } from './app.controller';
 import { FileModule } from './file/file.module';
 import { UserModule } from './user/user.module';
 import { TagModule } from './tag/tag.module';
@@ -14,6 +13,7 @@ import { AiModule } from './ai/ai.module';
 import { CustomConfigModule, CustomConfigService } from '@lib/custom-config';
 import { HealthModule } from './health/health.module';
 import { RedisModule } from '@nestjs-modules/ioredis';
+import { ApiController } from './api.controller';
 
 @Module({
   imports: [
@@ -51,6 +51,6 @@ import { RedisModule } from '@nestjs-modules/ioredis';
     AiModule,
     HealthModule,
   ],
-  controllers: [AppController],
+  controllers: [ApiController],
 })
-export class AppModule {}
+export class ApiModule {}

src/crawl/crawl.module.ts → apps/api/src/crawl/crawl.module.ts

@@ -2,12 +2,12 @@ import { Module } from '@nestjs/common';
 import { CrawlService } from './crawl.service';
 import { CrawlController } from './crawl.controller';
 import { CrawlRepository } from './crawl.repository';
-import { UserModule } from 'src/user/user.module';
-import { AiModule } from 'src/ai/ai.module';
-import { FcmModule } from 'src/fcm/fcm.module';
 import { PrismaModule } from '@lib/prisma';
 import { LoggerModule } from '@lib/logger';
 import { CustomConfigModule } from '@lib/custom-config';
+import { UserModule } from '../user/user.module';
+import { AiModule } from '../ai/ai.module';
+import { FcmModule } from '../fcm/fcm.module';
 
 @Module({
   imports: [

src/crawl/crawl.service.ts → apps/api/src/crawl/crawl.service.ts

@@ -6,14 +6,14 @@ import {
 } from '@nestjs/common';
 import { CrawlRepository } from './crawl.repository';
 import { CreateCrawlDto } from './dto/req/createCrawl.dto';
-import { UserService } from 'src/user/user.service';
 import { Crawl } from '@prisma/client';
 import { GetCrawlDto } from './dto/req/getCrawl.dto';
-import { AiService } from 'src/ai/ai.service';
-import { FcmService } from 'src/fcm/fcm.service';
-import { FcmTargetUser } from 'src/fcm/types/fcmTargetUser.type';
 import { Loggable } from '@lib/logger/decorator/loggable';
 import { CustomConfigService } from '@lib/custom-config';
+import { UserService } from '../user/user.service';
+import { FcmService } from '../fcm/fcm.service';
+import { AiService } from '../ai/ai.service';
+import { FcmTargetUser } from '../fcm/types/fcmTargetUser.type';
 
 @Injectable()
 @Loggable()

src/document/document.module.ts → apps/api/src/document/document.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
 import { DocumentController } from './document.controller';
 import { DocumentService } from './document.service';
-import { FileModule } from 'src/file/file.module';
 import { LoggerModule } from '@lib/logger';
+import { FileModule } from '../file/file.module';
 
 @Module({
   imports: [FileModule, LoggerModule],

src/document/document.service.ts → apps/api/src/document/document.service.ts

@@ -1,7 +1,7 @@
 import { Loggable } from '@lib/logger/decorator/loggable';
 import { Injectable, Logger } from '@nestjs/common';
 import path from 'path';
-import { FileService } from 'src/file/file.service';
+import { FileService } from '../file/file.service';
 
 @Injectable()
 @Loggable()

src/group/group.controller.ts → apps/api/src/group/group.controller.ts

@@ -1,6 +1,5 @@
 import { Controller, Get, Post, Query, UseGuards } from '@nestjs/common';
 import { GroupService } from './group.service';
-import { IdPGuard } from 'src/user/guard/idp.guard';
 import {
   ApiCreatedResponse,
   ApiInternalServerErrorResponse,
@@ -10,10 +9,11 @@ import {
   ApiTags,
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
-import { GetToken } from 'src/user/decorator/get-token.decorator';
 import { GroupsTokenRes } from './dto/res/GroupsTokenRes.dto';
 import { GroupListResDto } from './dto/res/GroupsRes.dto';
 import { GetGroupByNameQueryDto } from './dto/req/getGroup.dto';
+import { IdPGuard } from '../user/guard/idp.guard';
+import { GetToken } from '../user/decorator/get-token.decorator';
 
 @ApiTags('Group')
 @ApiOAuth2(['email', 'profile', 'openid'], 'oauth2')

src/group/group.module.ts → apps/api/src/group/group.module.ts

@@ -2,10 +2,10 @@ import { Module } from '@nestjs/common';
 import { GroupService } from './group.service';
 import { HttpModule } from '@nestjs/axios';
 import { GroupController } from './group.controller';
-import { UserModule } from 'src/user/user.module';
 import { PrismaModule } from '@lib/prisma';
 import { LoggerModule } from '@lib/logger';
 import { CustomConfigModule } from '@lib/custom-config';
+import { UserModule } from '../user/user.module';
 
 @Module({
   imports: [

src/image/image.module.ts → apps/api/src/image/image.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
 import { ImageService } from './image.service';
 import { ImageController } from './image.controller';
-import { FileModule } from 'src/file/file.module';
 import { LoggerModule } from '@lib/logger';
+import { FileModule } from '../file/file.module';
 
 @Module({
   imports: [FileModule, LoggerModule],

src/image/image.service.ts → apps/api/src/image/image.service.ts

@@ -2,17 +2,15 @@ import {
   BadRequestException,
   Injectable,
   InternalServerErrorException,
-  Logger,
 } from '@nestjs/common';
 import path from 'path';
-import { FileService } from 'src/file/file.service';
 import sharp from 'sharp';
 import { Loggable } from '@lib/logger/decorator/loggable';
+import { FileService } from '../file/file.service';
 
 @Injectable()
 @Loggable()
 export class ImageService {
-  private readonly logger = new Logger(ImageService.name);
   constructor(private readonly fileService: FileService) {}
 
   /**

src/main.ts → apps/api/src/main.ts

@@ -1,13 +1,13 @@
 import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
 import cookieParser from 'cookie-parser';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 import expressBasicAuth from 'express-basic-auth';
 import { json } from 'express';
 import { CustomConfigService } from '@lib/custom-config';
+import { ApiModule } from './api.module';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
+  const app = await NestFactory.create(ApiModule);
   const customConfigService = app.get(CustomConfigService);
   // swagger auth config
   app.use(

src/notice/dto/req/additionalNotice.dto.ts → apps/api/src/notice/dto/req/additionalNotice.dto.ts

@@ -1,50 +1,50 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import {
-  IsDate,
-  IsEnum,
-  IsOptional,
-  IsString,
-  MaxLength,
-} from 'class-validator';
-
-export class AdditionalNoticeDto {
-  @ApiProperty({
-    example: '제목',
-    description: '바뀐 제목 (현재 진짜로 바뀌지는 않음)',
-    required: false,
-  })
-  @IsString()
-  @IsOptional()
-  @MaxLength(200)
-  title?: string;
-
-  @ApiProperty({
-    example: '추가 내용',
-    description: '추가된 내용',
-    required: true,
-  })
-  @IsString()
-  @MaxLength(100000)
-  body: string;
-
-  @ApiProperty({
-    example: '2021-08-01T00:00:00.000Z',
-    description: '마감일, 가장 최근에 post한 것을 기준으로 설정됨',
-    required: false,
-  })
-  @Type(() => Date)
-  @IsDate()
-  @IsOptional()
-  deadline?: Date;
-
-  @ApiProperty({
-    example: 'all',
-    description: '공지 알림을 받을 사람들',
-    required: false,
-  })
-  @IsString()
-  @IsEnum(['all', 'reminder'])
-  @IsOptional()
-  to?: string;
-}
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import {
+  IsDate,
+  IsEnum,
+  IsOptional,
+  IsString,
+  MaxLength,
+} from 'class-validator';
+
+export class AdditionalNoticeDto {
+  @ApiProperty({
+    example: '제목',
+    description: '바뀐 제목 (현재 진짜로 바뀌지는 않음)',
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  @MaxLength(200)
+  title?: string;
+
+  @ApiProperty({
+    example: '추가 내용',
+    description: '추가된 내용',
+    required: true,
+  })
+  @IsString()
+  @MaxLength(100000)
+  body: string;
+
+  @ApiProperty({
+    example: '2021-08-01T00:00:00.000Z',
+    description: '마감일, 가장 최근에 post한 것을 기준으로 설정됨',
+    required: false,
+  })
+  @Type(() => Date)
+  @IsDate()
+  @IsOptional()
+  deadline?: Date;
+
+  @ApiProperty({
+    example: 'all',
+    description: '공지 알림을 받을 사람들',
+    required: false,
+  })
+  @IsString()
+  @IsEnum(['all', 'reminder'])
+  @IsOptional()
+  to?: string;
+}