🚀 티켓, 채팅모듈 배포

티켓, 채팅모듈 배포

package.json

@@ -76,6 +76,7 @@
     "@types/jest": "27.4.1",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/node": "^16.0.0",
+    "@types/socket.io": "^3.0.2",
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.0.0",

src/app.module.ts

@@ -15,37 +15,10 @@ import { DatabaseModule } from './database/database.module';
 import { UsersModule } from './users/users.module';
 import { SmsModule } from './sms/sms.module';
 import { ThrottlerModule } from '@nestjs/throttler';
+import { CustomConfigModule } from './config/customConfig.module';
 
 @Module({
   imports: [
-    ConfigModule.forRoot({
-      isGlobal: true,
-      validationSchema: Joi.object({
-        NODE_ENV: Joi.string()
-          .valid('dev', 'prod', 'test', 'provision')
-          .default('dev'),
-        PORT: Joi.number().default(8080),
-        ACCESS_SECRET: Joi.string(),
-        REGISTER_SECRET: Joi.string(),
-        SWAGGER_USER: Joi.string(),
-        SWAGGER_PASSWORD: Joi.string(),
-        REDIS_HOST: Joi.string(),
-        REDIS_PORT: Joi.number(),
-        POSTGRES_HOST: Joi.string().default('localhost'),
-        POSTGRES_PORT: Joi.number().default(5432),
-        POSTGRES_USER: Joi.string().default('gosrock'),
-        POSTGRES_PASSWORD: Joi.string().default('gosrock22th'),
-        POSTGRES_DB: Joi.string().default('ticket'),
-        SLACK_ORDER_CHANNELID: Joi.string(),
-        SLACK_ADMIN_CHANNELID: Joi.string(),
-        SLACK_BOT_TOKEN: Joi.string(),
-        SLACK_BACKEND_CHANNELID: Joi.string(),
-        NAVER_SERVICE_ID: Joi.string(),
-        NAVER_ACCESS_KEY: Joi.string(),
-        NAVER_SECRET_KEY: Joi.string(),
-        NAVER_CALLER: Joi.string()
-      })
-    }),
     BullModule.forRootAsync({
       imports: [ConfigModule],
 
@@ -74,14 +47,30 @@ import { ThrottlerModule } from '@nestjs/throttler';
     ThrottlerModule.forRoot({
       ttl: process.env.NODE_ENV === 'prod' ? 300 : 60,
       limit: 3
+    }),
+    CustomConfigModule,
+    RedisModule.forRootAsync({
+      imports: [ConfigModule],
+      useFactory: async (configService: ConfigService) => ({
+        isTest: false,
+        logging: false,
+        redisConnectOption: {
+          url:
+            'redis://' +
+            configService.get('REDIS_HOST') +
+            ':' +
+            configService.get('REDIS_PORT')
+        }
+      }),
+      inject: [ConfigService]
     })
   ],
 
   providers: [
     {
       provide: APP_FILTER,
       useClass: AllExceptionsFilter
-    }
+    },
   ]
 })
 export class AppModule {}

src/auth/auth.module.ts

@@ -1,4 +1,4 @@
-import { Inject, Logger, Module } from '@nestjs/common';
+import { Global, Inject, Logger, Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { User } from 'src/database/entities/user.entity';
@@ -13,6 +13,7 @@ import { AuthService } from './auth.service';
 import { AccessTokenGuard } from './guards/AccessToken.guard';
 import { RegisterTokenGuard } from './guards/RegisterToken.guard';
 
+@Global()
 @Module({
   imports: [
     SmsModule.forRootAsync({
@@ -23,22 +24,7 @@ import { RegisterTokenGuard } from './guards/RegisterToken.guard';
       inject: [ConfigService]
     }),
     UsersModule,
-    TypeOrmModule.forFeature([User]),
-    RedisModule.forRootAsync({
-      imports: [ConfigModule],
-      useFactory: async (configService: ConfigService) => ({
-        isTest: false,
-        logging: false,
-        redisConnectOption: {
-          url:
-            'redis://' +
-            configService.get('REDIS_HOST') +
-            ':' +
-            configService.get('REDIS_PORT')
-        }
-      }),
-      inject: [ConfigService]
-    })
+    TypeOrmModule.forFeature([User])
   ],
   controllers: [AuthController],
   providers: [

src/auth/auth.service.spec.ts

@@ -10,6 +10,9 @@ import { DataSource } from 'typeorm';
 import { AuthService } from './auth.service';
 import * as Joi from 'joi';
 import { SlackModule } from 'src/slack/slack.module';
+import { SmsFakeService } from 'src/sms/smsFake.service';
+import { SmsService } from 'src/sms/sms.service';
+import { CustomConfigModule } from 'src/config/customConfig.module';
 
 export const repositoryMockFactory: () => MockType<UserRepository> = jest.fn(
   () => ({
@@ -27,33 +30,7 @@ describe('AuthService', () => {
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      imports: [
-        ConfigModule.forRoot({
-          isGlobal: true,
-          // envFilePath: process.env.NODE_ENV === 'test' ? '.env.local' : '.env',
-          validationSchema: Joi.object({
-            NODE_ENV: Joi.string()
-              .valid('dev', 'prod', 'test', 'provision')
-              .default('dev'),
-            PORT: Joi.number().default(8080),
-            ACCESS_SECRET: Joi.string(),
-            REGISTER_SECRET: Joi.string(),
-            SWAGGER_USER: Joi.string(),
-            SWAGGER_PASSWORD: Joi.string(),
-            REDIS_HOST: Joi.string(),
-            REDIS_PORT: Joi.number(),
-            POSTGRES_HOST: Joi.string().default('localhost'),
-            POSTGRES_PORT: Joi.number().default(5432),
-            POSTGRES_USER: Joi.string().default('gosrock'),
-            POSTGRES_PASSWORD: Joi.string().default('gosrock22th'),
-            POSTGRES_DB: Joi.string().default('ticket'),
-            SLACK_ORDER_CHANNELID: Joi.string(),
-            SLACK_ADMIN_CHANNELID: Joi.string()
-          })
-        }),
-        SlackModule
-      ],
-      // imports: [TypeOrmModule.forFeature([User])],
+      imports: [CustomConfigModule, SlackModule],
       providers: [
         AuthService,
         {
@@ -67,6 +44,10 @@ describe('AuthService', () => {
         {
           provide: RedisService,
           useClass: RedisTestService
+        },
+        {
+          provide: SmsService,
+          useClass: SmsFakeService
         }
       ]
     }).compile();

src/auth/auth.service.ts

@@ -31,6 +31,7 @@ import { RequestAdminLoginDto } from './dtos/AdminLogin.request.dto';
 import { ResponseAdminLoginDto } from './dtos/AdminLogin.response.dto';
 import { SmsService } from 'src/sms/sms.service';
 import { MessageDto } from 'src/sms/dtos/message.dto';
+import { SlackValidationNumberDMDto } from 'src/slack/dtos/SlackValidationNumberDM.dto';
 
 @Injectable()
 export class AuthService {
@@ -47,7 +48,7 @@ export class AuthService {
   async requestPhoneValidationNumber(
     requestPhoneNumberDto: RequestPhoneNumberDto
   ): Promise<ResponseRequestValidationDto> {
-    let test;
+    console.log(this.dataSource);
     //console.log(test.adf.asdf);
     //TODO : 전화번호 인증번호 발송 로직 추가 , 이찬진 2022.07.14
     const userPhoneNumber = requestPhoneNumberDto.phoneNumber;
@@ -173,8 +174,8 @@ export class AuthService {
     } catch (e) {
       // 에러가 발생하면 롤백
       await queryRunner.rollbackTransaction();
-      this.logger.error(e);
-      throw new InternalServerErrorException('서버에러');
+
+      throw e;
     } finally {
       // 직접 생성한 QueryRunner는 해제시켜 주어야 함
       await queryRunner.release();
@@ -211,7 +212,9 @@ export class AuthService {
       randomCode,
       180
     );
-    await this.slackService.sendDMwithValidationNumber(slaceUserId, randomCode);
+    await this.slackService.sendDMwithValidationNumber(
+      new SlackValidationNumberDMDto(slaceUserId, randomCode)
+    );
 
     return { validationNumber: randomCode };
   }

src/common/decorators/ApiPaginatedDto.decorator.ts

@@ -0,0 +1,33 @@
+import { applyDecorators, Type } from '@nestjs/common';
+import { ApiExtraModels, ApiOkResponse, getSchemaPath } from '@nestjs/swagger';
+import { PageDto } from '../dtos/page/page.dto';
+
+/**
+ * 제네릭을 활용한 swagger 응답을 주기위한 용도입니다.
+ * @param props model : 원래 응답할 data의 타입 , description 응답 설명
+ * @returns
+ */
+export const ApiPaginatedDto = <TModel extends Type<any>>(props: {
+  model: TModel;
+  description?: string;
+}) => {
+  return applyDecorators(
+    ApiExtraModels(PageDto, props.model),
+    ApiOkResponse({
+      description: props.description,
+      schema: {
+        allOf: [
+          { $ref: getSchemaPath(PageDto) },
+          {
+            properties: {
+              data: {
+                type: 'array',
+                items: { $ref: getSchemaPath(props.model) }
+              }
+            }
+          }
+        ]
+      }
+    })
+  );
+};

src/common/dtos/user-profile.dto.ts

@@ -1,24 +1,34 @@
-import { PickType, PartialType } from '@nestjs/swagger';
-import { plainToInstance } from 'class-transformer';
+import { PickType, PartialType, ApiProperty } from '@nestjs/swagger';
+import { Expose, plainToInstance } from 'class-transformer';
 import { User } from 'src/database/entities/user.entity';
+import { Role } from '../consts/enum';
 
-export class UserProfileDto extends PickType(PartialType(User), [
-  'name',
-  'phoneNumber',
-  'role',
-  'createdAt'
-] as const) {
-  constructor(user: User) {
-    super();
-    this.name = user.name;
-    this.phoneNumber = user.phoneNumber;
-    this.role = user.role;
-    this.createdAt = user.createdAt;
-  }
+export class UserProfileDto {
+  @ApiProperty({
+    description: '유저의 고유 아이디입니다.',
+    type: Number
+  })
+  @Expose()
+  public id: number;
 
-  static convertFrom(user: User): UserProfileDto {
-    return plainToInstance(UserProfileDto, user, {
-      excludeExtraneousValues: true
-    });
-  }
+  @ApiProperty({
+    description: '유저의 입금자명입니다.',
+    type: String
+  })
+  @Expose()
+  public name: string;
+
+  @ApiProperty({
+    description: '유저의 휴대전화번호 입니다.',
+    type: String
+  })
+  @Expose()
+  public phoneNumber: string;
+
+  @ApiProperty({
+    description: '유저의 권한입니다.',
+    enum: Role
+  })
+  @Expose()
+  public role: Role;
 }

src/config/customConfig.module.ts

@@ -0,0 +1,38 @@
+import { Global, Module } from '@nestjs/common';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import * as Joi from 'joi';
+
+@Global()
+@Module({
+  imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+      validationSchema: Joi.object({
+        NODE_ENV: Joi.string()
+          .valid('dev', 'prod', 'test', 'provision')
+          .default('dev'),
+        PORT: Joi.number().default(8080),
+        ACCESS_SECRET: Joi.string(),
+        REGISTER_SECRET: Joi.string(),
+        SWAGGER_USER: Joi.string(),
+        SWAGGER_PASSWORD: Joi.string(),
+        REDIS_HOST: Joi.string(),
+        REDIS_PORT: Joi.number(),
+        POSTGRES_HOST: Joi.string().default('localhost'),
+        POSTGRES_PORT: Joi.number().default(5432),
+        POSTGRES_USER: Joi.string().default('gosrock'),
+        POSTGRES_PASSWORD: Joi.string().default('gosrock22th'),
+        POSTGRES_DB: Joi.string().default('ticket'),
+        SLACK_ORDER_CHANNELID: Joi.string(),
+        SLACK_ADMIN_CHANNELID: Joi.string(),
+        SLACK_BOT_TOKEN: Joi.string(),
+        SLACK_BACKEND_CHANNELID: Joi.string(),
+        NAVER_SERVICE_ID: Joi.string(),
+        NAVER_ACCESS_KEY: Joi.string(),
+        NAVER_SECRET_KEY: Joi.string(),
+        NAVER_CALLER: Joi.string()
+      })
+    })
+  ]
+})
+export class CustomConfigModule {}

src/database/entities/order.entity.ts

@@ -1,7 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Expose, Transform } from 'class-transformer';
+import { Expose, Transform, Type } from 'class-transformer';
 import { MaxLength } from 'class-validator';
 import { OrderStatus, OrderDate } from 'src/common/consts/enum';
+import { UserProfileDto } from 'src/common/dtos/user-profile.dto';
 import {
   Column,
   CreateDateColumn,
@@ -76,17 +77,19 @@ export class Order {
 
   @ApiProperty({
     description: '주문을 진행한 유저의 외래키',
-    type: () => User
+    type: () => UserProfileDto
   })
+  @Type(() => UserProfileDto)
   @Expose()
   @ManyToOne(type => User, user => user.order, { eager: false })
   public user: User;
 
   @ApiProperty({
     description: '주문을 처리한 어드민에 대한 외래키입니다.',
-    type: () => User,
+    type: () => UserProfileDto,
     nullable: true
   })
+  @Type(() => UserProfileDto)
   @Expose()
   @ManyToOne(type => User)
   public admin: User;