Merge pull request #187 from prgrms-web-devcourse-final-project/fix/user-admin

Fix: BaseEntity Activated 수정

Author: endorsement0912

src/main/java/grep/neogul_coder/domain/admin/controller/dto/response/AdminRecruitmentPostResponse.java

@@ -29,7 +29,7 @@ public static AdminRecruitmentPostResponse from(RecruitmentPost post) {
             .id(post.getId())
             .subject(post.getSubject())
             .expiredDate(post.getExpiredDate())
-            .activated(post.getActivated())
+            .activated(post.isActivated())
             .build();
     }
 

src/main/java/grep/neogul_coder/domain/admin/controller/dto/response/AdminStudyResponse.java

@@ -43,7 +43,7 @@ public static AdminStudyResponse from(Study study) {
             .name(study.getName())
             .category(study.getCategory())
             .isFinished(study.isFinished())
-            .activated(study.getActivated())
+            .activated(study.isActivated())
             .build();
     }
 

src/main/java/grep/neogul_coder/domain/admin/controller/dto/response/AdminUserResponse.java

@@ -34,7 +34,7 @@ public static AdminUserResponse from(User user) {
             user.getId(),
             user.getEmail(),
             user.getNickname(),
-            user.getActivated()
+            user.isActivated()
         );
     }
 

src/main/java/grep/neogul_coder/domain/admin/service/AdminService.java

@@ -3,6 +3,7 @@
 import grep.neogul_coder.domain.admin.controller.dto.response.AdminRecruitmentPostResponse;
 import grep.neogul_coder.domain.admin.controller.dto.response.AdminStudyResponse;
 import grep.neogul_coder.domain.admin.controller.dto.response.AdminUserResponse;
+import grep.neogul_coder.domain.recruitment.post.RecruitmentPost;
 import grep.neogul_coder.domain.recruitment.post.repository.RecruitmentPostRepository;
 import grep.neogul_coder.domain.study.Study;
 import grep.neogul_coder.domain.study.enums.Category;
@@ -72,7 +73,8 @@ public void deleteStudy(Long studyId) {
 
     @Transactional
     public void deleteRecruitmentPost(Long recruitmentPostId) {
-        recruitmentPostRepository.deleteById(recruitmentPostId);
+        RecruitmentPost recruitmentPost = recruitmentPostRepository.findById(recruitmentPostId).orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+        recruitmentPost.delete();
     }
 
     private Boolean isContainEmail(String email) {

src/main/java/grep/neogul_coder/domain/users/service/EmailVerificationService.java

@@ -2,6 +2,10 @@
 
 import java.time.Duration;
 import java.util.Random;
+
+import grep.neogul_coder.domain.users.exception.EmailDuplicationException;
+import grep.neogul_coder.domain.users.exception.code.UserErrorCode;
+import grep.neogul_coder.domain.users.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.mail.SimpleMailMessage;
@@ -14,10 +18,16 @@ public class EmailVerificationService  {
 
     private final JavaMailSender mailSender;
     private final RedisTemplate<String, Object> redisTemplate;
+    private final UserRepository userRepository;
 
     private static final long CODE_TTL_SECONDS = 300;
 
     public void sendVerificationEmail(String email) {
+
+        if(isDuplicateEmail(email)) {
+            throw new EmailDuplicationException(UserErrorCode.IS_DUPLICATED_MALI);
+        }
+
         String code = generateRandomCode();
 
         sendEmail(email,code);
@@ -68,6 +78,10 @@ private String getVerifiedKey(String email) {
         return "email_verified:" + email;
     }
 
+    private boolean isDuplicateEmail(String email) {
+        return userRepository.findByEmail(email).isPresent();
+    }
+
     private boolean isValidCode(Object storedCode, String inputCode) {
         return storedCode != null && storedCode.equals(inputCode);
     }

src/main/java/grep/neogul_coder/global/auth/service/AuthService.java

@@ -116,7 +116,7 @@ public TokenDto processOAuthSignin(OAuth2UserInfo userInfo, String roles) {
     private boolean isUnactivatedUser(String email) {
         return !usersRepository.findByEmail(email)
             .orElseThrow(() -> new UserNotFoundException(UserErrorCode.USER_NOT_FOUND))
-            .getActivated();
+            .isActivated();
     }
 
     private boolean isGoogleUser(String email) {

src/main/java/grep/neogul_coder/global/entity/BaseEntity.java

@@ -14,7 +14,7 @@
 @EntityListeners(AuditingEntityListener.class)
 public class BaseEntity {
 
-    protected Boolean activated = true;
+    protected boolean activated = true;
 
     @CreatedDate
     protected LocalDateTime createdDate = LocalDateTime.now();