[SWEP-78] 병합

.gitignore

@@ -124,8 +124,4 @@ dist
 .yarn/unplugged
 .yarn/build-state.yml
 .yarn/install-state.gz
-.pnp.*
-
-# json api 키 값
-sweepicai-*.json
-
+.pnp.*

@types/environment.d.ts

@@ -1,5 +1,5 @@
 namespace NodeJS {
-  interface ProcessEnv extends NodeJS.ProcessEnv {
+  export interface ProcessEnv extends NodeJS.ProcessEnv {
     PORT: string;
     DATABASE_URL: string;
     EXPRESS_SESSION_SECRET: string;

@types/express.d.ts

@@ -23,4 +23,4 @@ declare global {
       }): this;
     }
   }
-}
+}

eslint.config.js

@@ -3,7 +3,7 @@ import tsParser from '@typescript-eslint/parser';
 
 export default [
   {
-    ignores: ['node_modules', 'dist', 'build', 'tsconfig.json'],
+    ignores: ['node_modules', 'scripts', 'tsconfig.json', 'eslint.config.js'],
   },
   {
     files: ['**/*.ts', '**/*.js'],
@@ -12,7 +12,7 @@ export default [
       parserOptions: {
         ecmaVersion: 2021,
         sourceType: 'module',
-        //project: './tsconfig.json', // tsconfig.json 경로 추가
+        project: './tsconfig.json', // tsconfig.json 경로 추가
       },
     },
     plugins: {
@@ -22,6 +22,17 @@ export default [
       semi: ['error', 'always'],
       quotes: ['error', 'single'],
       '@typescript-eslint/no-namespace': 'off', // namespace 허용
+      '@typescript-eslint/no-explicit-any': 'warn', // 명시적 any 사용 경고
+      'no-unused-vars': 'error', // 사용하지 않는 변수는 에러
+      'no-console': 'warn', // console 사용 경고
+      'prefer-const': 'warn', // let 대신 const 사용 권장
+      'prefer-template': 'warn', // 문자열 연결 대신 템플릿 리터럴 사용 권장
+      'no-shadow': 'warn', // 외부 변수와 중복 변수 선언 경고
+      eqeqeq: ['error', 'always'], // == 대신 === 사용 권장
+      'no-duplicate-imports': 'error', // 중복 import 경고
+      'no-var': 'error', // var 사용 금지
+      'no-undef': 'error', // 선언되지 않은 변수 사용 금지
+      'no-const-assign': 'error', // const 재할당 금지
     },
   },
 ];

package.json

@@ -10,15 +10,15 @@
     "build": "tsx scripts/build.ts",
     "start": "node dist/app.cjs",
     "lint": "gts lint",
-    "clean": "gts clean",
     "compile": "tsc",
     "fix": "gts fix",
     "prepare": "yarn run compile",
     "pretest": "yarn run compile",
     "posttest": "yarn run lint",
     "swagger": "tsx swagger/swagger.ts",
     "tsoa-swagger": "tsoa spec -c ./config/tsoa.json",
-    "tsoa-routes": "tsoa routes -c ./config/tsoa.json"
+    "tsoa-routes": "tsoa routes -c ./config/tsoa.json",
+    "clean": "gts clean"
   },
   "author": "",
   "license": "ISC",
@@ -59,7 +59,7 @@
     "@types/express-session": "^1.18.1",
     "@types/multer": "^1.4.12",
     "@types/multer-s3": "^3.0.3",
-    "@types/node": "^22.10.3",
+    "@types/node": "^22.7.5",
     "@types/passport": "^1.0.17",
     "@types/passport-google-oauth20": "^2.0.16",
     "@types/passport-kakao": "^1.0.3",

src/app.ts

@@ -6,24 +6,28 @@ import express, {
   NextFunction,
   ErrorRequestHandler,
 } from 'express';
+import process from 'process';
 import swaggerUiExpress from 'swagger-ui-express';
-import {memoFolderRouter} from './routers/memo.router.js';
-import {RegisterRoutes} from './routers/tsoaRoutes.js';
-import {challengeRouter} from './routers/challenge.router.js';
-import {authRouter} from './routers/auth.routers.js';
-import {userRouter} from './routers/user.router.js';
 import passport from 'passport';
 import session from 'express-session';
 import {PrismaSessionStore} from '@quixo3/prisma-session-store';
 import {prisma} from './db.config.js';
 import swaggerDocumentOne from '../swagger/openapi.json' assert {type: 'json'};
 import swaggerDocumentTwo from '../swagger/swagger.json' assert {type: 'json'};
 import {BaseError} from './errors.js';
-import swaggerDocument from '../swagger/openapi.json' assert {type: 'json'};
-import { sessionAuthMiddleware } from './auth.config.js';
+import {sessionAuthMiddleware} from './auth.config.js';
 import cookieParser from 'cookie-parser';
 import {ValidateError} from 'tsoa';
-import { labelDetectionController } from './controllers/tags-ai.controller.js';
+import {labelDetectionController} from './controllers/tags-ai.controller.js';
+
+// routers
+import {memoFolderRouter} from './routers/memo.router.js';
+import {RegisterRoutes} from './routers/tsoaRoutes.js';
+import {challengeRouter} from './routers/challenge.router.js';
+import {authRouter} from './routers/auth.routers.js';
+import {userRouter} from './routers/user.router.js';
+import {tagRouter} from './routers/tag.router.js';
+import {myPageRouter} from './routers/mypage.routers.js';
 
 dotenv.config();
 
@@ -34,7 +38,7 @@ const port = process.env.PORT;
 app.use(cors());
 app.use(express.static('public'));
 app.use(express.json());
-app.use(express.urlencoded({extended: false})); 
+app.use(express.urlencoded({extended: false}));
 app.use(cookieParser());
 
 // Swagger Docs
@@ -109,7 +113,10 @@ app.use(sessionAuthMiddleware);
 app.use('/onboarding', userRouter);
 app.use('/memo', memoFolderRouter);
 app.use('/challenge', challengeRouter);
+app.use('/user/mypage', myPageRouter);
+app.use('/tag', tagRouter);
 app.post('/image/ai', labelDetectionController);
+
 RegisterRoutes(app);
 
 app.get('/', (req: Request, res: Response) => {
@@ -146,8 +153,6 @@ const errorHandler: ErrorRequestHandler = (err, req, res, next) => {
       success: null,
     });
   }
-
-  console.error('Unexpected error:', err);
   res.status(500).json({
     resultType: 'FAIL',
     error: {
@@ -161,6 +166,4 @@ const errorHandler: ErrorRequestHandler = (err, req, res, next) => {
 
 app.use(errorHandler);
 // Start server
-app.listen(port, () => {
-  console.log(`Example app listening on port ${port}`);
-});
+app.listen(port, () => {});