From a59dd4d114de92ac108e826dbdecb04f1cb8e165 Mon Sep 17 00:00:00 2001 From: KimSangwoo1259 Date: Tue, 11 Jun 2024 23:22:33 +0900 Subject: [PATCH 1/2] =?UTF-8?q?bug:=20#168=20=EC=9E=98=EB=AA=BB=EB=90=9C?= =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/sabujak/member/service/MemberService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/sabujak/member/service/MemberService.java b/src/main/java/com/example/sabujak/member/service/MemberService.java index 30edf0f..68999c3 100644 --- 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); From 07c6c91a75be56789c7c665c8086b9428e21683d Mon Sep 17 00:00:00 2001 From: KimSangwoo1259 Date: Wed, 12 Jun 2024 00:01:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20#168=20memberModalIgnoredTime?= =?UTF-8?q?=20=EC=9D=B4=20null=20=EB=A1=9C=20=EB=93=A4=EC=96=B4=EA=B0=80?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/sabujak/member/entity/Member.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/example/sabujak/member/entity/Member.java b/src/main/java/com/example/sabujak/member/entity/Member.java index a82769a..a5c5e0e 100644 --- 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() {