Skip to content

fix: 장부 통합 report의 합계/지분 계산 보정 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlarltj merged 1 commit into from
May 5, 2026
Merged

fix: 장부 통합 report의 합계/지분 계산 보정 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/main/java/com/moneymong/domain/ledger/api/response/report/LedgerReportResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public record CategoryReport(
String name,
Integer income,
Integer expense,
Double share
Double incomeShare,
Double expenseShare
) {
}
}
Expand Down
48 changes: 22 additions & 26 deletions src/main/java/com/moneymong/domain/ledger/service/reader/LedgerReportReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,19 @@ public LedgerReportResponse getReport(
// 해당 agency의 모든 ledger details 조회
List<LedgerDetail> allDetails = ledgerDetailRepository.findAllByAgencyId(agencyId);

// 장부 전체 기간 합계 (응답의 totalIncome/totalExpense/totalBalance, 비율 계산 분모)
int totalIncome = calculateTotalByFundType(allDetails, FundType.INCOME);
int totalExpense = calculateTotalByFundType(allDetails, FundType.EXPENSE);
int totalBalance = totalIncome - totalExpense;

// 기간 필터링
List<LedgerDetail> filteredDetails = filterByPeriod(allDetails, startYear, startMonth, endYear, endMonth);

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

// 월별 집계
// 월별 집계 (share 분모: 장부 전체 기간 합계)
List<MonthlyReport> monthlyReports = generateMonthlyReports(
filteredDetails,
startYear, startMonth,
Expand All @@ -67,11 +71,11 @@ public LedgerReportResponse getReport(
totalExpense
);

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

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

return LedgerReportResponse.builder()
.agencyId(agencyId)
Expand Down Expand Up @@ -219,8 +223,11 @@ private List<MemberReport> generateMemberReports(
.collect(Collectors.toList());
}

private List<CategoryReport> generateCategoryReports(List<LedgerDetail> details) {
// 수입/지출 분리하여 처리
private List<CategoryReport> generateCategoryReports(
List<LedgerDetail> details,
int totalIncome,
int totalExpense
) {
Map<String, Integer> incomeByCategory = new HashMap<>();
Map<String, Integer> expenseByCategory = new HashMap<>();

Expand All @@ -236,11 +243,6 @@ private List<CategoryReport> generateCategoryReports(List<LedgerDetail> details)
}
}

// 총 수입과 지출 계산
int totalIncome = incomeByCategory.values().stream().mapToInt(Integer::intValue).sum();
int totalExpense = expenseByCategory.values().stream().mapToInt(Integer::intValue).sum();

// 모든 카테고리 수집
Set<String> allCategories = new HashSet<>();
allCategories.addAll(incomeByCategory.keySet());
allCategories.addAll(expenseByCategory.keySet());
Expand All @@ -250,21 +252,15 @@ private List<CategoryReport> generateCategoryReports(List<LedgerDetail> details)
int income = incomeByCategory.getOrDefault(categoryName, 0);
int expense = expenseByCategory.getOrDefault(categoryName, 0);

// share는 수입이 있으면 전체 수입 대비, 지출이 있으면 전체 지출 대비
double share;
if (income > 0 && totalIncome > 0) {
share = (double) income / totalIncome;
} else if (expense > 0 && totalExpense > 0) {
share = (double) expense / totalExpense;
} else {
share = 0.0;
}
double incomeShare = totalIncome > 0 ? (double) income / totalIncome : 0.0;
double expenseShare = totalExpense > 0 ? (double) expense / totalExpense : 0.0;

return CategoryReport.builder()
.name(categoryName)
.income(income)
.expense(expense)
.share(share)
.incomeShare(incomeShare)
.expenseShare(expenseShare)
.build();
})
.sorted(Comparator.comparing(CategoryReport::name))
Expand Down
Loading