Revert "merge: 프로젝트 완성 (#80)"

This reverts commit 6fe5596.
KMU-WINK · Sep 15, 2024 · 097305f · 097305f
1 parent 6fe5596
commit 097305f
Show file tree

Hide file tree

Showing 175 changed files with 1,405 additions and 3,995 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ RUN apk add --no-cache curl \
 COPY --from=build /app/config/config.template.yaml ./config/config.template.yaml
 
 COPY --from=build /app/package.json /app/yarn.lock ./
-RUN yarn install --production --frozen-lockfile && yarn cache clean
+RUN yarn install --production --frozen-lockfile
 
 COPY --from=build /app/dist ./dist
 

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -4,11 +4,17 @@ import tseslint from 'typescript-eslint';
 import prettierConfig from 'eslint-config-prettier';
 import prettierRecommended from 'eslint-plugin-prettier/recommended';
 
-export default tseslint.config({
-  files: ['**/*.js', '**/*.mjs', '**/*.ts'],
-  extends: [eslint.configs.recommended, ...tseslint.configs.recommended, prettierRecommended],
-  rules: {
-    ...prettierConfig.rules,
-    'no-console': 'warn',
+export default tseslint.config(
+  {
+    files: ['**/*.js', '**/*.mjs', '**/*.ts'],
+    extends: [eslint.configs.recommended, ...tseslint.configs.recommended],
+    rules: {
+      'no-console': 'warn',
+    },
   },
-});
+  {
+    files: ['**/*.js', '**/*.mjs', '**/*.ts'],
+    extends: [prettierRecommended],
+    rules: prettierConfig.rules,
+  },
+);
diff --git a/package.json b/package.json
@@ -9,75 +9,71 @@
     "start:dev": "nest start --watch",
     "start:prod": "node dist/main",
     "test": "jest --runInBand",
-    "format": "prettier --write \"{src,test}/**/*.ts\"",
-    "lint": "eslint \"{src,test}/**/*.ts\" --fix"
+    "format": "prettier --write \"{src,spec}/**/*.ts\"",
+    "lint": "eslint \"{src,spec}/**/*.ts\" --fix"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.651.1",
-    "@nestjs/common": "^10.4.1",
+    "@aws-sdk/client-s3": "^3.623.0",
+    "@nestjs/common": "^10.3.10",
     "@nestjs/config": "^3.2.3",
-    "@nestjs/core": "^10.4.1",
+    "@nestjs/core": "^10.3.10",
     "@nestjs/event-emitter": "^2.0.4",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/mongoose": "^10.0.10",
-    "@nestjs/platform-express": "^10.4.1",
+    "@nestjs/platform-express": "^10.3.10",
     "@nestjs/schedule": "^4.1.0",
     "@nestjs/swagger": "^7.4.0",
-    "axios": "^1.7.7",
     "bcrypt": "^5.1.1",
-    "cheerio": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "ioredis": "^5.4.1",
     "js-yaml": "^4.1.0",
-    "mongoose": "^8.6.2",
+    "mongoose": "^8.5.1",
     "mongoose-autopopulate": "^1.1.0",
     "ms": "^3.0.0-canary.1",
     "nest-winston": "^1.9.7",
-    "nodemailer": "^6.9.15",
+    "nodemailer": "^6.9.14",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "uuid": "^10.0.0",
-    "winston": "^3.14.2",
+    "winston": "^3.13.1",
     "winston-daily-rotate-file": "^5.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
-    "@eslint/js": "^9.10.0",
-    "@nestjs/cli": "^10.4.5",
-    "@nestjs/schematics": "^10.1.4",
-    "@nestjs/testing": "^10.4.1",
-    "@swc/cli": "^0.4.1-nightly.20240914",
-    "@swc/core": "^1.7.26",
-    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@commitlint/cli": "^19.3.0",
+    "@commitlint/config-conventional": "^19.2.2",
+    "@eslint/js": "^9.8.0",
+    "@nestjs/cli": "^10.4.2",
+    "@nestjs/schematics": "^10.1.2",
+    "@nestjs/testing": "^10.3.10",
+    "@swc/cli": "^0.4.0",
+    "@swc/core": "^1.7.3",
     "@types/bcrypt": "^5.0.2",
-    "@types/cheerio": "^0.22.35",
     "@types/eslint-config-prettier": "^6.11.3",
     "@types/eslint__js": "^8.42.3",
     "@types/express": "^4.17.21",
-    "@types/jest": "^29.5.13",
+    "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4.0.9",
-    "@types/multer": "^1.4.12",
-    "@types/node": "^22.5.5",
+    "@types/multer": "^1.4.11",
+    "@types/node": "^20.14.10",
     "@types/nodemailer": "^6.4.15",
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^10.0.0",
-    "eslint": "^9.10.0",
+    "eslint": "^9.8.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "husky": "^9.1.6",
+    "husky": "^9.0.11",
     "jest": "^29.7.0",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.2.7",
     "prettier": "^3.3.3",
     "source-map-support": "^0.5.21",
     "supertest": "^7.0.0",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.2.2",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.6.2",
-    "typescript-eslint": "^8.5.0"
+    "typescript": "^5.5.4",
+    "typescript-eslint": "^7.17.0"
   },
   "resolutions": {
     "webpack": "^5.0.0",

diff --git a/prettier.config.mjs b/prettier.config.mjs
@@ -9,32 +9,4 @@ export default {
   tabWidth: 2,
   trailingComma: 'all',
   useTabs: false,
-  plugins: ['@trivago/prettier-plugin-sort-imports'],
-  importOrderParserPlugins: ['typescript', 'decorators-legacy'],
-  importOrder: [
-    // Nest
-    '^@nestjs',
-
-    // Domain
-    '^@wink/auth',
-    '^@wink/member',
-    '^@wink/activity',
-
-    // Common
-    '^@wink/(app|config|filter|interceptor|mongo|redis|s3)',
-
-    // Utils
-    '^@wink/(event|logger|mail|swagger|validation)',
-
-    // Test
-    '^@wink/test-mock',
-
-    // Other
-    '^[./]',
-
-    // Libraries
-    '<THIRD_PARTY_MODULES>',
-  ],
-  importOrderSeparation: true,
-  importOrderSortSpecifiers: true,
 };
diff --git a/src/common/app/app.module.ts b/src/common/app/app.module.ts
@@ -1,21 +1,19 @@
+import { APP_PIPE, APP_INTERCEPTOR, APP_FILTER } from '@nestjs/core';
 import { Module } from '@nestjs/common';
 import { ConfigModule, ConfigModuleOptions } from '@nestjs/config';
-import { APP_FILTER, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
-import { EventEmitterModule } from '@nestjs/event-emitter';
-import { JwtModule, JwtModuleAsyncOptions } from '@nestjs/jwt';
 import { MongooseModule, MongooseModuleAsyncOptions } from '@nestjs/mongoose';
+import { JwtModule, JwtModuleAsyncOptions } from '@nestjs/jwt';
 import { ScheduleModule } from '@nestjs/schedule';
-
-import { AuthModule } from '@wink/auth/auth.module';
-
-import { MemberModule } from '@wink/member/member.module';
-
-import { ActivityModule } from '@wink/activity/activity.module';
+import { EventEmitterModule } from '@nestjs/event-emitter';
 
 import { AppConfig, JwtConfig, MongoConfig } from '@wink/config';
 import { DefaultExceptionFilter, NotFoundExceptionFilter } from '@wink/filter';
 import { ApiResponseInterceptor } from '@wink/interceptor';
 
+import { AuthModule } from '@wink/auth/auth.module';
+import { MemberModule } from '@wink/member/member.module';
+import { ActivityModule } from '@wink/activity/activity.module';
+
 import { EventListenerModule } from '@wink/event';
 import { Validation } from '@wink/validation';
 

diff --git a/src/common/config/app.config.ts b/src/common/config/app.config.ts
@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
-import { load } from 'js-yaml';
 import { join } from 'path';
+import { load } from 'js-yaml';
 
 type ConfigType = Record<string, unknown>;
 

diff --git a/src/common/database/mongo/mongo-model.factory.util.ts b/src/common/database/mongo/mongo-model.factory.util.ts
@@ -1,54 +1,20 @@
-import { ModelDefinition } from '@nestjs/mongoose';
+import { AsyncModelFactory } from '@nestjs/mongoose';
 
 import { Schema } from 'mongoose';
 import AutoPopulate from 'mongoose-autopopulate';
 
-const convertToKST = (date: Date): Date => new Date(date.getTime() + 9 * 60 * 60 * 1000);
-
 export class MongoModelFactory {
-  static generate<T>(name: string, schema: Schema<T>): ModelDefinition {
-    schema = MongoModelFactory.setSchemaOptions(schema);
-
-    return { name, schema };
-  }
-
-  static generateRecursive<T>(
-    name: string,
-    schema: Schema<T>,
-    subSchemas: { type: string; schema: Schema }[],
-  ): ModelDefinition {
-    schema = MongoModelFactory.setSchemaOptions(schema);
-    subSchemas = subSchemas.map(({ type, schema }) => {
-      schema = MongoModelFactory.setSchemaOptions(schema);
-
-      return { type, schema };
-    });
-
+  static generate<T>(name: string, schema: Schema<T>): AsyncModelFactory {
     return {
       name,
-      schema,
-      discriminators: subSchemas.map(({ type, schema }) => {
-        return { name: type, schema };
-      }),
-    };
-  }
-
-  private static setSchemaOptions(schema: Schema): Schema {
-    schema.set('versionKey', false);
-    schema.set('timestamps', true);
-
-    schema.pre('save', function (next) {
-      if ('createdAt' in this) {
-        this['createdAt'] = convertToKST(new Date());
-      }
+      useFactory: () => {
+        schema.set('timestamps', true);
+        schema.set('versionKey', false);
 
-      this['updatedAt'] = convertToKST(new Date());
+        schema.plugin(AutoPopulate);
 
-      next();
-    });
-
-    schema.plugin(AutoPopulate);
-
-    return schema;
+        return schema;
+      },
+    };
   }
 }
diff --git a/src/common/database/redis/redis.module.ts b/src/common/database/redis/redis.module.ts
@@ -1,5 +1,4 @@
 import { DynamicModule, Module } from '@nestjs/common';
-
 import { RedisService } from './service';
 
 export interface RedisModuleOptions {

diff --git a/src/common/database/redis/service/redis.service.ts b/src/common/database/redis/service/redis.service.ts
@@ -27,33 +27,27 @@ export class RedisService {
   }
 
   async exists(key: string): Promise<boolean> {
-    if (!this.group) {
-      throw new Error('Group is not set');
-    }
+    if (!this.group) throw new Error('Group is not set');
 
-    const _key = this.generateKey(key);
+    const _key = this.#generateKey(key);
 
     const exists = await this.redisClient.exists(_key);
 
     return exists === 1;
   }
 
   async get(key: string): Promise<string> {
-    if (!this.group) {
-      throw new Error('Group is not set');
-    }
+    if (!this.group) throw new Error('Group is not set');
 
-    const _key = this.generateKey(key);
+    const _key = this.#generateKey(key);
 
     return (await this.redisClient.get(_key)) || '';
   }
 
   async set(key: string, value: string, seconds: number = 0): Promise<void> {
-    if (!this.group) {
-      throw new Error('Group is not set');
-    }
+    if (!this.group) throw new Error('Group is not set');
 
-    const _key = this.generateKey(key);
+    const _key = this.#generateKey(key);
 
     let event: RedisSetEvent | RedisSetTtlEvent;
 
@@ -69,21 +63,17 @@ export class RedisService {
   }
 
   async delete(key: string): Promise<void> {
-    if (!this.group) {
-      throw new Error('Group is not set');
-    }
+    if (!this.group) throw new Error('Group is not set');
 
-    const _key = this.generateKey(key);
+    const _key = this.#generateKey(key);
 
     await this.redisClient.del(_key);
 
     this.eventEmitter.emit(RedisDeleteEvent.EVENT_NAME, new RedisDeleteEvent(_key));
   }
 
-  private generateKey(key: string): string {
-    if (!this.group) {
-      throw new Error('Group is not set');
-    }
+  #generateKey(key: string): string {
+    if (!this.group) throw new Error('Group is not set');
 
     return `${this.group}:${key}`;
   }

diff --git a/src/common/http/filter/exception.filter.ts b/src/common/http/filter/exception.filter.ts
@@ -5,7 +5,6 @@ import {
   HttpStatus,
   NotFoundException,
 } from '@nestjs/common';
-
 import { ApiException } from '@wink/swagger';
 
 @Catch(ApiException)

diff --git a/src/common/http/interceptor/api-response.interceptor.ts b/src/common/http/interceptor/api-response.interceptor.ts
@@ -10,7 +10,7 @@ import {
 import { ApiException } from '@wink/swagger';
 
 import { Response } from 'express';
-import { Observable, catchError, map, throwError } from 'rxjs';
+import { catchError, map, Observable, throwError } from 'rxjs';
 
 @Injectable()
 export class ApiResponseInterceptor implements NestInterceptor {