Merge remote-tracking branch 'origin/develop' into develop

4bujak-4bujak · Jun 11, 2024 · 5c0f296 · 5c0f296
2 parents 1df5933 + 34a4360
commit 5c0f296
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/example/sabujak/member/entity/Member.java b/src/main/java/com/example/sabujak/member/entity/Member.java
@@ -11,6 +11,7 @@
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -90,6 +91,9 @@ private Member(String memberEmail, String memberPassword, String memberName, Str
         this.memberJob = memberJob;
         this.memberSmsAgree = memberSmsAgree;
         this.memberNickname = generateRandomNickname();
+        this.memberModalIgnoredTime = LocalDateTime.parse(
+                "2024-06-09 11:11:11.111", 
+                DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
     }
 
     public void signOut() {

diff --git a/src/main/java/com/example/sabujak/member/service/MemberService.java b/src/main/java/com/example/sabujak/member/service/MemberService.java
@@ -102,10 +102,11 @@ public MemberModalIgnoredResponseDto checkModalIgnored(String email){
         final Member member = memberRepository.findByMemberEmail(email)
                 .orElseThrow(() -> new AuthException(ACCOUNT_NOT_EXISTS));
         LocalDateTime now = LocalDateTime.now();
+
         if (member.getMemberModalIgnoredTime() == null)
             return MemberModalIgnoredResponseDto.of(member.getMemberId(), false);
 
-        if (!member.isMemberModalIgnored()){
+        if (member.isMemberModalIgnored()){
             long betweenHours = Duration.between(now, member.getMemberModalIgnoredTime()).toHours();
             if (betweenHours < 24L)
                 return MemberModalIgnoredResponseDto.of(member.getMemberId(), true);