Merge branch 'main' of https://github.com/boostcampwm-2024/web05-Denamu into fix/tag-insertion-error

Author: asn6878

server/data-source.ts server/dataSource.tsserver/data-source.ts renamed to server/dataSource.ts

@@ -9,7 +9,6 @@ dotenv.config({
     {
       PROD: `${process.cwd()}/env/.env.prod`,
       LOCAL: `${process.cwd()}/env/.env.local`,
-      DEV: `${process.cwd()}/env/.env.local`,
     }[process.env.NODE_ENV] || '',
 });
 
@@ -18,4 +17,6 @@ const dbOptions = loadDBSetting(configService);
 
 export const AppDataSource = new DataSource({
   ...dbOptions,
+  entities: [`${__dirname}/src/**/*.entity.{js,ts}`],
+  migrations: [`${__dirname}/src/migration/*.{js,ts}`],
 });

server/package.json

@@ -10,16 +10,19 @@
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "node dist/src/main.js",
     "start:dev": "nest start --watch",
-    "start:debug": "cross-env NODE_ENV=debug nest start --debug --watch",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test:unit": "cross-env NODE_ENV=test jest --config test/jest-unit.json",
-    "test:unit:cov": "cross-env NODE_ENV=test jest --config test/jest-unit.json --coverage",
-    "test:e2e": "cross-env NODE_ENV=test jest --config test/jest-e2e.json",
+    "test:unit": "cross-env NODE_ENV=TEST jest --config test/jest-unit.json",
+    "test:unit:cov": "cross-env NODE_ENV=TEST jest --config test/jest-unit.json --coverage",
+    "test:e2e": "cross-env NODE_ENV=TEST jest --config test/jest-e2e.json",
     "test:e2e:debug": "cross-env NODE_ENV=debug jest --config test/jest-e2e.json",
-    "test:e2e:cov": "cross-env NODE_ENV=test jest --config test/jest-e2e.json --coverage",
-    "test": "cross-env NODE_ENV=test jest --config test/jest-integration.json",
-    "test:watch": "cross-env NODE_ENV=test jest --config test/jest-integration.json --watch",
-    "test:cov": "cross-env NODE_ENV=test jest --config test/jest-integration.json --coverage"
+    "test:e2e:cov": "cross-env NODE_ENV=TEST jest --config test/jest-e2e.json --coverage",
+    "test": "cross-env NODE_ENV=TEST jest --config test/jest-integration.json",
+    "test:watch": "cross-env NODE_ENV=TEST jest --config test/jest-integration.json --watch",
+    "test:cov": "cross-env NODE_ENV=TEST jest --config test/jest-integration.json --coverage",
+    "typeorm": "typeorm-ts-node-commonjs",
+    "migration:create": "cross-env NODE_ENV=PROD npm run typeorm -- migration:create",
+    "prod:migration:generate": "cross-env NODE_ENV=PROD npm run typeorm -- migration:generate -d dataSource.ts",
+    "local:migration:generate": "cross-env NODE_ENV=LOCAL npm run typeorm -- migration:generate -d dataSource.ts"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.36.3",

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

@@ -2,8 +2,7 @@ import { ConfigService } from '@nestjs/config';
 
 export function loadDBSetting(configService: ConfigService) {
   const env = process.env.NODE_ENV;
-  const isDev = env === 'LOCAL' || env === 'DEV';
-  const isTest = env === 'test';
+  const isDev = env === 'LOCAL' || env === 'DEV' || env === 'TEST';
 
   return {
     type: configService.get<'mysql' | 'sqlite'>('DB_TYPE'),
@@ -14,9 +13,9 @@ export function loadDBSetting(configService: ConfigService) {
     password: configService.get<string>('DB_PASSWORD'),
     entities: [`${__dirname}/../../**/*.entity.{js,ts}`],
 
-    synchronize: isDev || isTest,
+    synchronize: isDev,
     migrations: [`${__dirname}/../../migration/*.{js,ts}`],
-    migrationsRun: false,
+    migrationsRun: !isDev,
     logging: isDev,
   };
 }