Merge branch 'main' into portainer-migration

.eslintrc.js

@@ -1,29 +1,17 @@
 module.exports = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
+  env: {
+    browser: true,
+    es2021: true,
+    node: true,
   },
-  plugins: ['@typescript-eslint/eslint-plugin'],
+  settings: {},
   extends: [
+    'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:prettier/recommended',
   ],
-  root: true,
-  env: {
-    node: true,
-    jest: true,
-  },
-  ignorePatterns: ['.eslintrc.js'],
   rules: {
-    '@typescript-eslint/interface-name-prefix': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/ban-types': 'off',
-    '@typescript-eslint/no-unused-vars': 'warn',
-    '@typescript-eslint/no-empty-function': 'off',
-    "no-warning-comments": 'off',
-    'prettier/prettier': 'off'
+    'prettier/prettier': ['error', { 'endOfLine': 'auto' }],
+    '@typescript-eslint/no-explicit-any': 'warn',
   },
 };

.github/workflows/github-action.yaml

@@ -10,8 +10,26 @@ env:
   ECR_REPOSITORY: popo-nest-api
 
 jobs:
+  lint:
+    name: Prettier and ESLint check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Install dependencies
+        run: npm install
+      - name: Run Prettier
+        run: npx prettier --check **/*.ts
+      - name: Run ESLint
+        run: npx eslint . --ext .ts --ignore-pattern dist/
+
   docker_build_and_push:
     name: Docker build and push
+    needs: lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.prettierrc

@@ -1,7 +1,8 @@
 {
   "singleQuote": true,
-  "trailingComma": "all",
-  "tabWidth": 2,
   "semi": true,
-  "endOfLine": "lf"
+  "useTabs": false,
+  "tabWidth": 2,
+  "trailingComma": "all",
+  "printWidth": 80
 }

package.json

@@ -8,12 +8,12 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "nest start",
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "format": "prettier --w **/*.ts",
+    "lint": "eslint . --ext .ts --ignore-pattern dist/",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",

src/admin/admin.module.ts

@@ -2,6 +2,6 @@ import { Module } from '@nestjs/common';
 import { AdminController } from './admin.controller';
 
 @Module({
-  controllers: [AdminController]
+  controllers: [AdminController],
 })
 export class AdminModule {}

src/app.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { ConfigModule, ConfigService } from '@nestjs/config'
+import { ConfigModule, ConfigService } from '@nestjs/config';
 
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -18,7 +18,8 @@ import configuration from './config/configurations';
     }),
     TypeOrmModule.forRootAsync({
       imports: [ConfigModule],
-      useFactory: (configService: ConfigService) => configService.get('database'),
+      useFactory: (configService: ConfigService) =>
+        configService.get('database'),
       inject: [ConfigService],
     }),
     PopoModule,

src/app.service.ts

@@ -1,10 +1,14 @@
 import { Injectable } from '@nestjs/common';
 import * as moment from 'moment';
-import * as momentTz from "moment-timezone";
+import * as momentTz from 'moment-timezone';
 
 @Injectable()
 export class AppService {
   getHello(): string {
-    return `Hello POPO! (popo-${process.env.POPO_VERSION}) (server now: ${moment().format('YYYY-MM-DD HH:mm:ss')}, KST now: ${momentTz().tz("Asia/Seoul").format('YYYY-MM-DD HH:mm:ss')})`;
+    return `Hello POPO! (popo-${
+      process.env.POPO_VERSION
+    }) (server now: ${moment().format(
+      'YYYY-MM-DD HH:mm:ss',
+    )}, KST now: ${momentTz().tz('Asia/Seoul').format('YYYY-MM-DD HH:mm:ss')})`;
   }
 }

src/auth/auth.controller.ts

@@ -22,8 +22,8 @@ import { MailService } from '../mail/mail.service';
 import { ReservePlaceService } from '../popo/reservation/place/reserve.place.service';
 import { ReserveEquipService } from '../popo/reservation/equip/reserve.equip.service';
 import { ApiTags } from '@nestjs/swagger';
-import {JwtPayload} from "./strategies/jwt.payload";
-import {PasswordResetRequest, PasswordUpdateRequest} from "./auth.dto";
+import { JwtPayload } from './strategies/jwt.payload';
+import { PasswordResetRequest, PasswordUpdateRequest } from './auth.dto';
 
 const requiredRoles = [UserType.admin, UserType.association, UserType.staff];
 
