Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/auth/presentation/auth.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,40 @@ import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsOptional } from 'class-validator';
import { UserDto } from './user.dto';
import { CrudGroup } from '../../common/validation/validation.data';
import { Expose } from "class-transformer";

export class AuthDto extends UserDto {
@ApiProperty({
description: 'Access Token',
type: String,
})
@IsOptional()
accessToken?: string;
private _accessToken?: string;

@ApiProperty({
description: 'Refresh Token',
type: String,
})
@IsOptional()
refreshToken?: string;
private _refreshToken?: string;

@Expose()
get accessToken(): string | undefined {
return this._accessToken;
}

set accessToken(value: string) {
this._accessToken = value;
}

@Expose()
get refreshToken(): string | undefined {
return this._refreshToken;
}

set refreshToken(value: string) {
this._refreshToken = value;
}
}

export interface OtpRequest {
Expand Down
100 changes: 91 additions & 9 deletions src/auth/presentation/user.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Builder } from 'builder-pattern';
import { IsIn, IsNotEmpty, IsOptional } from 'class-validator';
import { CrudGroup } from '../../common/validation/validation.data';
import { Customer } from '../../customer/customer.domain';
import { Expose } from "class-transformer";

// ๊ณ ๊ฐ, ์—…์ฒด, ๊ธฐ์‚ฌ ๊ณตํ†ต ์‚ฌ์šฉ DTO
export type UserType = 'customer' | 'driver' | 'business';
Expand All @@ -24,7 +25,7 @@ export class UserDto {
description: '์ธ์ฆ ์ œ๊ณต์ž ํƒ€์ž…',
required: true,
})
authProvider?: AuthProvider;
protected _authProvider?: AuthProvider;

@ApiProperty({
description: '์‚ฌ์šฉ์ž๊ฐ€ ๊ณ ๊ฐ์ธ์ง€, ๊ธฐ์‚ฌ์ธ์ง€, ์—…์ฒด์ธ์ง€ ํ™•์ธํ•˜๋Š” ํƒ€์ž…์ž…๋‹ˆ๋‹ค.',
Expand All @@ -33,7 +34,7 @@ export class UserDto {
@IsIn(['customer', 'driver', 'business'], { groups: [UserGroup.login] })
@IsOptional()
@IsNotEmpty({ groups: [UserGroup.login] })
userType?: UserType;
protected _userType?: UserType;

@ApiProperty({
description:
Expand All @@ -42,29 +43,110 @@ export class UserDto {
})
@IsNotEmpty({ groups: [CrudGroup.create] })
@IsOptional()
userId?: number;
protected _userId?: number;

@ApiProperty({
description:
'์‚ฌ์šฉ์ž ์ „ํ™”๋ฒˆํ˜ธ์ž…๋‹ˆ๋‹ค. ํ˜„์žฌ๋Š” customer, business์—์„œ๋งŒ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.',
required: false,
})
phoneNumber?: string;
protected _phoneNumber?: string;

@ApiProperty({
description: '์‚ฌ์šฉ์ž UUID์ž…๋‹ˆ๋‹ค.',
required: false,
})
uuid?: string;
protected _uuid?: string;

@ApiProperty({
description: '์‚ฌ์šฉ์ž ์ด๋ฆ„์ž…๋‹ˆ๋‹ค.',
})
name?: string;
protected _name?: string;

customerId?: number;
driverId?: number;
businessId?: number;
protected _customerId?: number;
protected _driverId?: number;
protected _businessId?: number;

@Expose()
get authProvider(): AuthProvider | undefined {
return this._authProvider;
}

set authProvider(value: AuthProvider) {
this._authProvider = value;
}

@Expose()
get userType(): UserType | undefined {
return this._userType;
}

set userType(value: UserType) {
this._userType = value;
}

@Expose()
get userId(): number | undefined {
return this._userId;
}

set userId(value: number) {
this._userId = value;
}

@Expose()
get phoneNumber(): string | undefined {
return this._phoneNumber;
}

set phoneNumber(value: string | undefined) {
this._phoneNumber = value;
}

@Expose()
get uuid(): string | undefined {
return this._uuid;
}

set uuid(value: string) {
this._uuid = value;
}

@Expose()
get name(): string | undefined {
return this._name;
}

set name(value: string) {
this._name = value;
}

@Expose()
get customerId(): number | undefined {
return this._customerId;
}

set customerId(value: number) {
this._customerId = value;
}

@Expose()
get driverId(): number | undefined {
return this._driverId;
}

set driverId(value: number) {
this._driverId = value;
}

@Expose()
get businessId(): number | undefined {
return this._businessId;
}

set businessId(value: number) {
this._businessId = value;
}

static from(customer: Customer): UserDto {
return Builder(UserDto)
Expand Down
2 changes: 1 addition & 1 deletion src/customer/customer.domain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { IDateHolder } from '../common/holder/date.holder';
import { PresignedUrlDto } from '../common/cloud/aws/s3/presentation/presigned-url.dto';
import { ImageDto } from '../common/image/presentation/image.dto';

export interface ICustomer extends AuthDto {
export interface ICustomer extends AuthDto { // TODO: ๋„๋ฉ”์ธ์ด dto implement ์ค‘ (getter ๊ฐ€์ ธ์˜ค๊ณ  ์žˆ์Œ)
customerId?: number;
customerName: string;
customerPhoneNumber?: string;
Expand Down
Loading