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 @@ -13,9 +13,7 @@ public record LedgerReportResponse(
Integer totalIncome,
Integer totalExpense,
Integer totalBalance,
List<MonthlyReport> monthly,
List<MemberReport> members,
List<CategoryReport> categories
List<MonthlyReport> monthly
) {
@Builder
public record PeriodInfo(
Expand All @@ -34,7 +32,9 @@ public record MonthlyReport(
Integer expense,
Integer netAmount,
Double incomeShareOfPeriod,
Double expenseShareOfPeriod
Double expenseShareOfPeriod,
List<MemberReport> members,
List<CategoryReport> categories
) {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,7 @@ public LedgerReportResponse getReport(
// 기간 필터링
List<LedgerDetail> filteredDetails = filterByPeriod(allDetails, startYear, startMonth, endYear, endMonth);

// 요청 기간 합계 (멤버별 share 계산용 - 기간 내 비율 의미 유지)
int periodIncome = calculateTotalByFundType(filteredDetails, FundType.INCOME);
int periodExpense = calculateTotalByFundType(filteredDetails, FundType.EXPENSE);

// 월별 집계 (share 분모: 장부 전체 기간 합계)
// 월별 집계 (각 month 안에 members/categories 포함)
List<MonthlyReport> monthlyReports = generateMonthlyReports(
filteredDetails,
startYear, startMonth,
Expand All @@ -71,12 +67,6 @@ public LedgerReportResponse getReport(
totalExpense
);

// 멤버별 집계 (share 분모: 요청 기간 합계)
List<MemberReport> memberReports = generateMemberReports(filteredDetails, periodIncome, periodExpense);

// 카테고리별 집계 (share 분모: 장부 전체 기간 합계)
List<CategoryReport> categoryReports = generateCategoryReports(filteredDetails, totalIncome, totalExpense);

return LedgerReportResponse.builder()
.agencyId(agencyId)
.agencyName(agency.getAgencyName())
Expand All @@ -90,8 +80,6 @@ public LedgerReportResponse getReport(
.totalExpense(totalExpense)
.totalBalance(totalBalance)
.monthly(monthlyReports)
.members(memberReports)
.categories(categoryReports)
.build();
}

Expand Down Expand Up @@ -172,6 +160,10 @@ private List<MonthlyReport> generateMonthlyReports(
double incomeShare = totalIncome > 0 ? (double) monthIncome / totalIncome : 0.0;
double expenseShare = totalExpense > 0 ? (double) monthExpense / totalExpense : 0.0;

// 월별 멤버/카테고리 집계 (share 분모: 해당 월 합계)
List<MemberReport> monthMembers = generateMemberReports(monthDetails, monthIncome, monthExpense);
List<CategoryReport> monthCategories = generateCategoryReports(monthDetails, monthIncome, monthExpense);

reports.add(MonthlyReport.builder()
.year(year)
.month(month)
Expand All @@ -180,6 +172,8 @@ private List<MonthlyReport> generateMonthlyReports(
.netAmount(netAmount)
.incomeShareOfPeriod(incomeShare)
.expenseShareOfPeriod(expenseShare)
.members(monthMembers)
.categories(monthCategories)
.build());

current = current.plusMonths(1);
Expand Down
Loading