배포, 디비설정, 토큰인증 변경

.gitignore

@@ -39,4 +39,9 @@ lerna-debug.log*
 .env.dev
 !.example.env
 
-test/graphql-schema.gql
+test/graphql-schema.gql
+
+# key
+private.key
+public.key
+refresh_private.key

docker-compose.yml

@@ -1,36 +1,57 @@
+# services:
+#   app:
+#     build:
+#       context: .
+#     ports:
+#       - '3000:3000'
+#     depends_on:
+#       - postgres
+#     volumes:
+#       - .:/app
+#       - node_modules:/app/node_modules
+#     environment:
+#       - NODE_ENV=${NODE_ENV}
+#     # command: >
+#     #   sh -c "npm run migration:${NODE_ENV}:run && npm run ${NODE_ENV}"
+#     command: >
+#       sh -c "npm run migration:docker:generate && npm run migration:${NODE_ENV}:run && npm run ${NODE_ENV}"
+
+#   postgres:
+#     image: postgres
+#     container_name: postgres
+#     restart: unless-stopped
+#     environment:
+#       POSTGRES_USER: ${DB_USER}
+#       POSTGRES_PASSWORD: ${DB_PASSWORD}
+#       POSTGRES_DB: ${DB_NAME}
+#       TZ: 'UTC'
+#       PGTZ: 'UTC'
+#     ports:
+#       - '5432:5432'
+#     healthcheck:
+#       test: ['CMD', 'pg_isready', '-U', 'postgres']
+#       interval: 5s
+#       timeout: 5s
+#       retries: 5
+
+# volumes:
+#   node_modules:
+
 services:
   app:
     build:
       context: .
     ports:
       - '3000:3000'
-    depends_on:
-      - postgres
     volumes:
       - .:/app
       - node_modules:/app/node_modules
     environment:
       - NODE_ENV=${NODE_ENV}
+    # command: >
+    #   sh -c "npm run migration:docker:generate && npm run migration:${NODE_ENV}:run && npm run ${NODE_ENV}"
     command: >
-      sh -c "npm run migration:${NODE_ENV}:run && npm run ${NODE_ENV}"
-
-  postgres:
-    image: postgres
-    container_name: postgres
-    restart: unless-stopped
-    environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: ${DB_NAME}
-      TZ: 'UTC'
-      PGTZ: 'UTC'
-    ports:
-      - '5432:5432'
-    healthcheck:
-      test: ['CMD', 'pg_isready', '-U', 'postgres']
-      interval: 5s
-      timeout: 5s
-      retries: 5
+      sh -c "npm run ${NODE_ENV}"
 
 volumes:
   node_modules:

nest-cli.json

@@ -3,6 +3,12 @@
   "sourceRoot": "src",
   "compilerOptions": {
     "builder": "swc",
-    "typeCheck": true
+    "typeCheck": true,
+    "assets": [
+      {
+        "include": "common/templates/**/*",
+        "outDir": "dist"
+      }
+    ]
   }
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "api",
+  "name": "ResumeLog",
   "version": "0.0.1",
   "description": "",
   "author": "",
@@ -17,6 +17,7 @@
     "development": "export NODE_ENV=development && nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
+    "start:dev": "export NODE_ENV=development && nest start --watch",
     "lint": "eslint \"{src,test}/**/*.ts\" --fix",
     "lint:fix": "eslint -c ./eslint.config.mjs \"{src,test}/**/*.ts\" --fix",
     "test": "jest",
@@ -32,10 +33,10 @@
     "typeorm": "export NODE_ENV=production&& ts-node ./node_modules/typeorm/cli.js -d ./src/common/config/ormconfig.ts",
     "typeorm:development": "export NODE_ENV=development && ts-node ./node_modules/typeorm/cli.js -d ./src/common/config/ormconfig.ts",
     "migration:create": "typeorm-ts-node-commonjs migration:create",
