Skip to content

Commit 8694894

Browse files
authored
Merge pull request #121 from Nexters/feature-120
Feature 120
2 parents f7de6cc + 4d7402b commit 8694894

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/main/java/donmani/donmani_server/feedback/repository/FeedbackRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ public interface FeedbackRepository extends JpaRepository<Feedback, Long> {
2727
List<Feedback> findFeedbackByIsOpenedOrderByCreatedDateDesc(Long userId);
2828

2929
Optional<Feedback> findFirstByUserAndIsOpenedFalseOrderByCreatedDateDesc(User user);
30-
30+
List<Feedback> findFeedbacksByUserId(Long userId);
3131
}

src/main/java/donmani/donmani_server/feedback/service/FeedbackService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ public void addFeedback(ExpenseRequestDTO requestDTO) {
5151
LocalDateTime createdAt = requestDTO.getRecords().get(0).getDate().atStartOfDay(); // 실제 생성일자말고 사용자가 기록하려는 일자
5252
LocalDateTime baseTime = LocalDateTime.of(2025, 5, 26, 0, 0); // 2025-05-30 00:00
5353

54-
if (createdAt.isEqual(baseTime) || createdAt.isAfter(baseTime)) {
54+
// 획득한 피드백 카드가 12개 이상 -> 피드백 카드를 생성하지 않음
55+
List<Feedback> feedbacks = feedbackRepository.findFeedbacksByUserId(user.getId());
56+
57+
if (feedbacks.size() < 12 && (createdAt.isEqual(baseTime) || createdAt.isAfter(baseTime))) {
5558
Expense expense = expenseRepository.findExpenseByUserIdAndAndCreatedAt(user.getId(), createdAt);
5659

5760
// GOOD, BAD 일 경우 feedback 생성

0 commit comments

Comments
 (0)