jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Move code to other method

Browse Source
This commit is contained in:
Jan Bader 2022-04-05 19:33:12 +00:00
parent f0993fd9c3
commit cf39db52fb
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/budgeting.go
View File

@ -81,15 +81,7 @@ func (h *Handler) prepareBudgeting(ctx context.Context, budget postgres.Budget,
categoriesWithBalance, moneyUsed := h.calculateBalances( categoriesWithBalance, moneyUsed := h.calculateBalances(
budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances) budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
availableBalance := h.getAvailableBalance(budget, moneyUsed, cumultativeBalances, firstOfNextMonth) availableBalance := h.getAvailableBalance(budget, moneyUsed, cumultativeBalances, categoriesWithBalance, firstOfNextMonth)
for i := range categoriesWithBalance {
cat := &categoriesWithBalance[i]
if cat.ID != budget.IncomeCategoryID {
continue
}
cat.Available = availableBalance
}
data := BudgetingForMonthResponse{categoriesWithBalance, availableBalance} data := BudgetingForMonthResponse{categoriesWithBalance, availableBalance}
return data, nil return data, nil
@ -102,7 +94,7 @@ type BudgetingForMonthResponse struct {
func (*Handler) getAvailableBalance(budget postgres.Budget, func (*Handler) getAvailableBalance(budget postgres.Budget,
moneyUsed numeric.Numeric, cumultativeBalances []postgres.GetCumultativeBalancesRow, moneyUsed numeric.Numeric, cumultativeBalances []postgres.GetCumultativeBalancesRow,
firstOfNextMonth time.Time, categoriesWithBalance []CategoryWithBalance, firstOfNextMonth time.Time,
) numeric.Numeric { ) numeric.Numeric {
availableBalance := moneyUsed availableBalance := moneyUsed
@ -118,6 +110,15 @@ func (*Handler) getAvailableBalance(budget postgres.Budget,
availableBalance.AddI(bal.Transactions) availableBalance.AddI(bal.Transactions)
availableBalance.AddI(bal.Assignments) availableBalance.AddI(bal.Assignments)
} }
for i := range categoriesWithBalance {
cat := &categoriesWithBalance[i]
if cat.ID != budget.IncomeCategoryID {
continue
}
cat.Available = availableBalance
}
return availableBalance return availableBalance
} }