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 eec337b..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 date = LocalDateTime.now(); + 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 98a0bc3..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,7 +12,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; import java.time.LocalDateTime; @Service @@ -29,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; 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;