@@ -95,7 +95,7 @@ export class AuthController {
     // update Login History
     const existUser = await this.userService.findOneByUuidOrFail(user.uuid);
     await this.userService.updateLogin(existUser.uuid);
-    
+
     return res.send(user);
   }
 
@@ -115,8 +115,8 @@ export class AuthController {
 
     try {
       await this.mailService.sendVerificationMail(
-          createUserDto.email,
-          saveUser.uuid,
+        createUserDto.email,
+        saveUser.uuid,
       );
     } catch (error) {
       console.log('!! 유저 인증 메일 전송 실패 !!');
@@ -133,25 +133,36 @@ export class AuthController {
   }
 
   @Post('password/reset')
-  async resetPassword(
-    @Body() body: PasswordResetRequest,
-  ) {
+  async resetPassword(@Body() body: PasswordResetRequest) {
     const existUser = await this.userService.findOneByEmail(body.email);
 
     if (!existUser) {
-      throw new BadRequestException('해당 이메일로 가입한 유저가 존재하지 않습니다.');
+      throw new BadRequestException(
+        '해당 이메일로 가입한 유저가 존재하지 않습니다.',
+      );
     }
-    
+
     if (existUser.userStatus === UserStatus.password_reset) {
-      throw new BadRequestException('이미 비빌번호를 초기화 했습니다. 신규 비밀번호를 메일에서 확인해주세요.');
+      throw new BadRequestException(
+        '이미 비빌번호를 초기화 했습니다. 신규 비밀번호를 메일에서 확인해주세요.',
+      );
     }
 
     // generate 8-length random password
     const temp_password = 'poapper_' + Math.random().toString(36).slice(-8);
 
-    await this.userService.updatePasswordByEmail(existUser.email, temp_password);
-    await this.userService.updateUserStatus(existUser.uuid, UserStatus.password_reset);
-    await this.mailService.sendPasswordResetMail(existUser.email, temp_password);
+    await this.userService.updatePasswordByEmail(
+      existUser.email,
+      temp_password,
+    );
+    await this.userService.updateUserStatus(
+      existUser.uuid,
+      UserStatus.password_reset,
+    );
+    await this.mailService.sendPasswordResetMail(
+      existUser.email,
+      temp_password,
+    );
   }
 
   @Post('password/update')
@@ -168,8 +179,7 @@ export class AuthController {
   @UseGuards(JwtAuthGuard)
   async getMyInfo(@Req() req: Request) {
     const user = req.user as JwtPayload;
-    const { password, cryptoSalt, ...UserInfo } =
-      await this.userService.findOneByUuid(user.uuid);
+    const { ...UserInfo } = await this.userService.findOneByUuid(user.uuid);
 
     return UserInfo;
   }

src/auth/auth.module.ts

@@ -1,15 +1,15 @@
-import {Module} from '@nestjs/common';
-import {JwtModule} from '@nestjs/jwt';
-import {PassportModule} from '@nestjs/passport';
-import {AuthService} from './auth.service';
-import {jwtConstants} from './constants';
-import {JwtStrategy} from './strategies/jwt.strategy';
-import {LocalStrategy} from './strategies/local.strategy';
-import {UserModule} from "../popo/user/user.module";
-import {AuthController} from './auth.controller';
-import {MailModule} from "../mail/mail.module";
-import {ReservePlaceModule} from "../popo/reservation/place/reserve.place.module";
-import { ReserveEquipModule } from "../popo/reservation/equip/reserve.equip.module";
+import { Module } from '@nestjs/common';
+import { JwtModule } from '@nestjs/jwt';
+import { PassportModule } from '@nestjs/passport';
+import { AuthService } from './auth.service';
+import { jwtConstants } from './constants';
+import { JwtStrategy } from './strategies/jwt.strategy';
+import { LocalStrategy } from './strategies/local.strategy';
+import { UserModule } from '../popo/user/user.module';
+import { AuthController } from './auth.controller';
+import { MailModule } from '../mail/mail.module';
+import { ReservePlaceModule } from '../popo/reservation/place/reserve.place.module';
+import { ReserveEquipModule } from '../popo/reservation/equip/reserve.equip.module';
 
 @Module({
   imports: [
@@ -20,12 +20,11 @@ import { ReserveEquipModule } from "../popo/reservation/equip/reserve.equip.modu
     PassportModule,
     JwtModule.register({
       secret: jwtConstants.secret,
-      signOptions: {expiresIn: '360000s'},
+      signOptions: { expiresIn: '360000s' },
     }),
   ],
   providers: [AuthService, LocalStrategy, JwtStrategy],
   exports: [AuthService],
   controllers: [AuthController],
 })
-export class AuthModule {
-}
+export class AuthModule {}

src/auth/auth.service.ts

@@ -23,7 +23,7 @@ export class AuthService {
     }
 
     const cryptoSalt = user.cryptoSalt;
-    
+
     if (user.userStatus == UserStatus.password_reset) {
       await this.usersService.updateUserStatus(user.uuid, UserStatus.activated);
     } else if (user.userStatus != UserStatus.activated) {
@@ -32,15 +32,13 @@ export class AuthService {
 
     const encryptedPassword = this.encryptPassword(password, cryptoSalt);
     if (user.password === encryptedPassword) {
-      const { password, ...result } = user;
+      const { ...result } = user;
       return result;
     } else {
       return null;
     }
   }
 
-
-
   async generateJwtToken(user: any) {
     const payload = {
       uuid: user.uuid,

src/auth/authroization/roles.decorator.ts

@@ -1,4 +1,4 @@
-import {SetMetadata} from "@nestjs/common";
-import {UserType} from "../../popo/user/user.meta";
+import { SetMetadata } from '@nestjs/common';
+import { UserType } from '../../popo/user/user.meta';
 
-export const Roles = (...roles: UserType[]) => SetMetadata('roles', roles);
+export const Roles = (...roles: UserType[]) => SetMetadata('roles', roles);

src/auth/authroization/roles.guard.ts

@@ -1,15 +1,15 @@
-import {CanActivate, ExecutionContext, Injectable} from "@nestjs/common";
-import {Reflector} from '@nestjs/core';
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
 
 @Injectable()
 export class RolesGuard implements CanActivate {
-  constructor(
-    private readonly reflector: Reflector
-  ) {
-  }
+  constructor(private readonly reflector: Reflector) {}
 
   canActivate(context: ExecutionContext): boolean {
-    const requiredRoles = this.reflector.get<string[]>('roles', context.getHandler());
+    const requiredRoles = this.reflector.get<string[]>(
+      'roles',
+      context.getHandler(),
+    );
     // 모든 Role에서 접근 가능
     if (!requiredRoles) {
       return true;
@@ -20,4 +20,4 @@ export class RolesGuard implements CanActivate {
 
     return requiredRoles.some((role) => user.userType?.includes(role));
   }
-}
+}

src/auth/strategies/local.strategy.ts

@@ -1,12 +1,12 @@
-import {Injectable, UnauthorizedException} from '@nestjs/common';
-import {PassportStrategy} from '@nestjs/passport';
-import {Strategy} from 'passport-local';
-import {AuthService} from '../auth.service';
+import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { PassportStrategy } from '@nestjs/passport';
+import { Strategy } from 'passport-local';
+import { AuthService } from '../auth.service';
 
 @Injectable()
 export class LocalStrategy extends PassportStrategy(Strategy) {
   constructor(private readonly authService: AuthService) {
-    super({usernameField: 'email'});
+    super({ usernameField: 'email' });
   }
 
   async validate(email: string, password: string): Promise<any> {

src/file/file.service.ts

@@ -19,8 +19,6 @@ export class FileService {
 
   constructor() {}
 
-
-
   async queryOnS3(key: string, query: string) {
     const res = await this.s3.send(
       new SelectObjectContentCommand({
@@ -30,19 +28,19 @@ export class FileService {
         Expression: query,
         InputSerialization: {
           CSV: {
-            FileHeaderInfo: "USE",
+            FileHeaderInfo: 'USE',
           },
         },
         OutputSerialization: {
           JSON: {
             RecordDelimiter: ',',
           },
         },
-      })
-    )
+      }),
+    );
 
     if (!res.Payload) {
-      throw new Error("No payload received from S3 SelectObjectContent");
+      throw new Error('No payload received from S3 SelectObjectContent');
     }
 
     const convertDataToJson = async (generator) => {
@@ -65,8 +63,8 @@ export class FileService {
       new GetObjectCommand({
         Bucket: this.bucket,
         Key: key,
-      })
-    )
+      }),
+    );
     return res.Body.transformToString();
   }