Merge branch 'dev'
Deploy / deploy (push) Successful in 51s
CI / build (push) Failing after 12m48s

This commit is contained in:
ByungCheol
2026-06-20 17:13:14 +09:00
@@ -83,15 +83,19 @@ public class RecurringService {
private AccountEntry buildEntry(Recurring r, LocalDate date, Long memberId) { private AccountEntry buildEntry(Recurring r, LocalDate date, Long memberId) {
boolean transfer = "TRANSFER".equals(r.getType()); boolean transfer = "TRANSFER".equals(r.getType());
// 메모가 없으면 제목으로 채워 '확인 필요' 목록에서 알아보기 쉽게 한다.
String memo = (r.getMemo() != null && !r.getMemo().isBlank()) ? r.getMemo() : r.getTitle();
return AccountEntry.builder() return AccountEntry.builder()
.memberId(memberId) .memberId(memberId)
.entryDate(date) .entryDate(date)
.type(r.getType()) .type(r.getType())
.category(transfer ? null : r.getCategory()) .category(transfer ? null : r.getCategory())
.amount(r.getAmount()) .amount(r.getAmount())
.memo(r.getMemo()) .memo(memo)
.walletId(r.getWalletId()) .walletId(r.getWalletId())
.toWalletId(transfer ? r.getToWalletId() : null) .toWalletId(transfer ? r.getToWalletId() : null)
// 실제 결제/이체가 일어났는지 사용자가 확인하도록 '확인 필요'로 생성
.pending(true)
.build(); .build();
} }