-    "migration:generate": "npm run typeorm:development migration:generate",
+    "migration:generate": "npm run typeorm:development migration:generate src/common/database/migrations/CreateInitialTables",
     "migration:show": "npm run typeorm:development migration:show",
     "migration:run": "npm run build && npm run typeorm migration:run",
-    "migration:development:run": "npm run build && npm run typeorm:development migration:run",
+    "migration:development:run": "npm run build && npm run typeorm:development",
     "migration:revert": "npm run typeorm:development migration:revert",
     "docker:up": "docker-compose up --build",
     "docker:development:up": "docker-compose -f docker-compose.yml --env-file .development.env up --build",
@@ -84,6 +85,8 @@
     "rimraf": "^6.0.1",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.20",
+    "typeorm-naming-strategies": "^4.1.0",
+    "ulid": "^3.0.0",
     "uuid": "^11.0.5",
     "winston": "^3.17.0"
   },

src/app.module.ts

@@ -12,6 +12,7 @@ import { getEnvPath } from './common/helper/env.helper';
 import { envValidation } from './common/helper/env.validation';
 import { LoggingModule } from './common/logging/logging.module';
 import { HealthModule } from './health/health.module';
+import { ResumeModule } from './resume/resume.module';
 import { UploadModule } from './upload/upload.module';
 import { UserModule } from './user/user.module';
 
@@ -37,6 +38,7 @@ import { UserModule } from './user/user.module';
     HealthModule,
     CustomCacheModule.forRoot(),
     LoggingModule,
+    ResumeModule,
   ],
 })
 export class AppModule {}

src/auth/auth.module.ts

@@ -2,28 +2,20 @@ import { Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { JwtModule } from '@nestjs/jwt';
 import { PassportModule } from '@nestjs/passport';
-import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { EnvironmentVariables } from '../common/helper/env.validation';
 import { CustomMailerModule } from '../common/modules/mailer.module';
+import { TypeOrmExModule } from '../common/modules/typeorm.module';
 import { TransactionModule } from '../common/transaction/transaction.module';
 import { UtilModule } from '../common/util/util.module';
 import { UserModule } from '../user/user.module';
-import { EmailVerification } from './entities/email-verification.entity';
 import { EmailVerificationRepository } from './repositories/email-verification.repository';
 import { AuthVerificationResolver } from './resolvers/auth-verification.resolver';
 import { AuthResolver } from './resolvers/auth.resolver';
 import { AuthMailService } from './services/auth-mail.serivice';
 import { AuthVerificationService } from './services/auth-verification.service';
 import { AuthService } from './services/auth.service';
-// import { AppleAuthResolver } from './resolvers/apple-auth.resolver';
-// 이메일 로그인, 회원가입
-
-// // 소셜 로그인 Resolver들
-// import { KakaoAuthResolver } from './resolvers/kakao-auth.resolver';
-// import { NaverAuthResolver } from './resolvers/naver-auth.resolver';
-import { JwtRefreshStrategy } from './strategies/jwt-refresh.strategy';
-// 로그인 전략
+// import { JwtRefreshStrategy } from './strategies/jwt-refresh.strategy';
 import { JwtStrategy } from './strategies/jwt.strategy';
 import { LocalStrategy } from './strategies/local.strategy';
 
@@ -34,36 +26,28 @@ import { LocalStrategy } from './strategies/local.strategy';
       imports: [ConfigModule],
       inject: [ConfigService],
       useFactory: (configService: ConfigService<EnvironmentVariables>) => ({
-        privateKey: configService.get('JWT_PRIVATE_KEY'),
-        publicKey: configService.get('JWT_PUBLIC_KEY'),
+        secret: configService.get('JWT_SECRET'),
         signOptions: {
-          algorithm: 'RS256',
+          algorithm: 'HS256',
           expiresIn: '1d',
         },
-        verifyOptions: {
-          algorithms: ['RS256'],
-        },
       }),
     }),
     ConfigModule,
     UserModule,
     UtilModule,
     CustomMailerModule,
