From cb7145e58eb8ab67155c2bdd54c4ea2f3d993e94 Mon Sep 17 00:00:00 2001 From: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Sun, 12 Jan 2025 08:19:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20Comment=20?= =?UTF-8?q?date=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/example/Midnight/Snacker/domain/Comment.java | 2 +- .../Snacker/service/CommentService/CommentServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Comment.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Comment.java index 0f3ff7a..1159a05 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Comment.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Comment.java @@ -21,7 +21,7 @@ public class Comment extends BaseEntity { private String content; @Column(nullable = false) - private LocalDateTime createdAt; + private LocalDateTime date; //외래키 이름은 postId로 저장되도록 함. @ManyToOne(fetch = FetchType.LAZY) diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CommentService/CommentServiceImpl.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CommentService/CommentServiceImpl.java index f98b043..d9da71f 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CommentService/CommentServiceImpl.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CommentService/CommentServiceImpl.java @@ -12,6 +12,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; + @Service @RequiredArgsConstructor public class CommentServiceImpl implements CommentService { @@ -26,6 +28,7 @@ public Comment addComment(Member member, long postId, String content) { .content(content) .post(post) .member(member) + .date(LocalDateTime.now()) .build(); commentRepository.save(newComment); return newComment; From 5e3789570f474a6f577c5f5f8c03335e3000a494 Mon Sep 17 00:00:00 2001 From: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Sun, 12 Jan 2025 08:20:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EC=82=AC=EC=A7=84=20=EC=83=89=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Snacker/service/MemberService/MemberServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/MemberService/MemberServiceImpl.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/MemberService/MemberServiceImpl.java index f928196..ce269e5 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/MemberService/MemberServiceImpl.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/MemberService/MemberServiceImpl.java @@ -106,12 +106,12 @@ public MemberResponseDTO.MyPageResponse getMyPageInfo(Member member) { LocalDateTime now = LocalDateTime.now(); - LocalDateTime firstDayOfMonth = now.withDayOfMonth(1); - LocalDateTime lastDayOfMonth = now; + LocalDateTime startOfMonth = now.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0); + LocalDateTime endOfMonth = now.withHour(23).withMinute(59).withSecond(59).withNano(999999999); - int blackCount = calendarRepository.countByMemberAndColorAndDateBetween(member, Color.BLACK, firstDayOfMonth, lastDayOfMonth); + int blackCount = calendarRepository.countByMemberAndColorAndDateBetween(member, Color.BLACK, startOfMonth, endOfMonth); - int totalCount = calendarRepository.countByMemberAndDateBetween(member, firstDayOfMonth, lastDayOfMonth); + int totalCount = calendarRepository.countByMemberAndDateBetween(member, startOfMonth, endOfMonth); float rating = totalCount == 0 ? 0 : ((float) blackCount / totalCount) * 100;