From c710d940c35cda3d369139dae46204914caefef3 Mon Sep 17 00:00:00 2001 From: net79736 <34103253+net79736@users.noreply.github.com> Date: Mon, 13 Jan 2025 04:09:37 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EA=B4=80=EB=A0=A8=20DTO=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificationController.java | 9 +++++---- .../dto/CertificationCertifyRequest.java | 13 +++++++++++++ .../dto/CertificationEmailRequest.java | 3 --- 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 src/main/java/org/myteam/server/common/certification/dto/CertificationCertifyRequest.java diff --git a/src/main/java/org/myteam/server/common/certification/controller/CertificationController.java b/src/main/java/org/myteam/server/common/certification/controller/CertificationController.java index 586b7c0a..59388578 100644 --- a/src/main/java/org/myteam/server/common/certification/controller/CertificationController.java +++ b/src/main/java/org/myteam/server/common/certification/controller/CertificationController.java @@ -3,6 +3,7 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.myteam.server.common.certification.dto.CertificationCertifyRequest; import org.myteam.server.common.certification.dto.CertificationEmailRequest; import org.myteam.server.common.certification.service.CertificationService; import org.myteam.server.global.exception.PlayHiveException; @@ -28,14 +29,14 @@ public class CertificationController { @PostMapping("/send") public ResponseEntity sendCertificationEmail(@Valid @RequestBody CertificationEmailRequest certificationEmailRequest, BindingResult bindingResult) { log.info("send-certification email: {}", certificationEmailRequest.getEmail()); - certificationService.send(certificationEmailRequest.getEmail()); + certificationService.send(certificationEmailRequest.getEmail()); return new ResponseEntity<>(new ResponseDto<>(SUCCESS.name(), "인증 코드 이메일 전송 성공", null), HttpStatus.OK); } @PostMapping("/certify-code") - public ResponseEntity certifyCode(@Valid @RequestBody CertificationEmailRequest certificationEmailRequest, BindingResult bindingResult) { - String code = certificationEmailRequest.getCode(); // 인증 코드 - String email = certificationEmailRequest.getEmail(); // 이메일 + public ResponseEntity certifyCode(@Valid @RequestBody CertificationCertifyRequest certificationCertifyRequest, BindingResult bindingResult) { + String code = certificationCertifyRequest.getCode(); // 인증 코드 + String email = certificationCertifyRequest.getEmail(); // 이메일 boolean isValid = certificationService.certify(email, code); if (isValid) { diff --git a/src/main/java/org/myteam/server/common/certification/dto/CertificationCertifyRequest.java b/src/main/java/org/myteam/server/common/certification/dto/CertificationCertifyRequest.java new file mode 100644 index 00000000..7582139d --- /dev/null +++ b/src/main/java/org/myteam/server/common/certification/dto/CertificationCertifyRequest.java @@ -0,0 +1,13 @@ +package org.myteam.server.common.certification.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Getter; + +@Getter +public class CertificationCertifyRequest { + @Pattern(regexp = "^[a-zA-Z가-힣]{1,20}$", message = "한글/영문 1~20자 이내로 작성해주세요") + private String email; + @NotBlank + private String code; +} diff --git a/src/main/java/org/myteam/server/common/certification/dto/CertificationEmailRequest.java b/src/main/java/org/myteam/server/common/certification/dto/CertificationEmailRequest.java index 8f9491c0..3e903799 100644 --- a/src/main/java/org/myteam/server/common/certification/dto/CertificationEmailRequest.java +++ b/src/main/java/org/myteam/server/common/certification/dto/CertificationEmailRequest.java @@ -1,6 +1,5 @@ package org.myteam.server.common.certification.dto; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Getter; @@ -8,6 +7,4 @@ public class CertificationEmailRequest { @Pattern(regexp = "^[a-zA-Z가-힣]{1,20}$", message = "한글/영문 1~20자 이내로 작성해주세요") private String email; - @NotBlank - private String code; }