-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
225 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberCommonJoinResponseDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package com.tikitaka.naechinso.domain.member.dto; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.tikitaka.naechinso.domain.member.constant.Gender; | ||
| import com.tikitaka.naechinso.domain.member.entity.Member; | ||
| import com.tikitaka.naechinso.global.annotation.Enum; | ||
| import com.tikitaka.naechinso.global.common.response.TokenResponseDTO; | ||
| import io.swagger.annotations.ApiModelProperty; | ||
| import lombok.*; | ||
|
|
||
| import javax.validation.constraints.*; | ||
|
|
||
| /** | ||
| * 임시회원의 가입 정보를 리턴하는 DTO 입니다 | ||
| * @author gengminy 221006 | ||
| * */ | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Builder | ||
| @ToString | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) //NULL 필드 가림 | ||
| public class MemberCommonJoinResponseDTO { | ||
|
|
||
| private String phone; | ||
| private String name; | ||
| private Gender gender; | ||
| private int age; | ||
|
|
||
| private String accessToken; | ||
| private String refreshToken; | ||
|
|
||
| public static MemberCommonJoinResponseDTO of(Member member, TokenResponseDTO tokenDTO) { | ||
| return MemberCommonJoinResponseDTO.builder() | ||
| .phone(member.getPhone()) | ||
| .name(member.getName()) | ||
| .gender(member.getGender()) | ||
| .age(member.getAge()) | ||
| .accessToken(tokenDTO.getAccessToken()) | ||
| .refreshToken(tokenDTO.getRefreshToken()) | ||
| .build(); | ||
| } | ||
|
|
||
| public static MemberCommonJoinResponseDTO of(Member member) { | ||
| return MemberCommonJoinResponseDTO.builder() | ||
| .phone(member.getPhone()) | ||
| .name(member.getName()) | ||
| .gender(member.getGender()) | ||
| .age(member.getAge()) | ||
| .build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberUpdateCommonRequestDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package com.tikitaka.naechinso.domain.member.dto; | ||
|
|
||
| import com.tikitaka.naechinso.domain.member.constant.Gender; | ||
| import com.tikitaka.naechinso.global.annotation.Enum; | ||
| import io.swagger.annotations.ApiModelProperty; | ||
| import lombok.*; | ||
|
|
||
| import javax.validation.constraints.Max; | ||
| import javax.validation.constraints.Min; | ||
| import javax.validation.constraints.NotBlank; | ||
|
|
||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Builder | ||
| @ToString | ||
| public class MemberUpdateCommonRequestDTO { | ||
| @ApiModelProperty(example = "닉") | ||
| @NotBlank(message = "이름을 입력해주세요") | ||
| private String name; | ||
|
|
||
| @ApiModelProperty(example = "M") | ||
| @Enum(enumClass = Gender.class, message = "성별 입력이 올바르지 않습니다. M 또는 W가 필요합니다") | ||
| private Gender gender; | ||
|
|
||
| @ApiModelProperty(example = "25") | ||
| @Min(value = 25, message = "25-33세까지만 가입 가능합니다") | ||
| @Max(value = 33, message = "25-33세까지만 가입 가능합니다") | ||
| private int age; | ||
| } |
Oops, something went wrong.