-    TypeOrmModule.forFeature([EmailVerification]),
+    TypeOrmExModule.forCustomRepository([EmailVerificationRepository]),
     TransactionModule,
   ],
   providers: [
     AuthService,
     AuthResolver, // 이메일/비밀번호 로그인
-    // KakaoAuthResolver, // 소셜: Kakao
-    // AppleAuthResolver, // 소셜: Apple
-    // NaverAuthResolver, // 소셜: Naver
     JwtStrategy,
-    JwtRefreshStrategy,
+    // JwtRefreshStrategy,
     LocalStrategy,
     AuthMailService,
     AuthVerificationService,
-    EmailVerificationRepository,
     AuthVerificationResolver,
   ],
 })

src/auth/entities/auth._entity.ts

@@ -1,12 +1,22 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
-import { User } from '../../user/entities/user.entity';
+@ObjectType()
+export class UserResponse {
+  @Field(() => String)
+  id: string;
+
+  @Field(() => String)
+  email: string;
+
+  @Field(() => String)
+  username: string;
+}
 
 @ObjectType()
 export class JwtWithUser {
   @Field(() => String)
   jwt: string;
 
-  @Field(() => User)
-  user: User;
+  @Field(() => UserResponse)
+  user: UserResponse;
 }

src/auth/entities/email-verification.entity.ts

@@ -1,15 +1,14 @@
-// src/auth/entities/email-verification.entity.ts
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  PrimaryGeneratedColumn,
-} from 'typeorm';
+import { Field, ID, ObjectType } from '@nestjs/graphql';
 
+import { Column, CreateDateColumn, Entity, PrimaryColumn } from 'typeorm';
+import { ulid } from 'ulid';
+
+@ObjectType()
 @Entity('email_verifications')
 export class EmailVerification {
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
+  @Field(() => ID)
+  @PrimaryColumn({ type: 'varchar', length: 26 })
+  id: string = ulid();
 
   @Column()
   email: string;

src/auth/inputs/auth.input.ts

@@ -32,9 +32,12 @@ export class SignUpInput {
   @IsNotEmpty()
   confirmPassword: string;
 
+  @Field({ nullable: true })
+  nickname?: string;
+
   @Field(() => String)
   @IsNotEmpty()
-  nickname: string;
+  username: string;
 
   @Field(() => Boolean)
   @IsNotEmpty()

src/auth/repositories/email-verification.repository.ts

@@ -1,16 +1,12 @@
-import { Injectable } from '@nestjs/common';
-
 import dayjs from 'dayjs';
-import { DataSource, EntityManager, Repository } from 'typeorm';
+import { EntityManager } from 'typeorm';
 
+import { CustomRepository } from '../../common/decorators/typeorm.decorator';
+import { ExtendedRepository } from '../../common/graphql/customExtended';
 import { EmailVerification } from '../entities/email-verification.entity';
 
-@Injectable()
-export class EmailVerificationRepository extends Repository<EmailVerification> {
-  constructor(dataSource: DataSource) {
-    super(EmailVerification, dataSource.createEntityManager());
-  }
-
+@CustomRepository(EmailVerification)
+export class EmailVerificationRepository extends ExtendedRepository<EmailVerification> {
   async createCode(email: string, code: string) {
     const entity = this.create({ email, code });
     return this.save(entity);
@@ -21,7 +17,7 @@ export class EmailVerificationRepository extends Repository<EmailVerification> {
     code: string,
     manager: EntityManager,
   ): Promise<boolean> {
-    const record = await this.findOne({
+    const record = await manager.findOne(EmailVerification, {
       where: { email, code, isVerified: false },
       order: { createdAt: 'DESC' },
       lock: { mode: 'pessimistic_write' },
@@ -37,7 +33,7 @@ export class EmailVerificationRepository extends Repository<EmailVerification> {
     }
 
     record.isVerified = true;
-    await this.save(record);
+    await manager.save(EmailVerification, record);
 
     return true;
   }