From 77e622284bc25f168a5ad75deaf13c059895f093 Mon Sep 17 00:00:00 2001 From: Geonhee Min Date: Thu, 13 Nov 2025 00:18:16 +0000 Subject: [PATCH] =?UTF-8?q?issue=20#=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20api=20=EA=B5=AC=ED=98=84=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduler/config/MailConfig.java | 2 +- .../scheduler/entity/user/UserEntity.java | 19 +++++++++++------- .../scheduler/request/user/UserRequest.java | 3 +-- .../scheduler/service/user/UserService.java | 4 ++-- .../utils/validation/UserValidation.java | 2 +- .../resources/application-local.properties | 16 ++++++++++++++- .../resources/application-prod.properties | 20 +++++++++++++++++++ 7 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/baekyangdan/scheduler/config/MailConfig.java b/src/main/java/com/baekyangdan/scheduler/config/MailConfig.java index 5fb3c5b..0811aa9 100644 --- a/src/main/java/com/baekyangdan/scheduler/config/MailConfig.java +++ b/src/main/java/com/baekyangdan/scheduler/config/MailConfig.java @@ -17,6 +17,6 @@ public class MailConfig { @Value("${spring.mail.clientSecret}") private String clientSecret; - @Value("${spring.mail.refershToken}") + @Value("${spring.mail.refreshToken}") private String refreshToken; } \ No newline at end of file diff --git a/src/main/java/com/baekyangdan/scheduler/entity/user/UserEntity.java b/src/main/java/com/baekyangdan/scheduler/entity/user/UserEntity.java index 6d5c2ed..14358fc 100644 --- a/src/main/java/com/baekyangdan/scheduler/entity/user/UserEntity.java +++ b/src/main/java/com/baekyangdan/scheduler/entity/user/UserEntity.java @@ -3,7 +3,6 @@ package com.baekyangdan.scheduler.entity.user; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.CreationTimestamp; - import com.baekyangdan.scheduler.code.user.UserStatus; import java.time.LocalDateTime; @@ -19,14 +18,19 @@ import java.util.UUID; @Builder @Entity @Table( - name = "USER", + name = "account", indexes = @Index(name = "user_pk", columnList = "id") ) public class UserEntity { @Id + @GeneratedValue + @org.hibernate.annotations.UuidGenerator @Column(nullable = false) - private String id; + private UUID id; + + @Column(nullable=false, length=50) + private String accountId; @Column(nullable = false, length = 50) private String name; @@ -34,8 +38,9 @@ public class UserEntity { @Column(nullable = false, length = 100) private String email; + @Builder.Default @Column(nullable = false) - private Boolean isDeleted; + private boolean isDeleted = false; @Column(nullable = false) private String password; @@ -46,9 +51,9 @@ public class UserEntity { @Column private LocalDateTime birthday; - @Enumerated(EnumType.STRING) - @Column(columnDefinition = "user_status") - private UserStatus status; + @Builder.Default + @Column + private String status = UserStatus.WAIT.getValue(); @CreationTimestamp @Column(updatable = false) diff --git a/src/main/java/com/baekyangdan/scheduler/request/user/UserRequest.java b/src/main/java/com/baekyangdan/scheduler/request/user/UserRequest.java index 85e8109..8158a33 100644 --- a/src/main/java/com/baekyangdan/scheduler/request/user/UserRequest.java +++ b/src/main/java/com/baekyangdan/scheduler/request/user/UserRequest.java @@ -31,12 +31,11 @@ public class UserRequest { @Getter @Setter public static class SignUp { - private String id; + private String accountId; private String email; private String name; private String nickname; private String password; - private String passwordResetCode; } // 2. 로그인 diff --git a/src/main/java/com/baekyangdan/scheduler/service/user/UserService.java b/src/main/java/com/baekyangdan/scheduler/service/user/UserService.java index 74dcb89..1d2026b 100644 --- a/src/main/java/com/baekyangdan/scheduler/service/user/UserService.java +++ b/src/main/java/com/baekyangdan/scheduler/service/user/UserService.java @@ -1,5 +1,6 @@ package com.baekyangdan.scheduler.service.user; +import com.baekyangdan.scheduler.code.user.UserStatus; import com.baekyangdan.scheduler.entity.user.UserEntity; import com.baekyangdan.scheduler.repository.user.UserRepository; import com.baekyangdan.scheduler.request.user.UserRequest; @@ -32,14 +33,13 @@ public class UserService { // 3. data 를 UserEntity 형식으로 build UserEntity user = UserEntity .builder() - .id(data.getId()) + .accountId(data.getAccountId()) .email(data.getEmail()) .name(data.getName()) .nickname(data.getNickname()) .password(encodedPassword) .createdAt(LocalDateTime.now()) .build(); - // 4. build 된 entity를 UserRepository.save 로 DB에 저장 return userRepository.save(user); } diff --git a/src/main/java/com/baekyangdan/scheduler/utils/validation/UserValidation.java b/src/main/java/com/baekyangdan/scheduler/utils/validation/UserValidation.java index b9053dc..0b5ed33 100644 --- a/src/main/java/com/baekyangdan/scheduler/utils/validation/UserValidation.java +++ b/src/main/java/com/baekyangdan/scheduler/utils/validation/UserValidation.java @@ -11,7 +11,7 @@ public class UserValidation extends BaseValidation { public static boolean validateSignUpForm(UserRequest.SignUp data) throws Exception { - if (validateStringEmpty(data.getId())) { + if (validateStringEmpty(data.getAccountId())) { throw new Exception(SignUpValidationCode.ID_EMPTY.getMessage()); } diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index daa76b4..1f8e930 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -3,4 +3,18 @@ spring.datasource.username=baekyangdan spring.datasource.password=qwas745478! spring.datasource.driver-class-name=org.postgresql.Driver spring.devtools.restart.enabled=true -spring.devtools.livereload.enabled=true \ No newline at end of file +spring.devtools.livereload.enabled=true + +spring.mail.host=smtp.google.com +spring.mail.port=587 +spring.mail.username=bkd.scheduler@gmail.com +spring.mail.protocol=smtp + +spring.mail.clientId=688417162908-iqvnj4ceb8t1dkbjr70dtcafo27m8kqe.apps.googleusercontent.com +spring.mail.clientSecret=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 +spring.mail.refreshToken=1//04_pSivNoGpPUCgYIARAAGAQSNwF-L9IrO0Kx6jSzq_eQNjdl65f0O2iqKSNpFeZ3gtIGMhOk0oiZsnKrPfWs8jvuEic1NhUoZ0g + +spring.mail.properties.mail.smtp.auth=true +spring.mail.properties.mail.smtp.starttls.enable=true +spring.mail.properties.mail.smtp.starttls.required=true +spring.mail.properties.mail.smtp.auth.mechanisms=XOAUTH2 \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index e69de29..0195a19 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,20 @@ +spring.datasource.url=jdbc:postgresql://bkdhome.p-e.kr:15454/scheduler +spring.datasource.username=baekyangdan +spring.datasource.password=qwas745478! +spring.datasource.driver-class-name=org.postgresql.Driver +spring.devtools.restart.enabled=true +spring.devtools.livereload.enabled=true + +spring.mail.host=smtp.google.com +spring.mail.port=587 +spring.mail.username=bkd.scheduler@gmail.com +spring.mail.protocol=smtp + +spring.mail.clientId=688417162908-iqvnj4ceb8t1dkbjr70dtcafo27m8kqe.apps.googleusercontent.com +spring.mail.clientSecret=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 +spring.mail.refreshToken=1//04_pSivNoGpPUCgYIARAAGAQSNwF-L9IrO0Kx6jSzq_eQNjdl65f0O2iqKSNpFeZ3gtIGMhOk0oiZsnKrPfWs8jvuEic1NhUoZ0g + +spring.mail.properties.mail.smtp.auth=true +spring.mail.properties.mail.smtp.starttls.enable=true +spring.mail.properties.mail.smtp.starttls.required=true +spring.mail.properties.mail.smtp.auth.mechanisms=XOAUTH2 \ No newline at end of file