Skip to content

Commit

Permalink
Merge branch 'feat/#28-verification-code-to-phone' into feat/#44-veri…
Browse files Browse the repository at this point in the history
…fy-phone-number

# Conflicts:
#	be/src/main/java/yeonba/be/login/controller/LoginController.java
#	be/src/main/java/yeonba/be/login/service/LoginService.java
  • Loading branch information
Minjae-An committed Mar 27, 2024
2 parents 8c44668 + fb8c56f commit f5256d4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package yeonba.be.login.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -16,6 +17,7 @@ public class UserEmailInquiryRequest {
@Pattern(
regexp = "^010\\d{8}$",
message = "전화번호는 11자리 010으로 시작하며 하이픈(-) 없이 0~9의 숫자로 이뤄져야 합니다.")
@NotBlank(message = "전화번호는 반드시 입력되어야 합니다.")
private String phoneNumber;

@Schema(
Expand All @@ -25,5 +27,6 @@ public class UserEmailInquiryRequest {
@Pattern(
regexp = "^[A-Za-z0-9]{6}$",
message = "인증 코드는 6자리로 영어대소문자, 숫자로만 이뤄져야 합니다.")
@NotBlank(message = "인증 코드는 반드시 입력되어야 합니다.")
private String verificationCode;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package yeonba.be.login.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -16,5 +17,6 @@ public class UserVerificationCodeRequest {
@Pattern(
regexp = "^010\\d{8}$",
message = "전화번호는 11자리 010으로 시작하며 하이픈(-) 없이 0~9의 숫자로 이뤄져야 합니다.")
@NotBlank(message = "전화번호는 반드시 입력되어야 합니다.")
private String phoneNumber;
}
2 changes: 2 additions & 0 deletions be/src/main/java/yeonba/be/login/entity/VerificationCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import java.time.LocalDateTime;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Table(name = "verification_codes")
@Getter
@Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED)
Expand Down

0 comments on commit f5256d4

Please sign in to comment.