Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,9 @@ public Integer getTotalExpensesCount(String userKey) {
// 1. 유저 정보 확인
User user = userService.getUser(userKey);

// 오늘 기록된 소비 확인
// ver 2.0.0 이후로 기록된 소비만
LocalDateTime baseTime = LocalDateTime.of(2025, 7, 18, 0, 0); // 2025-07-18 00:00

List<LocalDateTime> createdAts = expenseRepository.findTotalExpensesCount(user.getId());

createdAts
.stream()
.filter(createdAt -> createdAt.isEqual(baseTime) || createdAt.isAfter(baseTime))
.collect(Collectors.toList());

return createdAts == null || createdAts.isEmpty() ? 0 : createdAts.size();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ public void addFeedback(ExpenseRequestDTO requestDTO) {
User user = userService.getUser(userKey);

// 오늘 기록된 소비 확인
// ver 2.0.0 이후로 기록된 소비만
LocalDateTime createdAt = requestDTO.getRecords().get(0).getDate().atStartOfDay(); // 실제 생성일자말고 사용자가 기록하려는 일자
LocalDateTime baseTime = LocalDateTime.of(2025, 7, 18, 0, 0); // 2025-07-18 00:00

// 획득한 피드백 카드가 12개 이상 -> 피드백 카드를 생성하지 않음
List<Feedback> feedbacks = feedbackRepository.findFeedbacksByUserId(user.getId());

if (feedbacks.size() < 12 && (createdAt.isEqual(baseTime) || createdAt.isAfter(baseTime))) {
if (feedbacks.size() < 12) {
Expense expense = expenseRepository.findExpenseByUserIdAndAndCreatedAt(user.getId(), createdAt);

// GOOD, BAD 일 경우 feedback 생성
Expand Down
Loading