diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index 20a3098..550c669 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -59,6 +59,36 @@ func (s *Service) GetExpense(id int64) (mod.Expense, error) { return expense, tx.Commit() } +func (s *Service) LoadExpenseShares(e *mod.Expense) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + + err = e.GetShares(tx) + if err != nil { + return err + } + + return tx.Commit() +} + +func (s *Service) LoadExpensePayments(e *mod.Expense) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + + err = e.GetPayments(tx) + if err != nil { + return err + } + + return tx.Commit() +} + func (s *Service) DeleteExpense(id int64) error { tx, err := s.DB.Begin() if err != nil { diff --git a/src/expenses/models/expense.go b/src/expenses/models/expense.go index 1c94a5c..43537b3 100644 --- a/src/expenses/models/expense.go +++ b/src/expenses/models/expense.go @@ -157,7 +157,7 @@ func (e *Expense) Update(tx *sql.Tx) error { return err } } else { - share.Update() + share.Update(tx) } } @@ -168,7 +168,7 @@ func (e *Expense) Update(tx *sql.Tx) error { return err } } else { - paym.Update() + paym.Update(tx) } } diff --git a/src/expenses/models/expensePayments.go b/src/expenses/models/expensePayments.go index 2ada083..647774a 100644 --- a/src/expenses/models/expensePayments.go +++ b/src/expenses/models/expensePayments.go @@ -2,7 +2,6 @@ package models import ( "context" - "expenses/config" repo "expenses/expenses/db/repository" "database/sql" @@ -18,17 +17,10 @@ type ExpensePayment struct { PayedAmount decimal.Decimal } -func (e *Expense) GetPayments() error { - cfg := config.GetInstance() +func (e *Expense) GetPayments(tx *sql.Tx) error { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) payments, err := queries.GetPayments(ctx, e.ExpID) if err != nil { return err @@ -61,17 +53,10 @@ func (p *ExpensePayment) Insert(tx *sql.Tx, expID int64) error { return nil } -func (p *ExpensePayment) Update() error { - cfg := config.GetInstance() +func (p *ExpensePayment) Update(tx *sql.Tx) error { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) res, err := queries.UpdatePayment(ctx, repo.UpdatePaymentParams{ ExpPaymID: p.ExpPaymID, Payed: p.PayedAmount.String(), diff --git a/src/expenses/models/expenseShare.go b/src/expenses/models/expenseShare.go index 8b4612a..afe57f4 100644 --- a/src/expenses/models/expenseShare.go +++ b/src/expenses/models/expenseShare.go @@ -2,7 +2,6 @@ package models import ( "context" - "expenses/config" "expenses/expenses/db/repository" repo "expenses/expenses/db/repository" @@ -19,17 +18,10 @@ type ExpenseShare struct { Share decimal.Decimal } -func (e *Expense) GetShares() error { - cfg := config.GetInstance() +func (e *Expense) GetShares(tx *sql.Tx) error { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return err - } - defer db.Close() - - queries := repository.New(db) + queries := repository.New(tx) shares, err := queries.GetShares(ctx, e.ExpID) if err != nil { return err @@ -62,17 +54,10 @@ func (sh *ExpenseShare) Insert(tx *sql.Tx, expID int64) error { return nil } -func (sh *ExpenseShare) Update() error { - cfg := config.GetInstance() +func (sh *ExpenseShare) Update(tx *sql.Tx) error { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) res, err := queries.UpdateShare(ctx, repo.UpdateShareParams{ ExpShareID: sh.ExpShareID, Share: sh.Share.String(), diff --git a/src/pages/expenses.go b/src/pages/expenses.go index fabf7b0..5b5ae8b 100644 --- a/src/pages/expenses.go +++ b/src/pages/expenses.go @@ -57,13 +57,13 @@ func expensePage(c *gin.Context) { return } - err = expense.GetShares() + err = exp.Serv.LoadExpenseShares(&expense) if err != nil { ServerErrorView(c, "failed to fetch shares") return } - err = expense.GetPayments() + err = exp.Serv.LoadExpensePayments(&expense) if err != nil { ServerErrorView(c, "failed to fetch payments") return diff --git a/src/pages/overview.go b/src/pages/overview.go index 99eab48..c188c1b 100644 --- a/src/pages/overview.go +++ b/src/pages/overview.go @@ -45,12 +45,12 @@ func getResults(c *gin.Context) { // Get the expenses and shares for each expense for k := range queriedExpenses { - err = queriedExpenses[k].GetShares() + err = exp.Serv.LoadExpenseShares(&queriedExpenses[k]) if err != nil { log.Printf("failed to get shares: %v", err) return } - err = queriedExpenses[k].GetPayments() + err = exp.Serv.LoadExpensePayments(&queriedExpenses[k]) if err != nil { log.Printf("failed to get payments: %v", err) return