From df761d30224310bd7d1ebfda84f3e51aba5dce1a Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Thu, 25 Sep 2025 22:53:19 +0100 Subject: [PATCH] Fixed a small problem with the current charts --- src/changelog.md | 4 +++ src/expenses/expenses.go | 19 +++++++----- src/expenses/models/expense.go | 55 +++++++++++++++++++++++----------- src/expenses/models/user.go | 4 +++ src/pages/analysis.go | 24 ++++++++++----- src/vars.mk | 2 +- 6 files changed, 74 insertions(+), 34 deletions(-) diff --git a/src/changelog.md b/src/changelog.md index 6c08639..4e611d1 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -1,3 +1,7 @@ +# v0.0.94-alpha +- Small fix to how the built in charts got their data + + # v0.0.93-alpha Breaking changes: - In the configuration file, the following fields have be to be renamed: diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index 6ca5122..51d4068 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -6,7 +6,7 @@ import ( mod "github.com/ESilva15/expenses/expenses/models" "github.com/ESilva15/expenses/expenses/repo" - "github.com/shopspring/decimal" + dec "github.com/shopspring/decimal" ) // GetAllExpenses returns the list of Expenses in which the 'user' participates @@ -71,8 +71,8 @@ func (a *ExpApp) DeleteExpense(id int32) error { return err } -func mapShares(e *mod.Expense) map[mod.User]decimal.Decimal { - shares := make(map[mod.User]decimal.Decimal) +func mapShares(e *mod.Expense) map[mod.User]dec.Decimal { + shares := make(map[mod.User]dec.Decimal) for _, share := range e.Shares { shares[share.User] = share.Calculated } @@ -80,8 +80,8 @@ func mapShares(e *mod.Expense) map[mod.User]decimal.Decimal { return shares } -func mapPayments(e *mod.Expense) map[mod.User]decimal.Decimal { - payments := make(map[mod.User]decimal.Decimal) +func mapPayments(e *mod.Expense) map[mod.User]dec.Decimal { + payments := make(map[mod.User]dec.Decimal) for _, p := range e.Payments { payments[p.User] = payments[p.User].Add(p.PayedAmount) } @@ -90,8 +90,8 @@ func mapPayments(e *mod.Expense) map[mod.User]decimal.Decimal { } // TODO - move to the models -func ExpenseTotalPayed(exp *mod.Expense) decimal.Decimal { - total := decimal.NewFromFloat(0.0) +func ExpenseTotalPayed(exp *mod.Expense) dec.Decimal { + total := dec.NewFromFloat(0.0) for _, p := range exp.Payments { total = total.Add(p.PayedAmount) } @@ -146,3 +146,8 @@ func (a *ExpApp) UpdateExpense(exp mod.Expense) error { return a.ExpRepo.Update(ctx, exp) } + +// PaidByUser returns the amount a given user paid on an expense +func (a *ExpApp) PaidByUser(e mod.Expense, uID int32) dec.Decimal { + return e.PaidByUser(uID) +} diff --git a/src/expenses/models/expense.go b/src/expenses/models/expense.go index 443e54a..62b8cc3 100644 --- a/src/expenses/models/expense.go +++ b/src/expenses/models/expense.go @@ -2,34 +2,39 @@ package models import ( "encoding/json" - "github.com/shopspring/decimal" "time" + + dec "github.com/shopspring/decimal" ) +// Expense is the model for the expense concept in our application. type Expense struct { - ExpID int32 `json:"ExpID"` - Description string `json:"Description"` - Value decimal.Decimal `json:"Value"` - Store Store `json:"Store"` - Type Type `json:"Type"` - Category Category `json:"Category"` - Owner User `json:"Owner"` - Date time.Time `json:"Date"` - Payments []Payment `json:"Payments"` - Shares []Share `json:"Shares"` - Debts Debts `json:"Debts"` - PaidOff bool `json:"PaidOff"` - SharesEven bool `json:"SharesEven"` - QRString string `json:"qr"` - CreationDate time.Time `json:"CreationDate"` + ExpID int32 `json:"ExpID"` + Description string `json:"Description"` + Value dec.Decimal `json:"Value"` + Store Store `json:"Store"` + Type Type `json:"Type"` + Category Category `json:"Category"` + Owner User `json:"Owner"` + Date time.Time `json:"Date"` + Payments []Payment `json:"Payments"` + Shares []Share `json:"Shares"` + Debts Debts `json:"Debts"` + PaidOff bool `json:"PaidOff"` + SharesEven bool `json:"SharesEven"` + QRString string `json:"qr"` + CreationDate time.Time `json:"CreationDate"` } + +// Expenses defines a list of Expense. type Expenses []Expense +// NewExpense returns an empty Expense. func NewExpense() Expense { return Expense{ ExpID: -1, Description: "", - Value: decimal.NewFromFloat(0.0), + Value: dec.NewFromFloat(0.0), Store: NewStore(), Category: NewCategory(), Owner: NewUser(), @@ -42,9 +47,23 @@ func NewExpense() Expense { } } -// ExpenseFromJSON takes []byte and returns an *Expense +// ExpenseFromJSON takes []byte and returns an *Expense. func ExpenseFromJSON(data []byte) (*Expense, error) { var expense Expense err := json.Unmarshal(data, &expense) return &expense, err } + +// PaidByUser returns the total paid by the user of a given ID. +func (e *Expense) PaidByUser(uID int32) dec.Decimal { + total := dec.NewFromFloat(0.0) + + // TODO - Could we optimize this by storing the payments mapped to users in the list? + for _, payment := range e.Payments { + if payment.User.UserID == uID { + total = total.Add(payment.PayedAmount) + } + } + + return total +} diff --git a/src/expenses/models/user.go b/src/expenses/models/user.go index 86b7b42..1782ab3 100644 --- a/src/expenses/models/user.go +++ b/src/expenses/models/user.go @@ -1,12 +1,16 @@ package models +// User defines the model for the a User in the application type User struct { UserID int32 `json:"UserID"` UserName string `json:"UserName"` Password string `json:"Password"` } + +// Users defines a list of User type Users []User +// NewUser returns a new empty user func NewUser() User { return User{ UserID: -1, diff --git a/src/pages/analysis.go b/src/pages/analysis.go index 15d4d41..873c907 100644 --- a/src/pages/analysis.go +++ b/src/pages/analysis.go @@ -18,18 +18,23 @@ type MonthlyTotal struct { Total dec.Decimal `json:"total"` } -func getMonthlyBalance(exp mod.Expenses) ([]MonthlyTotal, error) { +func getMonthlyBalance(expenses mod.Expenses, uID int32) ([]MonthlyTotal, error) { monthlyBalance := make([]MonthlyTotal, val.MonthsPerYear) for k := range val.MonthsPerYear { monthlyBalance[k].Month = k } - for _, e := range exp { + for _, e := range expenses { month := e.Date.Month() - 1 t := e.Type.TypeName // Get the current expenses value and make it negative if its an expense - value := e.Value + // It's not the value, its what we paid on it (our payments) + // I don't like this like this - takes too long, we should load it from DB + // at the start, and cache it too + _ = exp.App.LoadExpensePayments(&e) + value := exp.App.PaidByUser(e, uID) + // value := e.Value if t == "Despesa" { value = value.Neg() } @@ -41,16 +46,18 @@ func getMonthlyBalance(exp mod.Expenses) ([]MonthlyTotal, error) { return monthlyBalance, nil } -func getMonthlyTotal(exp mod.Expenses) ([]MonthlyTotal, error) { +func getMonthlyTotal(expenses mod.Expenses, uID int32) ([]MonthlyTotal, error) { mTotal := make([]MonthlyTotal, val.MonthsPerYear) for k := range mTotal { mTotal[k].Month = k } // Step 1: net total for each month - for _, e := range exp { + for _, e := range expenses { month := int(e.Date.Month()) - 1 // Jan = 0 - value := e.Value + // Same as on the other one here + _ = exp.App.LoadExpensePayments(&e) + value := exp.App.PaidByUser(e, uID) if e.Type.TypeName == "Despesa" { value = value.Neg() } @@ -70,6 +77,7 @@ func getAnalysisDataWG(c *gin.Context) (map[string]any, error) { if err != nil { return map[string]any{}, err } + user := *ctx.Value("user").(*mod.User) filter, err := expenseFilterFromQuery(c) if err != nil { @@ -92,11 +100,11 @@ func getAnalysisDataWG(c *gin.Context) (map[string]any, error) { wg.Add(2) go func() { defer wg.Done() - mBalance, bErr = getMonthlyBalance(queriedExpenses) + mBalance, bErr = getMonthlyBalance(queriedExpenses, user.UserID) }() go func() { defer wg.Done() - mTotal, tErr = getMonthlyTotal(queriedExpenses) + mTotal, tErr = getMonthlyTotal(queriedExpenses, user.UserID) }() wg.Wait() diff --git a/src/vars.mk b/src/vars.mk index 1a217ee..57fdeba 100644 --- a/src/vars.mk +++ b/src/vars.mk @@ -5,4 +5,4 @@ REQUIRED_VARS := registry repo $(foreach v,$(REQUIRED_VARS),\ $(if $(value $(v)),,$(error Variable '$(v)' is required but empty))) -tag = v0.0.93-alpha +tag = v0.0.94-alpha