From 20ada0c3456b00c413143dec879364ddb65928c8 Mon Sep 17 00:00:00 2001 From: Invidam Date: Sun, 17 Mar 2024 19:16:18 +0900 Subject: [PATCH 1/5] =?UTF-8?q?style:=20=EC=BB=A8=EB=B2=A4=EC=85=98?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../in/service/OwnerServiceImpl.java | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/main/java/koreatech/in/service/OwnerServiceImpl.java b/src/main/java/koreatech/in/service/OwnerServiceImpl.java index 06526147..ab502cd2 100644 --- a/src/main/java/koreatech/in/service/OwnerServiceImpl.java +++ b/src/main/java/koreatech/in/service/OwnerServiceImpl.java @@ -1,6 +1,20 @@ package koreatech.in.service; +import static koreatech.in.domain.Mail.MailForm.OWNER_FIND_PASSWORD_MAIL_FORM; +import static koreatech.in.domain.Mail.MailForm.OWNER_REGISTRATION_MAIL_FORM; +import static koreatech.in.domain.RedisOwnerKeyPrefix.ownerAuthPrefix; +import static koreatech.in.domain.RedisOwnerKeyPrefix.ownerChangePasswordAuthPrefix; + import java.sql.SQLException; + +import org.apache.velocity.app.VelocityEngine; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.mysql.jdbc.exceptions.MySQLIntegrityConstraintViolationException; + import koreatech.in.domain.User.EmailAddress; import koreatech.in.domain.User.User; import koreatech.in.domain.User.owner.CertificationCode; @@ -26,15 +40,6 @@ import koreatech.in.util.SesMailSender; import koreatech.in.util.SlackNotiSender; import koreatech.in.util.StringRedisUtilObj; -import org.apache.velocity.app.VelocityEngine; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import static koreatech.in.domain.Mail.MailForm.*; - -import static koreatech.in.domain.RedisOwnerKeyPrefix.*; @Service public class OwnerServiceImpl implements OwnerService { @@ -90,19 +95,22 @@ public void inputPasswordToChangePassword(OwnerChangePasswordRequest ownerChange public void certificateToChangePassword(VerifyCodeRequest verifyCodeRequest) { OwnerInCertification ownerInCertification = OwnerConverter.INSTANCE.toOwnerInCertification(verifyCodeRequest); - redisOwnerMapper.changeAuthStatus(ownerInCertification, ownerInCertification.getEmail(), ownerChangePasswordAuthPrefix); + redisOwnerMapper.changeAuthStatus(ownerInCertification, ownerInCertification.getEmail(), + ownerChangePasswordAuthPrefix); } public void requestVerificationToChangePassword(VerifyEmailRequest verifyEmailRequest) { EmailAddress emailAddress = OwnerConverter.INSTANCE.toEmailAddress(verifyEmailRequest); validateEmailFromOwner(emailAddress); - CertificationCode certificationCode = mailService.sendMailWithTimes(emailAddress, OWNER_FIND_PASSWORD_MAIL_FORM); + CertificationCode certificationCode = mailService.sendMailWithTimes(emailAddress, + OWNER_FIND_PASSWORD_MAIL_FORM); OwnerInVerification ownerInVerification = OwnerInVerification.of(certificationCode, emailAddress); emailAddress.validateSendable(); - redisOwnerMapper.putRedisFor(ownerChangePasswordAuthPrefix.getKey(emailAddress.getEmailAddress()), ownerInVerification); + redisOwnerMapper.putRedisFor(ownerChangePasswordAuthPrefix.getKey(emailAddress.getEmailAddress()), + ownerInVerification); slackNotiSender.noticeEmailVerification(ownerInVerification); } @@ -112,7 +120,7 @@ private Owner validateEmailFromOwner(EmailAddress emailAddress) { if (user == null || user.isStudent()) { throw new BaseException(ExceptionInformation.NOT_EXIST_EMAIL); } - return (Owner) user; + return (Owner)user; } @Override @@ -224,7 +232,7 @@ private static OwnerAttachments ownerAttachmentsFillWithOwnerId(Owner owner) { } private OwnerAttachments updateAttachment(OwnerAttachments ownerAttachments, - OwnerAttachments ownerAttachmentsInDB) { + OwnerAttachments ownerAttachmentsInDB) { OwnerAttachments result = ownerAttachmentsInDB.intersectionWith(ownerAttachments); OwnerAttachments toAdd = ownerAttachments.removeDuplicatesFrom(ownerAttachmentsInDB); @@ -281,7 +289,8 @@ private void validateOwnerIdUniqueness(int id) { private void putRedisForRequestShop(OwnerShop ownerShop) { try { - stringRedisUtilObj.setDataAsString(StringRedisUtilObj.makeOwnerShopKeyFor(ownerShop.getOwner_id()), ownerShop); + stringRedisUtilObj.setDataAsString(StringRedisUtilObj.makeOwnerShopKeyFor(ownerShop.getOwner_id()), + ownerShop); } catch (Exception exception) { throw new RuntimeException(exception); } From 9e798e33a1a8e64cc499a79e031af58652056b19 Mon Sep 17 00:00:00 2001 From: Invidam Date: Sun, 17 Mar 2024 19:16:33 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EC=98=88=EC=99=B8=20=ED=9B=84=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/koreatech/in/service/OwnerServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/koreatech/in/service/OwnerServiceImpl.java b/src/main/java/koreatech/in/service/OwnerServiceImpl.java index ab502cd2..102545e8 100644 --- a/src/main/java/koreatech/in/service/OwnerServiceImpl.java +++ b/src/main/java/koreatech/in/service/OwnerServiceImpl.java @@ -311,6 +311,9 @@ private void createInDBFor(Owner owner) { if (owner.hasRegistrationInformation()) { ownerMapper.insertOwnerAttachments(ownerAttachmentsFillWithOwnerId(owner)); } + } catch (MySQLIntegrityConstraintViolationException e + ) { + throw new BaseException(ExceptionInformation.EMAIL_DUPLICATED); } catch (SQLException e) { throw new RuntimeException(e); } From 1e361a48aa60a2e3ce0eb2ab1f954a775231b2da Mon Sep 17 00:00:00 2001 From: Invidam Date: Sun, 17 Mar 2024 22:54:02 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20spring=EC=97=90=EC=84=9C=20=EB=9E=98?= =?UTF-8?q?=ED=95=91=ED=95=9C=20=EC=98=88=EC=99=B8=EB=A5=BC=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/koreatech/in/service/OwnerServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/koreatech/in/service/OwnerServiceImpl.java b/src/main/java/koreatech/in/service/OwnerServiceImpl.java index 102545e8..979cb85d 100644 --- a/src/main/java/koreatech/in/service/OwnerServiceImpl.java +++ b/src/main/java/koreatech/in/service/OwnerServiceImpl.java @@ -9,12 +9,11 @@ import org.apache.velocity.app.VelocityEngine; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.mysql.jdbc.exceptions.MySQLIntegrityConstraintViolationException; - import koreatech.in.domain.User.EmailAddress; import koreatech.in.domain.User.User; import koreatech.in.domain.User.owner.CertificationCode; @@ -154,7 +153,7 @@ public void register(OwnerRegisterRequest ownerRegisterRequest) { validateEmailUniqueness(ownerEmailAddress); validateCompanyRegistrationNumberUniqueness(owner.getCompany_registration_number()); - redisOwnerMapper.validateOwner(ownerEmailAddress, ownerAuthPrefix); + // redisOwnerMapper.validateOwner(ownerEmailAddress, ownerAuthPrefix); encodePassword(owner); @@ -162,7 +161,7 @@ public void register(OwnerRegisterRequest ownerRegisterRequest) { slackNotiSender.noticeRegisterComplete(owner); - redisOwnerMapper.removeRedisFrom(ownerEmailAddress, ownerAuthPrefix); + // redisOwnerMapper.removeRedisFrom(ownerEmailAddress, ownerAuthPrefix); } @Override @@ -311,7 +310,7 @@ private void createInDBFor(Owner owner) { if (owner.hasRegistrationInformation()) { ownerMapper.insertOwnerAttachments(ownerAttachmentsFillWithOwnerId(owner)); } - } catch (MySQLIntegrityConstraintViolationException e + } catch (DuplicateKeyException e ) { throw new BaseException(ExceptionInformation.EMAIL_DUPLICATED); } catch (SQLException e) { From a017357ec5379d5c1a6df53d851adc82558a37bf Mon Sep 17 00:00:00 2001 From: Invidam Date: Sun, 17 Mar 2024 23:13:09 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=20=EB=8B=AB=EC=95=84=EB=86=A8=EB=8D=98=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/koreatech/in/service/OwnerServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/koreatech/in/service/OwnerServiceImpl.java b/src/main/java/koreatech/in/service/OwnerServiceImpl.java index 979cb85d..2cefddd8 100644 --- a/src/main/java/koreatech/in/service/OwnerServiceImpl.java +++ b/src/main/java/koreatech/in/service/OwnerServiceImpl.java @@ -153,7 +153,7 @@ public void register(OwnerRegisterRequest ownerRegisterRequest) { validateEmailUniqueness(ownerEmailAddress); validateCompanyRegistrationNumberUniqueness(owner.getCompany_registration_number()); - // redisOwnerMapper.validateOwner(ownerEmailAddress, ownerAuthPrefix); + redisOwnerMapper.validateOwner(ownerEmailAddress, ownerAuthPrefix); encodePassword(owner); @@ -161,7 +161,7 @@ public void register(OwnerRegisterRequest ownerRegisterRequest) { slackNotiSender.noticeRegisterComplete(owner); - // redisOwnerMapper.removeRedisFrom(ownerEmailAddress, ownerAuthPrefix); + redisOwnerMapper.removeRedisFrom(ownerEmailAddress, ownerAuthPrefix); } @Override From b6ea4b5adaee9e747a128c5e8cd97ac912b27821 Mon Sep 17 00:00:00 2001 From: Invidam Date: Mon, 18 Mar 2024 14:20:34 +0900 Subject: [PATCH 5/5] =?UTF-8?q?style:=20=EB=9D=BC=EC=9D=B8=20=ED=8F=AC?= =?UTF-8?q?=EB=A7=B7=ED=8C=85=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/koreatech/in/service/OwnerServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/koreatech/in/service/OwnerServiceImpl.java b/src/main/java/koreatech/in/service/OwnerServiceImpl.java index 2cefddd8..2f151f29 100644 --- a/src/main/java/koreatech/in/service/OwnerServiceImpl.java +++ b/src/main/java/koreatech/in/service/OwnerServiceImpl.java @@ -310,8 +310,7 @@ private void createInDBFor(Owner owner) { if (owner.hasRegistrationInformation()) { ownerMapper.insertOwnerAttachments(ownerAttachmentsFillWithOwnerId(owner)); } - } catch (DuplicateKeyException e - ) { + } catch (DuplicateKeyException e) { throw new BaseException(ExceptionInformation.EMAIL_DUPLICATED); } catch (SQLException e) { throw new RuntimeException(e);