Merge branch 'main' of https://github.com/DevKor-github/BLURTING-back

src/auth/dtos/signupRequest.dto.ts

@@ -0,0 +1,135 @@
+import {
+  IsEmail,
+  IsPhoneNumber,
+  IsString,
+  IsNumber,
+  IsArray,
+  IsEnum,
+  ValidateIf,
+} from 'class-validator';
+import {
+  Sex,
+  SexOrient,
+  Mbti,
+  Degree,
+  Major,
+  University,
+  Character,
+  Hobby,
+  Religion,
+} from 'src/common/enums';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class SignupPhoneRequestDto {
+  @ApiProperty({ example: '01012345678' })
+  @IsPhoneNumber('KR', { message: '올바른 전화번호가 아닙니다.' })
+  phoneNumber: string;
+}
+
+export class SignupEmailRequestDto {
+  @ApiProperty({ example: '[email protected]' })
+  @IsEmail()
+  email: string;
+}
+
+export class SignupUserRequestDto {
+  @ValidateIf((o) => o.IsPhoneNumber !== undefined && o.IsPhoneNumber !== null)
+  @IsPhoneNumber()
+  @ApiProperty({ description: 'phoneNumber' })
+  phoneNumber: string;
+
+  @ValidateIf((o) => o.email !== undefined && o.email !== null)
+  @IsEmail()
+  @ApiProperty({ description: 'email' })
+  email: string;
+
+  @ValidateIf((o) => o.sex !== undefined && o.sex !== null)
+  @IsEnum(Sex)
+  @ApiProperty({ description: 'sex', enum: Sex, enumName: 'Sex' })
+  sex: Sex;
+
+  @ValidateIf((o) => o.sexOrient !== undefined && o.sexOrient !== null)
+  @IsEnum(SexOrient)
+  @ApiProperty({
+    description: 'sexOrient',
+    enum: SexOrient,
+    enumName: 'SexOrient',
+  })
+  sexOrient: SexOrient;
+
+  @ValidateIf((o) => o.region !== undefined && o.region !== null)
+  @IsString()
+  @ApiProperty({ description: 'region' })
+  region: string;
+
+  @ValidateIf((o) => o.religion !== undefined && o.religion !== null)
+  @IsEnum(Religion)
+  @ApiProperty({
+    description: 'religion',
+    enum: Religion,
+    enumName: 'religion',
+  })
+  religion: Religion;
+
+  @ValidateIf((o) => o.drink !== undefined && o.drink !== null)
+  @IsEnum(Degree)
+  @ApiProperty({ description: 'drink', enum: Degree, enumName: 'Degree' })
+  drink: Degree;
+
+  @ValidateIf((o) => o.cigarette !== undefined && o.cigarette !== null)
+  @IsEnum(Degree)
+  @ApiProperty({ description: 'cigarette', enum: Degree, enumName: 'Degree' })
+  cigarette: Degree;
+
+  @ValidateIf((o) => o.height !== undefined && o.height !== null)
+  @IsNumber()
+  @ApiProperty({ description: 'height' })
+  height: number;
+
+  @ValidateIf((o) => o.major !== undefined && o.major !== null)
+  @IsEnum(Major)
+  @ApiProperty({ description: 'major', enum: Major, enumName: 'Major' })
+  major: Major;
+
+  @ValidateIf((o) => o.mbti !== undefined && o.mbti !== null)
+  @IsEnum(Mbti)
+  @ApiProperty({ description: 'mbti', enum: Mbti, enumName: 'Mbti' })
+  mbti: Mbti;
+
+  @ValidateIf((o) => o.character !== undefined && o.character !== null)
+  @IsArray()
+  @IsEnum(Character, { each: true })
+  @ApiProperty({
+    description: 'charater',
+    enum: Character,
+    enumName: 'Character',
+    isArray: true,
+  })
+  character: Character[];
+
+  @ValidateIf((o) => o.hobby !== undefined && o.hobby !== null)
+  @IsArray()
+  @IsEnum(Hobby, { each: true })
+  @ApiProperty({
+    description: 'hobby',
+    enum: Hobby,
+    enumName: 'Hobby',
+    isArray: true,
+  })
+  hobby: Hobby[];
+
+  @ValidateIf((o) => o.university !== undefined && o.university !== null)
+  @IsEnum(University)
+  @ApiProperty({
+    description: 'university',
+    enum: University,
+    enumName: 'University',
+  })
+  university: University;
+
+  @ValidateIf((o) => o.images !== undefined && o.images !== null)
+  @IsArray({ message: 'not valid' })
+  @IsString({ each: true })
+  @ApiProperty({ example: ['s3.asfsva', 'asdfasdf'] })
+  images: string[];
+}

src/point/point.controller.ts

@@ -18,6 +18,7 @@ import {
 } from '@nestjs/swagger';
 import { JwtPayload } from 'src/interfaces/auth';
 import { PointService } from './point.service';
+import { UserService } from 'src/user/user.service';
 import { PointHistoryDto } from 'src/dtos/point.dto';
 import { ReportService } from 'src/report/report.service';
 
@@ -26,6 +27,7 @@ export class PointController {
   constructor(
     private readonly pointService: PointService,
     private readonly reportService: ReportService,
+    private readonly userService: UserService,
   ) {}
 
   @UseGuards(AuthGuard('access'))
@@ -146,7 +148,11 @@ export class PointController {
     try {
       const updatedPoint = await this.pointService.checkNicknamePoint(id);
       if (updatedPoint) {
-        return res.json({ point: updatedPoint.point });
+        const user = await this.userService.findUserByVal('id', id);
+        return res.json({
+          point: updatedPoint.point,
+          nickname: user.userNickname,
+        });
       }
       return res.send(false);
     } catch (err) {

src/point/point.service.ts

@@ -95,7 +95,7 @@ export class PointService {
       const nickname = await this.userService.pickRandomNickname();
       await this.userService.updateUser(userId, 'userNickname', nickname);
       await this.userService.updateUserSocket(userId, 'userNickname', nickname);
-      const history = `닉네임 랜덤 돌리기를 하고 10p가 사용 되었습니다`;
+      const history = `닉네임 뽑기를 하고 10p가 사용 되었습니다.`;
       this.recordPointHistory(userId, -10, history);
     }
     return point;