From 763d19ec54194084ec99999671dfbfa935930f1d Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Sun, 7 Sep 2025 15:39:19 +0100 Subject: [PATCH] Finished the PgRepo pattern thingy --- src/expenses/app.go | 32 ++- src/expenses/categories.go | 9 +- src/expenses/expenseDebts.go | 6 +- src/expenses/expenseDebts_aux_test.go | 12 +- src/expenses/expensePayments.go | 18 +- src/expenses/expenses.go | 47 +--- src/expenses/expenses_lua.go | 11 +- src/expenses/models/category.go | 84 +----- src/expenses/models/categoryRepoMap.go | 18 -- src/expenses/models/expense.go | 266 ++---------------- src/expenses/models/expensePayments.go | 110 +------- src/expenses/models/expenseShare.go | 98 ------- src/expenses/models/store.go | 83 +----- src/expenses/models/storeRepoMap.go | 18 -- src/expenses/models/type.go | 91 +----- src/expenses/models/typeRepoMap.go | 18 -- src/expenses/models/user.go | 20 +- src/expenses/models/userRepoMap.go | 18 -- src/expenses/repo/categoryRepo.go | 14 + src/expenses/repo/expenseRepo.go.go | 34 +++ src/expenses/repo/pg_categoryRepo.go | 83 ++++++ src/expenses/repo/pg_categoryRepoMapper.go | 21 ++ .../pg_conversions.go} | 2 +- src/expenses/repo/pg_expensePaymentRepo.go | 134 +++++++++ .../pg_expensePaymentRepoMapper.go} | 21 +- src/expenses/repo/pg_expenseRepo.go | 249 ++++++++++++++++ .../pg_expenseRepoMapper.go} | 41 +-- src/expenses/repo/pg_expenseShareRepo.go | 142 ++++++++++ .../pg_expenseShareRepoMapper.go} | 15 +- src/expenses/repo/pg_storeRepo.go | 83 ++++++ src/expenses/repo/pg_storeRepoMapper.go | 21 ++ src/expenses/repo/pg_typeRepo.go | 91 ++++++ src/expenses/repo/pg_typeRepoMapper.go | 21 ++ src/expenses/repo/pg_userRepo.go | 28 ++ src/expenses/repo/pg_userRepoMapper.go | 21 ++ .../pgdb/pgsqlc}/categories.sql.go | 2 +- .../{db/repository => repo/pgdb/pgsqlc}/db.go | 2 +- .../pgdb/pgsqlc}/expenses.sql.go | 2 +- .../repository => repo/pgdb/pgsqlc}/models.go | 2 +- .../pgdb/pgsqlc}/payments.sql.go | 2 +- .../pgdb/pgsqlc}/shares.sql.go | 2 +- .../pgdb/pgsqlc}/stores.sql.go | 2 +- .../pgdb/pgsqlc}/types.sql.go | 2 +- .../pgdb/pgsqlc}/users.sql.go | 2 +- .../{db => repo/pgdb}/queries/categories.sql | 0 .../{db => repo/pgdb}/queries/expenses.sql | 0 .../{db => repo/pgdb}/queries/payments.sql | 0 .../{db => repo/pgdb}/queries/shares.sql | 0 .../{db => repo/pgdb}/queries/stores.sql | 0 .../{db => repo/pgdb}/queries/types.sql | 0 .../{db => repo/pgdb}/queries/users.sql | 0 src/expenses/{db => repo/pgdb}/schema.sql | 0 src/expenses/{db => repo/pgdb}/sqlc.yaml | 4 +- src/expenses/repo/storeRepo.go | 14 + src/expenses/repo/typeRepo.go | 14 + src/expenses/repo/userRepo.go | 10 + src/go.mod | 2 + src/pages/expensesHelper.go | 2 +- 58 files changed, 1109 insertions(+), 935 deletions(-) delete mode 100644 src/expenses/models/categoryRepoMap.go delete mode 100644 src/expenses/models/storeRepoMap.go delete mode 100644 src/expenses/models/typeRepoMap.go delete mode 100644 src/expenses/models/userRepoMap.go create mode 100644 src/expenses/repo/categoryRepo.go create mode 100644 src/expenses/repo/expenseRepo.go.go create mode 100644 src/expenses/repo/pg_categoryRepo.go create mode 100644 src/expenses/repo/pg_categoryRepoMapper.go rename src/expenses/{models/pgConversions.go => repo/pg_conversions.go} (98%) create mode 100644 src/expenses/repo/pg_expensePaymentRepo.go rename src/expenses/{models/expensePaymentRepoMap.go => repo/pg_expensePaymentRepoMapper.go} (53%) create mode 100644 src/expenses/repo/pg_expenseRepo.go rename src/expenses/{models/expenseRepoMap.go => repo/pg_expenseRepoMapper.go} (70%) create mode 100644 src/expenses/repo/pg_expenseShareRepo.go rename src/expenses/{models/expenseShareRepoMap.go => repo/pg_expenseShareRepoMapper.go} (56%) create mode 100644 src/expenses/repo/pg_storeRepo.go create mode 100644 src/expenses/repo/pg_storeRepoMapper.go create mode 100644 src/expenses/repo/pg_typeRepo.go create mode 100644 src/expenses/repo/pg_typeRepoMapper.go create mode 100644 src/expenses/repo/pg_userRepo.go create mode 100644 src/expenses/repo/pg_userRepoMapper.go rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/categories.sql.go (99%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/db.go (96%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/expenses.sql.go (99%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/models.go (98%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/payments.sql.go (99%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/shares.sql.go (99%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/stores.sql.go (98%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/types.sql.go (98%) rename src/expenses/{db/repository => repo/pgdb/pgsqlc}/users.sql.go (97%) rename src/expenses/{db => repo/pgdb}/queries/categories.sql (100%) rename src/expenses/{db => repo/pgdb}/queries/expenses.sql (100%) rename src/expenses/{db => repo/pgdb}/queries/payments.sql (100%) rename src/expenses/{db => repo/pgdb}/queries/shares.sql (100%) rename src/expenses/{db => repo/pgdb}/queries/stores.sql (100%) rename src/expenses/{db => repo/pgdb}/queries/types.sql (100%) rename src/expenses/{db => repo/pgdb}/queries/users.sql (100%) rename src/expenses/{db => repo/pgdb}/schema.sql (100%) rename src/expenses/{db => repo/pgdb}/sqlc.yaml (83%) create mode 100644 src/expenses/repo/storeRepo.go create mode 100644 src/expenses/repo/typeRepo.go create mode 100644 src/expenses/repo/userRepo.go diff --git a/src/expenses/app.go b/src/expenses/app.go index 29e52c6..9f54c8a 100644 --- a/src/expenses/app.go +++ b/src/expenses/app.go @@ -3,32 +3,42 @@ package expenses import ( "context" "expenses/config" - "github.com/jackc/pgx/v5" - lua "github.com/yuin/gopher-lua" + "expenses/expenses/repo" "log" "strings" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgxpool" + lua "github.com/yuin/gopher-lua" ) type ExpensesApp struct { - DB *pgx.Conn - Lua *lua.LState + Lua *lua.LState + ExpRepo repo.ExpenseRepository + CategoryRepo repo.CategoryRepository + UserRepo repo.UserRepository + StoreRepo repo.StoreRepository + TypeRepo repo.TypeRepository } var ( App *ExpensesApp ) -func NewExpenseApp(db *pgx.Conn, luaVM *lua.LState) *ExpensesApp { +func NewExpenseApp(db *pgxpool.Pool, luaVM *lua.LState) *ExpensesApp { return &ExpensesApp{ - DB: db, - Lua: luaVM, + ExpRepo: repo.NewPgExpRepo(db), + CategoryRepo: repo.NewPgCatRepo(db), + UserRepo: repo.NewPgUserRepo(db), + StoreRepo: repo.NewPgStoreRepo(db), + TypeRepo: repo.NewPgTypeRepo(db), + Lua: luaVM, } } func (a *ExpensesApp) Close() { - ctx := context.Background() - - a.DB.Close(ctx) + // TODO + // Close the repos? a.Lua.Close() } @@ -56,7 +66,7 @@ func StartApp() error { ctx := context.Background() pgStr := getPgConnString(cfg) - conn, err := pgx.Connect(ctx, pgStr) + conn, err := pgxpool.New(ctx, pgStr) if err != nil { log.Fatalf("Failed to open migration DB: %v", err) } diff --git a/src/expenses/categories.go b/src/expenses/categories.go index c4068f9..98511d0 100644 --- a/src/expenses/categories.go +++ b/src/expenses/categories.go @@ -8,18 +8,13 @@ import ( func (a *ExpensesApp) GetAllCategories() ([]mod.Category, error) { ctx := context.Background() - tx, err := a.DB.BeginTx(ctx, pgx.TxOptions{}) - if err != nil { - return []mod.Category{}, err - } - defer tx.Rollback(ctx) - expenses, err := mod.GetAllCategories(a.DB, tx) + categories, err := a.CategoryRepo.GetAll(ctx) if err != nil { return []mod.Category{}, err } - return expenses, tx.Commit(ctx) + return categories, nil } func (a *ExpensesApp) GetCategory(id int32) (mod.Category, error) { diff --git a/src/expenses/expenseDebts.go b/src/expenses/expenseDebts.go index 69f2073..baf545c 100644 --- a/src/expenses/expenseDebts.go +++ b/src/expenses/expenseDebts.go @@ -144,8 +144,8 @@ func CalculateDebts(e *mod.Expense) (mod.Debts, error) { return debts, nil } -func (a *ExpensesApp) settleDebt(payment mod.ExpensePayment, - credit mod.ExpensePayment, eId int32) error { +func (a *ExpensesApp) settleDebt(payment mod.Payment, + credit mod.Payment, eId int32) error { ctx := context.Background() tx, err := a.DB.BeginTx(ctx, pgx.TxOptions{}) if err != nil { @@ -169,7 +169,7 @@ func (a *ExpensesApp) settleDebt(payment mod.ExpensePayment, func (a *ExpensesApp) ProcessDebt(expID int32, debt mod.Debt) error { // We have to balance the debtor and creditor payments - payment := mod.ExpensePayment{ + payment := mod.Payment{ User: mod.User{ UserID: debt.Debtor.UserID, }, diff --git a/src/expenses/expenseDebts_aux_test.go b/src/expenses/expenseDebts_aux_test.go index f4a6f76..2ecb9b5 100644 --- a/src/expenses/expenseDebts_aux_test.go +++ b/src/expenses/expenseDebts_aux_test.go @@ -36,7 +36,7 @@ var ( {ExpShareID: 1, User: user2, Share: dec.NewFromFloat(0.4)}, {ExpShareID: 2, User: user3, Share: dec.NewFromFloat(0.2)}, }, - Payments: []mod.ExpensePayment{ + Payments: []mod.Payment{ {ExpPaymID: 0, User: user1, PayedAmount: dec.NewFromInt(50)}, {ExpPaymID: 1, User: user1, PayedAmount: dec.NewFromInt(50)}, {ExpPaymID: 2, User: user2, PayedAmount: dec.NewFromInt(0)}, @@ -56,7 +56,7 @@ var ( {ExpShareID: 2, User: user3, Share: dec.NewFromFloat(0.3), Calculated: dec.NewFromFloat(48.0)}, {ExpShareID: 3, User: user4, Share: dec.NewFromFloat(0.1), Calculated: dec.NewFromFloat(16)}, }, - Payments: []mod.ExpensePayment{ + Payments: []mod.Payment{ {ExpPaymID: 0, User: user1, PayedAmount: dec.NewFromInt(40)}, {ExpPaymID: 1, User: user1, PayedAmount: dec.NewFromInt(40)}, {ExpPaymID: 2, User: user2, PayedAmount: dec.NewFromInt(5)}, @@ -131,7 +131,7 @@ var ( {ExpShareID: 2, User: user3, Share: dec.NewFromFloat(0.3)}, {ExpShareID: 3, User: user4, Share: dec.NewFromFloat(0.1)}, }, - Payments: []mod.ExpensePayment{ + Payments: []mod.Payment{ {ExpPaymID: 0, User: user1, PayedAmount: dec.NewFromInt(40)}, {ExpPaymID: 1, User: user1, PayedAmount: dec.NewFromInt(8)}, {ExpPaymID: 2, User: user2, PayedAmount: dec.NewFromInt(48)}, @@ -151,7 +151,7 @@ var ( {ExpShareID: 1, User: user2, Share: dec.NewFromFloat(0.33)}, {ExpShareID: 2, User: user3, Share: dec.NewFromFloat(0.33)}, }, - Payments: []mod.ExpensePayment{ + Payments: []mod.Payment{ {ExpPaymID: 0, User: user1, PayedAmount: dec.NewFromFloat(0.18)}, {ExpPaymID: 1, User: user1, PayedAmount: dec.NewFromFloat(0.16)}, {ExpPaymID: 2, User: user2, PayedAmount: dec.NewFromFloat(0.16)}, @@ -172,7 +172,7 @@ var ( {ExpShareID: 2, User: user3, Share: dec.NewFromFloat(0.33), Calculated: dec.NewFromFloat(36.66)}, }, - Payments: []mod.ExpensePayment{ + Payments: []mod.Payment{ {ExpPaymID: 0, User: user1, PayedAmount: dec.NewFromFloat(37.79)}, {ExpPaymID: 1, User: user1, PayedAmount: dec.NewFromFloat(36.66)}, {ExpPaymID: 2, User: user2, PayedAmount: dec.NewFromFloat(36.66)}, @@ -190,7 +190,7 @@ var ( {ExpShareID: 2, User: user3, Share: dec.NewFromFloat(0.33), Calculated: dec.NewFromFloat(0.16)}, }, - Payments: []mod.ExpensePayment{ + Payments: []mod.Payment{ {ExpPaymID: 0, User: user1, PayedAmount: dec.NewFromFloat(0.50)}, {ExpPaymID: 1, User: user2, PayedAmount: dec.NewFromFloat(0.0)}, {ExpPaymID: 2, User: user3, PayedAmount: dec.NewFromFloat(0.0)}, diff --git a/src/expenses/expensePayments.go b/src/expenses/expensePayments.go index 162a00a..1836055 100644 --- a/src/expenses/expensePayments.go +++ b/src/expenses/expensePayments.go @@ -13,8 +13,8 @@ import ( // conversion that the user calls before calling this // Can even create a struct to then hold the data func ParseFormPayments(userIDs []string, paymentsIDs []string, - values []string) ([]mod.ExpensePayment, error) { - payments := []mod.ExpensePayment{} + values []string) ([]mod.Payment, error) { + payments := []mod.Payment{} for k := range userIDs { userID, err := ParseID(userIDs[k]) if err != nil { @@ -26,7 +26,7 @@ func ParseFormPayments(userIDs []string, paymentsIDs []string, return nil, err } - newPayment := mod.ExpensePayment{ + newPayment := mod.Payment{ ExpPaymID: -1, User: mod.User{ UserID: userID, @@ -49,11 +49,11 @@ func ParseFormPayments(userIDs []string, paymentsIDs []string, } func (a *ExpensesApp) GetExpensePaymentByUserID(eId int32, uId int32, -) (mod.ExpensePayment, error) { +) (mod.Payment, error) { ctx := context.Background() tx, err := a.DB.BeginTx(ctx, pgx.TxOptions{}) if err != nil { - return mod.ExpensePayment{}, err + return mod.Payment{}, err } defer tx.Rollback(ctx) @@ -64,7 +64,7 @@ func (a *ExpensesApp) GetExpensePaymentByUserID(eId int32, uId int32, // insertPayment allows us to insert a payment manually // for now its private, need to figure out if it needs to be public -func (a *ExpensesApp) insertPayment(payment mod.ExpensePayment, eIdx int32) error { +func (a *ExpensesApp) insertPayment(payment mod.Payment, eIdx int32) error { ctx := context.Background() tx, err := a.DB.BeginTx(ctx, pgx.TxOptions{}) if err != nil { @@ -88,7 +88,7 @@ func (a *ExpensesApp) DeletePayment(id int32) error { } defer tx.Rollback(ctx) - payment := mod.ExpensePayment{ + payment := mod.Payment{ ExpPaymID: id, } @@ -100,7 +100,7 @@ func (a *ExpensesApp) DeletePayment(id int32) error { return tx.Commit(ctx) } -func (a *ExpensesApp) UpdatePayment(payment mod.ExpensePayment) error { +func (a *ExpensesApp) UpdatePayment(payment mod.Payment) error { ctx := context.Background() tx, err := a.DB.BeginTx(ctx, pgx.TxOptions{}) if err != nil { @@ -117,7 +117,7 @@ func (a *ExpensesApp) UpdatePayment(payment mod.ExpensePayment) error { } func (a *ExpensesApp) AddPayment(expID int32, userID int32, sum dec.Decimal) error { - payment := mod.ExpensePayment{ + payment := mod.Payment{ User: mod.User{ UserID: userID, }, diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index d93e232..d75bee2 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -13,18 +13,12 @@ import ( func (a *ExpensesApp) GetAllExpenses() ([]mod.Expense, error) { ctx := context.Background() - tx, err := a.DB.Begin(ctx) - if err != nil { - return []mod.Expense{}, err - } - defer tx.Rollback(ctx) - - expenses, err := mod.GetAllExpenses(a.DB, tx) + expenses, err := a.ExpRepo.GetAll(ctx) if err != nil { return []mod.Expense{}, err } - return expenses, tx.Commit(ctx) + return expenses, nil } func (a *ExpensesApp) GetExpensesRanged(startDate string, endDate string) ([]mod.Expense, error) { @@ -56,18 +50,12 @@ func (a *ExpensesApp) GetExpensesRanged(startDate string, endDate string) ([]mod func (a *ExpensesApp) GetExpense(id int32) (mod.Expense, error) { ctx := context.Background() - tx, err := a.DB.Begin(ctx) - if err != nil { - return mod.Expense{}, err - } - defer tx.Rollback(ctx) - - expense, err := mod.GetExpense(a.DB, tx, id) + expense, err := a.ExpRepo.Get(ctx, id) if err != nil { return mod.Expense{}, err } - return expense, tx.Commit(ctx) + return expense, nil } func (a *ExpensesApp) LoadExpenseShares(e *mod.Expense) error { @@ -113,22 +101,8 @@ func (a *ExpensesApp) LoadExpenseDebts(e *mod.Expense) error { func (a *ExpensesApp) DeleteExpense(id int32) error { ctx := context.Background() - tx, err := a.DB.BeginTx(ctx, pgx.TxOptions{}) - if err != nil { - return err - } - defer tx.Rollback(ctx) - - expense := mod.Expense{ - ExpID: id, - } - - err = expense.Delete(a.DB, tx) - if err != nil { - return err - } - - return tx.Commit(ctx) + err := a.ExpRepo.Delete(ctx, id) + return err } func mapShares(e *mod.Expense) map[mod.User]decimal.Decimal { @@ -190,16 +164,9 @@ func (a *ExpensesApp) analyzeExpense(e *mod.Expense) { } func (a *ExpensesApp) NewExpense(exp mod.Expense) error { - ctx := context.Background() - tx, err := a.DB.BeginTx(ctx, pgx.TxOptions{}) - if err != nil { - return err - } - defer tx.Rollback(ctx) - a.analyzeExpense(&exp) - err = exp.Insert(a.DB, tx) + err := a.Storage.Insert() if err != nil { return err } diff --git a/src/expenses/expenses_lua.go b/src/expenses/expenses_lua.go index a6585da..0cf097a 100644 --- a/src/expenses/expenses_lua.go +++ b/src/expenses/expenses_lua.go @@ -22,16 +22,7 @@ func (a *ExpensesApp) prepareExpense(exp *mod.Expense) error { } func (a *ExpensesApp) luaGetAllExpenses(L *lua.LState) int { - // TODO - // It makes no sense this repeats this db thing - ctx := context.Background() - tx, err := a.DB.Begin(ctx) - if err != nil { - return returnWithError(L, err.Error()) - } - defer tx.Rollback(ctx) - - expenses, err := mod.GetAllExpenses(a.DB, tx) + expenses, err := a.Storage.GetAllExpenses() tbl := L.NewTable() for _, e := range expenses { diff --git a/src/expenses/models/category.go b/src/expenses/models/category.go index 8a0a2a1..255c9c8 100644 --- a/src/expenses/models/category.go +++ b/src/expenses/models/category.go @@ -1,17 +1,10 @@ package models -import ( - "context" - repo "expenses/expenses/db/repository" - experr "expenses/expenses/errors" - "fmt" - "github.com/jackc/pgx/v5" -) - type Category struct { CategoryID int32 `json:"CategoryID"` CategoryName string `json:"CategoryName"` } +type Categories []Category func NewCategory() Category { return Category{ @@ -19,78 +12,3 @@ func NewCategory() Category { CategoryName: "", } } - -func GetAllCategories(db repo.DBTX, tx pgx.Tx) ([]Category, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - categories, err := queries.GetCategories(ctx) - if err != nil { - return []Category{}, nil - } - - return MapRepoCategories(categories), nil -} - -func GetCategory(db repo.DBTX, tx pgx.Tx, catID int32) (Category, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - category, err := queries.GetCategory(ctx, catID) - - return MapRepoCategory(category), err -} - -func (cat *Category) Insert(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.InsertCategory(ctx, cat.CategoryName) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -func (cat *Category) Delete(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.DeleteCategory(ctx, cat.CategoryID) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return experr.ErrNotFound - } - - return nil -} - -func (cat *Category) Update(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.UpdateCategory(ctx, repo.UpdateCategoryParams{ - CategoryName: cat.CategoryName, - CategoryID: cat.CategoryID, - }) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return experr.ErrNotFound - } - - return nil -} diff --git a/src/expenses/models/categoryRepoMap.go b/src/expenses/models/categoryRepoMap.go deleted file mode 100644 index ffaf8c7..0000000 --- a/src/expenses/models/categoryRepoMap.go +++ /dev/null @@ -1,18 +0,0 @@ -package models - -import repo "expenses/expenses/db/repository" - -func MapRepoCategory(rc repo.Category) Category { - return Category{ - CategoryID: rc.CategoryID, - CategoryName: rc.CategoryName, - } -} - -func MapRepoCategories(rc []repo.Category) []Category { - categories := make([]Category, len(rc)) - for k, cat := range rc { - categories[k] = MapRepoCategory(cat) - } - return categories -} diff --git a/src/expenses/models/expense.go b/src/expenses/models/expense.go index 1bf5e9a..b42547a 100644 --- a/src/expenses/models/expense.go +++ b/src/expenses/models/expense.go @@ -1,33 +1,28 @@ package models import ( - "context" "encoding/json" - repo "expenses/expenses/db/repository" - "fmt" - "time" - - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgtype" "github.com/shopspring/decimal" + "time" ) 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 []ExpensePayment `json:"Payments"` - Shares []Share `json:"Shares"` - Debts Debts `json:"Debts"` - PaidOff bool `json:"PaidOff"` - SharesEven bool `json:"SharesEven"` - CreationDate time.Time `json:"CreationDate"` + 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"` + CreationDate time.Time `json:"CreationDate"` } +type Expenses []Expense func NewExpense() Expense { return Expense{ @@ -38,7 +33,7 @@ func NewExpense() Expense { Category: NewCategory(), Owner: NewUser(), Date: time.Now(), - Payments: []ExpensePayment{}, + Payments: []Payment{}, Shares: []Share{}, PaidOff: false, SharesEven: false, @@ -49,233 +44,6 @@ func NewExpense() 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 } - -func GetAllExpenses(db repo.DBTX, tx pgx.Tx) ([]Expense, error) { - ctx := context.Background() - - var start pgtype.Timestamp - start.Valid = false - var end pgtype.Timestamp - end.Valid = false - - queries := repo.New(db).WithTx(tx) - expenses, err := queries.GetExpenses(ctx, repo.GetExpensesParams{ - Startdate: start, - Enddate: end, - }) - if err != nil { - return []Expense{}, err - } - - return mapRepoGetExpensesRows(expenses), nil -} - -func GetExpense(db repo.DBTX, tx pgx.Tx, expID int32) (Expense, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - expense, err := queries.GetExpense(ctx, expID) - if err != nil { - return Expense{}, err - } - - return mapRepoGetExpenseRow(expense), nil -} - -func (exp *Expense) Insert(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - value, err := decimalToNumeric(exp.Value) - if err != nil { - return err - } - - paidOff, err := boolToPgBool(exp.PaidOff) - if err != nil { - return err - } - - sharesEven, err := boolToPgBool(exp.SharesEven) - if err != nil { - return err - } - - expDate, err := timeToTimestamp(exp.Date) - if err != nil { - return err - } - - creationDate, err := timeToTimestamp(exp.CreationDate) - if err != nil { - return err - } - - queries := repo.New(db).WithTx(tx) - lastInsertedID, err := queries.InsertExpense(ctx, repo.InsertExpenseParams{ - Description: exp.Description, - Value: value, - StoreID: exp.Store.StoreID, - CategoryID: exp.Category.CategoryID, - TypeID: exp.Type.TypeID, - OwnerUserID: exp.Owner.UserID, - ExpDate: expDate, - PaidOff: paidOff, - SharesEven: sharesEven, - CreationDate: creationDate, - }) - if err != nil { - return err - } - - exp.ExpID = lastInsertedID - - err = exp.InsertShares(db, tx) - if err != nil { - return err - } - - err = exp.InsertPayments(db, tx) - if err != nil { - return err - } - - return nil -} - -func (exp *Expense) InsertShares(db repo.DBTX, tx pgx.Tx) error { - for _, share := range exp.Shares { - err := share.Insert(db, tx, exp.ExpID) - if err != nil { - return err - } - } - return nil -} - -func (exp *Expense) InsertPayments(db repo.DBTX, tx pgx.Tx) error { - for _, paym := range exp.Payments { - err := paym.Insert(db, tx, exp.ExpID) - if err != nil { - return err - } - } - return nil -} - -func (e *Expense) Update(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - value, err := decimalToNumeric(e.Value) - if err != nil { - return err - } - - paidOff, err := boolToPgBool(e.PaidOff) - if err != nil { - return err - } - - sharesEven, err := boolToPgBool(e.SharesEven) - if err != nil { - return err - } - - expDate, err := timeToTimestamp(e.Date) - if err != nil { - return err - } - - queries := repo.New(db).WithTx(tx) - res, err := queries.UpdateExpense(ctx, repo.UpdateExpenseParams{ - ExpID: e.ExpID, - Description: e.Description, - Value: value, - StoreID: e.Store.StoreID, - CategoryID: e.Category.CategoryID, - TypeID: e.Type.TypeID, - OwnerUserID: e.Owner.UserID, - PaidOff: paidOff, - SharesEven: sharesEven, - ExpDate: expDate, - }) - if err != nil { - return err - } - - for _, share := range e.Shares { - if share.ExpShareID == -1 { - err := share.Insert(db, tx, e.ExpID) - if err != nil { - return err - } - } else { - share.Update(db, tx) - } - } - - for _, paym := range e.Payments { - if paym.ExpPaymID == -1 { - err := paym.Insert(db, tx, e.ExpID) - if err != nil { - return err - } - } else { - paym.Update(db, tx) - } - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were updated") - } - - return nil -} - -func (e *Expense) Delete(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.DeleteExpense(ctx, e.ExpID) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -// SHITTY QUERIES THAT I NEED TO PUT IN SOMEWHERE MORE OGRANHJASLD -func GetExpensesRange(db repo.DBTX, tx pgx.Tx, start time.Time, end time.Time) ([]Expense, error) { - ctx := context.Background() - - startPg, err := timeToTimestamp(start) - if err != nil { - return []Expense{}, err - } - - endPg, err := timeToTimestamp(end) - if err != nil { - return []Expense{}, err - } - - queries := repo.New(db).WithTx(tx) - expenses, err := queries.GetExpenses(ctx, repo.GetExpensesParams{ - Startdate: startPg, - Enddate: endPg, - }) - if err != nil { - return []Expense{}, err - } - - return mapRepoGetExpensesRows(expenses), nil -} diff --git a/src/expenses/models/expensePayments.go b/src/expenses/models/expensePayments.go index 044e4b1..7348c09 100644 --- a/src/expenses/models/expensePayments.go +++ b/src/expenses/models/expensePayments.go @@ -1,122 +1,20 @@ package models import ( - "context" "encoding/json" - repo "expenses/expenses/db/repository" - "fmt" - "github.com/jackc/pgx/v5" - _ "github.com/mattn/go-sqlite3" "github.com/shopspring/decimal" ) -type ExpensePayment struct { +type Payment struct { ExpPaymID int32 User User PayedAmount decimal.Decimal } +type Payments []Payment // PaymentFromJSON takes []byte and returns an *ExpensePayment -func PaymentFromJSON(data []byte) (*ExpensePayment, error) { - var payment ExpensePayment +func PaymentFromJSON(data []byte) (*Payment, error) { + var payment Payment err := json.Unmarshal(data, &payment) return &payment, err } - -func (e *Expense) GetPayments(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - payments, err := queries.GetPayments(ctx, e.ExpID) - if err != nil { - return err - } - - e.Payments = mapRepoGetPaymentsRows(payments) - return nil -} - -func GetExpensePaymentByUserID(db repo.DBTX, tx pgx.Tx, eId int32, uId int32, -) (ExpensePayment, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - payment, err := queries.GetExpensePaymentByUser(ctx, repo.GetExpensePaymentByUserParams{ - ExpID: eId, - UserID: uId, - }) - if err != nil { - return ExpensePayment{}, err - } - - return mapRepoGetPaymentRow(payment), nil -} - -func (p *ExpensePayment) Insert(db repo.DBTX, tx pgx.Tx, expID int32) error { - ctx := context.Background() - - payed, err := decimalToNumeric(p.PayedAmount) - if err != nil { - return err - } - - queries := repo.New(db).WithTx(tx) - res, err := queries.InsertPayment(ctx, repo.InsertPaymentParams{ - ExpID: expID, - UserID: p.User.UserID, - Payed: payed, - }) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -func (p *ExpensePayment) Update(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - payed, err := decimalToNumeric(p.PayedAmount) - if err != nil { - return err - } - - queries := repo.New(db).WithTx(tx) - res, err := queries.UpdatePayment(ctx, repo.UpdatePaymentParams{ - ExpPaymID: p.ExpPaymID, - Payed: payed, - UserID: p.User.UserID, - }) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -func (p *ExpensePayment) Delete(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.DeletePayment(ctx, p.ExpPaymID) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} diff --git a/src/expenses/models/expenseShare.go b/src/expenses/models/expenseShare.go index 8e70f02..38aa1d0 100644 --- a/src/expenses/models/expenseShare.go +++ b/src/expenses/models/expenseShare.go @@ -1,13 +1,7 @@ package models import ( - "context" "encoding/json" - "expenses/expenses/db/repository" - repo "expenses/expenses/db/repository" - "fmt" - "github.com/jackc/pgx/v5" - _ "github.com/mattn/go-sqlite3" dec "github.com/shopspring/decimal" ) @@ -43,95 +37,3 @@ func (sh Shares) Equal(other Shares) bool { return true } - -func (e *Expense) GetShares(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repository.New(db).WithTx(tx) - shares, err := queries.GetShares(ctx, e.ExpID) - if err != nil { - return err - } - - e.Shares = mapRepoGetSharesRows(shares) - return nil -} - -func (sh *Share) Insert(db repo.DBTX, tx pgx.Tx, expID int32) error { - ctx := context.Background() - - share, err := decimalToNumeric(sh.Share) - if err != nil { - return err - } - calculated, err := decimalToNumeric(sh.Calculated) - if err != nil { - return err - } - - queries := repo.New(db).WithTx(tx) - res, err := queries.InsertShare(ctx, repo.InsertShareParams{ - ExpID: expID, - Share: share, - UserID: sh.User.UserID, - Calculated: calculated, - }) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -func (sh *Share) Update(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - share, err := decimalToNumeric(sh.Share) - if err != nil { - return err - } - calculated, err := decimalToNumeric(sh.Calculated) - if err != nil { - return err - } - - queries := repo.New(db).WithTx(tx) - res, err := queries.UpdateShare(ctx, repo.UpdateShareParams{ - ExpShareID: sh.ExpShareID, - Share: share, - UserID: sh.User.UserID, - Calculated: calculated, - }) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -func (sh *Share) Delete(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.DeleteShare(ctx, sh.ExpShareID) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} diff --git a/src/expenses/models/store.go b/src/expenses/models/store.go index 0b67acf..02a5bfa 100644 --- a/src/expenses/models/store.go +++ b/src/expenses/models/store.go @@ -1,18 +1,10 @@ package models -import ( - "context" - repo "expenses/expenses/db/repository" - experr "expenses/expenses/errors" - "fmt" - "github.com/jackc/pgx/v5" - _ "github.com/mattn/go-sqlite3" -) - type Store struct { StoreID int32 `json:"StoreID"` StoreName string `json:"StoreName"` } +type Stores []Store func NewStore() Store { return Store{ @@ -20,76 +12,3 @@ func NewStore() Store { StoreName: "", } } - -func GetAllStores(db repo.DBTX, tx pgx.Tx) ([]Store, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - storeList, err := queries.GetStores(ctx) - if err != nil { - return []Store{}, err - } - - return mapRepoStores(storeList), nil -} - -func GetStore(db repo.DBTX, tx pgx.Tx, storeID int32) (Store, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - store, err := queries.GetStore(ctx, storeID) - if err != nil { - return Store{}, err - } - - return mapRepoStore(store), nil -} - -func (s *Store) Insert(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.InsertStore(ctx, s.StoreName) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -func (s *Store) Update(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - _, err := queries.UpdateStore(ctx, repo.UpdateStoreParams{ - StoreID: s.StoreID, - StoreName: s.StoreName, - }) - if err != nil { - return err - } - - return nil -} - -func (s *Store) Delete(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.DeleteStore(ctx, s.StoreID) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return experr.ErrNotFound - } - - return nil -} diff --git a/src/expenses/models/storeRepoMap.go b/src/expenses/models/storeRepoMap.go deleted file mode 100644 index d3e65c7..0000000 --- a/src/expenses/models/storeRepoMap.go +++ /dev/null @@ -1,18 +0,0 @@ -package models - -import repo "expenses/expenses/db/repository" - -func mapRepoStore(rs repo.Store) Store { - return Store{ - StoreID: rs.StoreID, - StoreName: rs.StoreName, - } -} - -func mapRepoStores(rs []repo.Store) []Store { - stores := make([]Store, len(rs)) - for k, store := range rs { - stores[k] = mapRepoStore(store) - } - return stores -} diff --git a/src/expenses/models/type.go b/src/expenses/models/type.go index 10ff25d..7bcc824 100644 --- a/src/expenses/models/type.go +++ b/src/expenses/models/type.go @@ -1,18 +1,10 @@ package models -import ( - "context" - repo "expenses/expenses/db/repository" - experr "expenses/expenses/errors" - "fmt" - "github.com/jackc/pgx/v5" - _ "github.com/mattn/go-sqlite3" -) - type Type struct { TypeID int32 `json:"TypeID"` TypeName string `json:"TypeName"` } +type Types []Type func NewType() Type { return Type{ @@ -20,84 +12,3 @@ func NewType() Type { TypeName: "", } } - -func GetAllTypes(db repo.DBTX, tx pgx.Tx) ([]Type, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - typeList, err := queries.GetTypes(ctx) - if err != nil { - return []Type{}, err - } - - return mapRepoTypes(typeList), nil -} - -func GetType(db repo.DBTX, tx pgx.Tx, typID int32) (Type, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - typ, err := queries.GetType(ctx, typID) - if err != nil { - return Type{}, err - } - - return mapRepoType(typ), nil -} - -func (typ *Type) Insert(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.InsertType(ctx, typ.TypeName) - if err != nil { - return err - } - - // TODO - // Move all theses things outside of this, I'll handle it wherever I'm doing - // logics - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return fmt.Errorf("no rows were created") - } - - return nil -} - -func (typ *Type) Delete(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.DeleteType(ctx, typ.TypeID) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return experr.ErrNotFound - } - - return nil -} - -func (typ *Type) Update(db repo.DBTX, tx pgx.Tx) error { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - res, err := queries.UpdateType(ctx, repo.UpdateTypeParams{ - TypeID: typ.TypeID, - TypeName: typ.TypeName, - }) - if err != nil { - return err - } - - rowsAffected := res.RowsAffected() - if rowsAffected == 0 { - return experr.ErrNotFound - } - - return nil -} diff --git a/src/expenses/models/typeRepoMap.go b/src/expenses/models/typeRepoMap.go deleted file mode 100644 index c9ae82e..0000000 --- a/src/expenses/models/typeRepoMap.go +++ /dev/null @@ -1,18 +0,0 @@ -package models - -import repo "expenses/expenses/db/repository" - -func mapRepoType(rt repo.ExpenseType) Type { - return Type{ - TypeID: rt.TypeID, - TypeName: rt.TypeName, - } -} - -func mapRepoTypes(rt []repo.ExpenseType) []Type { - types := make([]Type, len(rt)) - for k, typ := range rt { - types[k] = mapRepoType(typ) - } - return types -} diff --git a/src/expenses/models/user.go b/src/expenses/models/user.go index 6a1de1c..a97dae7 100644 --- a/src/expenses/models/user.go +++ b/src/expenses/models/user.go @@ -1,16 +1,10 @@ package models -import ( - "context" - repo "expenses/expenses/db/repository" - "github.com/jackc/pgx/v5" - _ "github.com/mattn/go-sqlite3" -) - type User struct { UserID int32 `json:"UserID"` UserName string `json:"UserName"` } +type Users []User func NewUser() User { return User{ @@ -18,15 +12,3 @@ func NewUser() User { UserName: "", } } - -func GetAllUsers(db repo.DBTX, tx pgx.Tx) ([]User, error) { - ctx := context.Background() - - queries := repo.New(db).WithTx(tx) - userList, err := queries.GetUsers(ctx) - if err != nil { - return []User{}, err - } - - return mapRepoUsers(userList), nil -} diff --git a/src/expenses/models/userRepoMap.go b/src/expenses/models/userRepoMap.go deleted file mode 100644 index eb0f39d..0000000 --- a/src/expenses/models/userRepoMap.go +++ /dev/null @@ -1,18 +0,0 @@ -package models - -import repo "expenses/expenses/db/repository" - -func mapRepoUser(ru repo.User) User { - return User{ - UserID: ru.UserID, - UserName: ru.UserName, - } -} - -func mapRepoUsers(ru []repo.User) []User { - users := make([]User, len(ru)) - for k, u := range ru { - users[k] = mapRepoUser(u) - } - return users -} diff --git a/src/expenses/repo/categoryRepo.go b/src/expenses/repo/categoryRepo.go new file mode 100644 index 0000000..16f8ee5 --- /dev/null +++ b/src/expenses/repo/categoryRepo.go @@ -0,0 +1,14 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" +) + +type CategoryRepository interface { + Get(ctx context.Context, id int32) (mod.Category, error) + GetAll(ctx context.Context) (mod.Categories, error) + Update(ctx context.Context, cat mod.Category) error + Insert(ctx context.Context, cat mod.Category) error + Delete(ctx context.Context, id int32) error +} diff --git a/src/expenses/repo/expenseRepo.go.go b/src/expenses/repo/expenseRepo.go.go new file mode 100644 index 0000000..0b23a9b --- /dev/null +++ b/src/expenses/repo/expenseRepo.go.go @@ -0,0 +1,34 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" + "time" +) + +type ExpenseRepository interface { + // Direct expense methods + Get(ctx context.Context, id int32) (mod.Expense, error) + GetAll(ctx context.Context) (mod.Expenses, error) + GetExpensesRange(ctx context.Context, start time.Time, + end time.Time) (mod.Expenses, error) + Update(ctx context.Context, exp mod.Expense) error + Insert(ctx context.Context, exp mod.Expense) error + Delete(ctx context.Context, id int32) error + + // Share methods + GetShares(ctx context.Context, eId int32) (mod.Shares, error) + UpdateShare(ctx context.Context, sh mod.Share) error + InsertShare(ctx context.Context, eId int32, sh mod.Share) error + InsertShares(ctx context.Context, eId int32, sh mod.Shares) error + DeleteShare(ctx context.Context, sh mod.Share) error + + // Payment methods + GetPayments(ctx context.Context, eId int32) (mod.Payments, error) + GetExpensePaymentByUserID(ctx context.Context, eId int32, + uId int32) (mod.Payment, error) + UpdatePayment(ctx context.Context, pm mod.Payment) error + InsertPayment(ctx context.Context, eId int32, pm mod.Payment) error + InsertPayments(ctx context.Context, eId int32, pm mod.Payments) error + DeletePayment(ctx context.Context, pm mod.Payment) error +} diff --git a/src/expenses/repo/pg_categoryRepo.go b/src/expenses/repo/pg_categoryRepo.go new file mode 100644 index 0000000..6ab78cd --- /dev/null +++ b/src/expenses/repo/pg_categoryRepo.go @@ -0,0 +1,83 @@ +package repo + +import ( + "context" + experr "expenses/expenses/errors" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" + "fmt" + "github.com/jackc/pgx/v5/pgxpool" +) + +type PgCatRepo struct { + DB *pgxpool.Pool +} + +func NewPgCatRepo(db *pgxpool.Pool) CategoryRepository { + return PgCatRepo{ + DB: db, + } +} + +func (p PgCatRepo) Get(ctx context.Context, id int32) (mod.Category, error) { + queries := pgsqlc.New(p.DB) + category, err := queries.GetCategory(ctx, id) + return MapRepoCategory(category), err +} + +func (p PgCatRepo) GetAll(ctx context.Context) (mod.Categories, error) { + queries := pgsqlc.New(p.DB) + categories, err := queries.GetCategories(ctx) + if err != nil { + return mod.Categories{}, nil + } + return MapRepoCategories(categories), nil +} + +func (p PgCatRepo) Update(ctx context.Context, cat mod.Category) error { + queries := pgsqlc.New(p.DB) + res, err := queries.UpdateCategory(ctx, pgsqlc.UpdateCategoryParams{ + CategoryName: cat.CategoryName, + CategoryID: cat.CategoryID, + }) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return experr.ErrNotFound + } + + return nil +} + +func (p PgCatRepo) Insert(ctx context.Context, cat mod.Category) error { + queries := pgsqlc.New(p.DB) + res, err := queries.InsertCategory(ctx, cat.CategoryName) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were created") + } + + return nil +} + +func (p PgCatRepo) Delete(ctx context.Context, id int32) error { + queries := pgsqlc.New(p.DB) + res, err := queries.DeleteCategory(ctx, id) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return experr.ErrNotFound + } + + return nil +} diff --git a/src/expenses/repo/pg_categoryRepoMapper.go b/src/expenses/repo/pg_categoryRepoMapper.go new file mode 100644 index 0000000..0c55744 --- /dev/null +++ b/src/expenses/repo/pg_categoryRepoMapper.go @@ -0,0 +1,21 @@ +package repo + +import ( + mod "expenses/expenses/models" + pgsqlc "expenses/expenses/repo/pgdb/pgsqlc" +) + +func MapRepoCategory(rc pgsqlc.Category) mod.Category { + return mod.Category{ + CategoryID: rc.CategoryID, + CategoryName: rc.CategoryName, + } +} + +func MapRepoCategories(rc []pgsqlc.Category) mod.Categories { + categories := make(mod.Categories, len(rc)) + for k, cat := range rc { + categories[k] = MapRepoCategory(cat) + } + return categories +} diff --git a/src/expenses/models/pgConversions.go b/src/expenses/repo/pg_conversions.go similarity index 98% rename from src/expenses/models/pgConversions.go rename to src/expenses/repo/pg_conversions.go index d4d2813..5211186 100644 --- a/src/expenses/models/pgConversions.go +++ b/src/expenses/repo/pg_conversions.go @@ -1,4 +1,4 @@ -package models +package repo import ( "github.com/jackc/pgx/v5/pgtype" diff --git a/src/expenses/repo/pg_expensePaymentRepo.go b/src/expenses/repo/pg_expensePaymentRepo.go new file mode 100644 index 0000000..4370f6d --- /dev/null +++ b/src/expenses/repo/pg_expensePaymentRepo.go @@ -0,0 +1,134 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" + "fmt" +) + +func (p PgExpRepo) insertPayment( + ctx context.Context, q *pgsqlc.Queries, eId int32, pm mod.Payment) error { + payed, err := decimalToNumeric(pm.PayedAmount) + if err != nil { + return err + } + + res, err := q.InsertPayment(ctx, pgsqlc.InsertPaymentParams{ + ExpID: eId, + UserID: pm.User.UserID, + Payed: payed, + }) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were created") + } + + return nil +} + +func (p PgExpRepo) InsertPayment( + ctx context.Context, eId int32, pm mod.Payment) error { + return p.insertPayment(ctx, pgsqlc.New(p.DB), eId, pm) +} + +func (p *PgExpRepo) insertPayments( + ctx context.Context, q *pgsqlc.Queries, eId int32, pm []mod.Payment) error { + for k := range pm { + err := p.insertPayment(ctx, q, eId, pm[k]) + if err != nil { + return err + } + } + + return nil +} + +func (p PgExpRepo) InsertPayments( + ctx context.Context, eId int32, pm mod.Payments) error { + return p.insertPayments(ctx, pgsqlc.New(p.DB), eId, pm) +} + +func (p *PgExpRepo) updatePayment( + ctx context.Context, q *pgsqlc.Queries, pm mod.Payment) error { + + payed, err := decimalToNumeric(pm.PayedAmount) + if err != nil { + return err + } + + res, err := q.UpdatePayment(ctx, pgsqlc.UpdatePaymentParams{ + ExpPaymID: pm.ExpPaymID, + Payed: payed, + UserID: pm.User.UserID, + }) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were created") + } + + return nil +} + +func (p PgExpRepo) UpdatePayment( + ctx context.Context, pm mod.Payment) error { + return p.updatePayment(ctx, pgsqlc.New(p.DB), pm) +} + +func (p *PgExpRepo) deletePayment( + ctx context.Context, q *pgsqlc.Queries, pm mod.Payment) error { + + res, err := q.DeletePayment(ctx, pm.ExpPaymID) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were created") + } + + return nil +} + +func (p PgExpRepo) DeletePayment(ctx context.Context, pm mod.Payment) error { + return p.deletePayment(ctx, pgsqlc.New(p.DB), pm) +} + +func (p *PgExpRepo) getPayments( + ctx context.Context, q *pgsqlc.Queries, eId int32) (mod.Payments, error) { + + payments, err := q.GetPayments(ctx, eId) + if err != nil { + return mod.Payments{}, err + } + + return mapRepoGetPaymentsRows(payments), nil +} + +func (p PgExpRepo) GetPayments( + ctx context.Context, eId int32) (mod.Payments, error) { + return p.getPayments(ctx, pgsqlc.New(p.DB), eId) +} + +func (p PgExpRepo) GetExpensePaymentByUserID(ctx context.Context, eId int32, uId int32, +) (mod.Payment, error) { + queries := pgsqlc.New(p.DB) + payment, err := queries.GetExpensePaymentByUser(ctx, pgsqlc.GetExpensePaymentByUserParams{ + ExpID: eId, + UserID: uId, + }) + if err != nil { + return mod.Payment{}, err + } + + return mapRepoGetPaymentRow(payment), nil +} diff --git a/src/expenses/models/expensePaymentRepoMap.go b/src/expenses/repo/pg_expensePaymentRepoMapper.go similarity index 53% rename from src/expenses/models/expensePaymentRepoMap.go rename to src/expenses/repo/pg_expensePaymentRepoMapper.go index 8eb3600..0adb2f5 100644 --- a/src/expenses/models/expensePaymentRepoMap.go +++ b/src/expenses/repo/pg_expensePaymentRepoMapper.go @@ -1,37 +1,38 @@ -package models +package repo import ( - repo "expenses/expenses/db/repository" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" ) -func mapRepoGetPaymentsRow(s repo.GetPaymentsRow) ExpensePayment { +func mapRepoGetPaymentsRow(s pgsqlc.GetPaymentsRow) mod.Payment { payed := pgNumericToDecimal(s.ExpensesPayment.Payed) - return ExpensePayment{ + return mod.Payment{ ExpPaymID: s.ExpensesPayment.ExpPaymID, PayedAmount: payed, - User: User{ + User: mod.User{ UserID: s.User.UserID, UserName: s.User.UserName, }, } } -func mapRepoGetPaymentsRows(ep []repo.GetPaymentsRow) []ExpensePayment { - payments := make([]ExpensePayment, len(ep)) +func mapRepoGetPaymentsRows(ep []pgsqlc.GetPaymentsRow) []mod.Payment { + payments := make([]mod.Payment, len(ep)) for k, exp := range ep { payments[k] = mapRepoGetPaymentsRow(exp) } return payments } -func mapRepoGetPaymentRow(s repo.GetExpensePaymentByUserRow) ExpensePayment { +func mapRepoGetPaymentRow(s pgsqlc.GetExpensePaymentByUserRow) mod.Payment { payed := pgNumericToDecimal(s.ExpensesPayment.Payed) - return ExpensePayment{ + return mod.Payment{ ExpPaymID: s.ExpensesPayment.ExpPaymID, PayedAmount: payed, - User: User{ + User: mod.User{ UserID: s.User.UserID, UserName: s.User.UserName, }, diff --git a/src/expenses/repo/pg_expenseRepo.go b/src/expenses/repo/pg_expenseRepo.go new file mode 100644 index 0000000..795107c --- /dev/null +++ b/src/expenses/repo/pg_expenseRepo.go @@ -0,0 +1,249 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" + "fmt" + "time" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" + "github.com/jackc/pgx/v5/pgxpool" +) + +type PgExpRepo struct { + DB *pgxpool.Pool +} + +func NewPgExpRepo(db *pgxpool.Pool) ExpenseRepository { + return PgExpRepo{ + DB: db, + } +} + +func (r *PgExpRepo) withTx(ctx context.Context, fn func(q *pgsqlc.Queries) error) error { + tx, err := r.DB.BeginTx(ctx, pgx.TxOptions{}) + if err != nil { + return err + } + defer tx.Rollback(ctx) + + q := pgsqlc.New(tx) // bind sqlc to this tx + + if err := fn(q); err != nil { + return err + } + return tx.Commit(ctx) +} + +func (p *PgExpRepo) getAll(ctx context.Context, q *pgsqlc.Queries) (mod.Expenses, error) { + // We want to select all here, no timestamps + var start pgtype.Timestamp + start.Valid = false + var end pgtype.Timestamp + end.Valid = false + + expenses, err := q.GetExpenses(ctx, pgsqlc.GetExpensesParams{ + Startdate: start, + Enddate: end, + }) + if err != nil { + return []mod.Expense{}, err + } + + return mapRepoGetExpensesRows(expenses), err +} + +func (p PgExpRepo) GetAll(ctx context.Context) (mod.Expenses, error) { + return p.getAll(ctx, pgsqlc.New(p.DB)) +} + +func (p *PgExpRepo) get(ctx context.Context, q *pgsqlc.Queries, id int32) (mod.Expense, error) { + expense, err := q.GetExpense(ctx, id) + if err != nil { + return mod.Expense{}, err + } + return mapRepoGetExpenseRow(expense), nil +} + +func (p PgExpRepo) Get(ctx context.Context, id int32) (mod.Expense, error) { + return p.get(ctx, pgsqlc.New(p.DB), id) +} + +func (p PgExpRepo) Update( + ctx context.Context, + exp mod.Expense) error { + + return p.withTx(ctx, func(q *pgsqlc.Queries) error { + value, err := decimalToNumeric(exp.Value) + if err != nil { + return err + } + + paidOff, err := boolToPgBool(exp.PaidOff) + if err != nil { + return err + } + + sharesEven, err := boolToPgBool(exp.SharesEven) + if err != nil { + return err + } + + expDate, err := timeToTimestamp(exp.Date) + if err != nil { + return err + } + + res, err := q.UpdateExpense(ctx, pgsqlc.UpdateExpenseParams{ + ExpID: exp.ExpID, + Description: exp.Description, + Value: value, + StoreID: exp.Store.StoreID, + CategoryID: exp.Category.CategoryID, + TypeID: exp.Type.TypeID, + OwnerUserID: exp.Owner.UserID, + PaidOff: paidOff, + SharesEven: sharesEven, + ExpDate: expDate, + }) + if err != nil { + return err + } + + for _, share := range exp.Shares { + if share.ExpShareID == -1 { + err := p.insertShare(ctx, q, exp.ExpID, share) + if err != nil { + return err + } + } else { + err := p.updateShare(ctx, q, share) + } + } + + for _, paym := range exp.Payments { + if paym.ExpPaymID == -1 { + err := p.insertPayment(ctx, q, exp.ExpID, paym) + if err != nil { + return err + } + } else { + err := p.updatePayment(ctx, q, paym) + if err != nil { + return nil + } + } + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were updated") + } + + return nil + }) +} + +func (p PgExpRepo) Insert( + ctx context.Context, + exp mod.Expense) error { + + return p.withTx(ctx, func(q *pgsqlc.Queries) error { + value, err := decimalToNumeric(exp.Value) + if err != nil { + return err + } + + paidOff, err := boolToPgBool(exp.PaidOff) + if err != nil { + return err + } + + sharesEven, err := boolToPgBool(exp.SharesEven) + if err != nil { + return err + } + + expDate, err := timeToTimestamp(exp.Date) + if err != nil { + return err + } + + creationDate, err := timeToTimestamp(exp.CreationDate) + if err != nil { + return err + } + + lastInsertedID, err := q.InsertExpense(ctx, pgsqlc.InsertExpenseParams{ + Description: exp.Description, + Value: value, + StoreID: exp.Store.StoreID, + CategoryID: exp.Category.CategoryID, + TypeID: exp.Type.TypeID, + OwnerUserID: exp.Owner.UserID, + ExpDate: expDate, + PaidOff: paidOff, + SharesEven: sharesEven, + CreationDate: creationDate, + }) + if err != nil { + return err + } + + exp.ExpID = lastInsertedID + + err = p.insertShares(ctx, q, exp.ExpID, exp.Shares) + if err != nil { + return err + } + + err = p.insertPayments(ctx, q, exp.ExpID, exp.Payments) + if err != nil { + return err + } + + return nil + }) +} + +func (p PgExpRepo) Delete(ctx context.Context, id int32) error { + queries := pgsqlc.New(p.DB) + res, err := queries.DeleteExpense(ctx, id) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were delete") + } + + return nil +} + +func (p PgExpRepo) GetExpensesRange( + ctx context.Context, start time.Time, end time.Time) (mod.Expenses, error) { + + startPg, err := timeToTimestamp(start) + if err != nil { + return mod.Expenses{}, err + } + + endPg, err := timeToTimestamp(end) + if err != nil { + return mod.Expenses{}, err + } + + queries := pgsqlc.New(p.DB) + expenses, err := queries.GetExpenses(ctx, pgsqlc.GetExpensesParams{ + Startdate: startPg, + Enddate: endPg, + }) + if err != nil { + return mod.Expenses{}, err + } + + return mapRepoGetExpensesRows(expenses), nil +} diff --git a/src/expenses/models/expenseRepoMap.go b/src/expenses/repo/pg_expenseRepoMapper.go similarity index 70% rename from src/expenses/models/expenseRepoMap.go rename to src/expenses/repo/pg_expenseRepoMapper.go index 3520f3b..833869a 100644 --- a/src/expenses/models/expenseRepoMap.go +++ b/src/expenses/repo/pg_expenseRepoMapper.go @@ -1,83 +1,84 @@ -package models +package repo import ( - repo "expenses/expenses/db/repository" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" ) -func mapRepoGetExpenseRow(e repo.GetExpenseRow) Expense { +func mapRepoGetExpenseRow(e pgsqlc.GetExpenseRow) mod.Expense { value := pgNumericToDecimal(e.Expense.Value) paidOff := pgBoolToBool(e.Expense.PaidOff) sharesEven := pgBoolToBool(e.Expense.SharesEven) expDate := pgTimestampToTime(e.Expense.ExpDate) creationDate := pgTimestampToTime(e.Expense.CreationDate) - return Expense{ + return mod.Expense{ ExpID: e.Expense.ExpID, Description: e.Expense.Description, Value: value, - Store: Store{ + Store: mod.Store{ StoreID: e.Store.StoreID, StoreName: e.Store.StoreName, }, - Type: Type{ + Type: mod.Type{ TypeID: e.ExpenseType.TypeID, TypeName: e.ExpenseType.TypeName, }, - Category: Category{ + Category: mod.Category{ CategoryID: e.Category.CategoryID, CategoryName: e.Category.CategoryName, }, - Owner: User{ + Owner: mod.User{ UserID: e.User.UserID, UserName: e.User.UserName, }, Date: expDate, - Shares: []Share{}, - Payments: []ExpensePayment{}, + Shares: []mod.Share{}, + Payments: []mod.Payment{}, PaidOff: paidOff, SharesEven: sharesEven, CreationDate: creationDate, } } -func mapRepoGetExpenseRowMulti(e repo.GetExpensesRow) Expense { +func mapRepoGetExpenseRowMulti(e pgsqlc.GetExpensesRow) mod.Expense { value := pgNumericToDecimal(e.Expense.Value) paidOff := pgBoolToBool(e.Expense.PaidOff) sharesEven := pgBoolToBool(e.Expense.SharesEven) expDate := pgTimestampToTime(e.Expense.ExpDate) creationDate := pgTimestampToTime(e.Expense.CreationDate) - return Expense{ + return mod.Expense{ ExpID: e.Expense.ExpID, Description: e.Expense.Description, Value: value, - Store: Store{ + Store: mod.Store{ StoreID: e.Store.StoreID, StoreName: e.Store.StoreName, }, - Type: Type{ + Type: mod.Type{ TypeID: e.ExpenseType.TypeID, TypeName: e.ExpenseType.TypeName, }, - Category: Category{ + Category: mod.Category{ CategoryID: e.Category.CategoryID, CategoryName: e.Category.CategoryName, }, - Owner: User{ + Owner: mod.User{ UserID: e.User.UserID, UserName: e.User.UserName, }, Date: expDate, - Shares: []Share{}, - Payments: []ExpensePayment{}, + Shares: []mod.Share{}, + Payments: []mod.Payment{}, PaidOff: paidOff, SharesEven: sharesEven, CreationDate: creationDate, } } -func mapRepoGetExpensesRows(er []repo.GetExpensesRow) []Expense { - expenses := make([]Expense, len(er)) +func mapRepoGetExpensesRows(er []pgsqlc.GetExpensesRow) []mod.Expense { + expenses := make([]mod.Expense, len(er)) for k, exp := range er { expenses[k] = mapRepoGetExpenseRowMulti(exp) } diff --git a/src/expenses/repo/pg_expenseShareRepo.go b/src/expenses/repo/pg_expenseShareRepo.go new file mode 100644 index 0000000..b6c27eb --- /dev/null +++ b/src/expenses/repo/pg_expenseShareRepo.go @@ -0,0 +1,142 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" + "fmt" +) + +func (p *PgExpRepo) insertShare( + ctx context.Context, + q *pgsqlc.Queries, + eId int32, + sh mod.Share) error { + + share, err := decimalToNumeric(sh.Share) + if err != nil { + return err + } + calculated, err := decimalToNumeric(sh.Calculated) + if err != nil { + return err + } + + res, err := q.InsertShare(ctx, pgsqlc.InsertShareParams{ + ExpID: eId, + Share: share, + UserID: sh.User.UserID, + Calculated: calculated, + }) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were created") + } + + return nil +} + +func (p PgExpRepo) InsertShare( + ctx context.Context, + eId int32, + sh mod.Share) error { + + return p.insertShare(ctx, pgsqlc.New(p.DB), eId, sh) +} + +func (p PgExpRepo) InsertShares( + ctx context.Context, + eId int32, + sh mod.Shares) error { + + return p.insertShares(ctx, pgsqlc.New(p.DB), eId, sh) +} + +func (p *PgExpRepo) insertShares( + ctx context.Context, + q *pgsqlc.Queries, + eId int32, + sh []mod.Share) error { + + for k := range sh { + err := p.insertShare(ctx, q, eId, sh[k]) + if err != nil { + return err + } + } + + return nil +} + +func (p PgExpRepo) updateShare( + ctx context.Context, q *pgsqlc.Queries, sh mod.Share) error { + + share, err := decimalToNumeric(sh.Share) + if err != nil { + return err + } + calculated, err := decimalToNumeric(sh.Calculated) + if err != nil { + return err + } + + res, err := q.UpdateShare(ctx, pgsqlc.UpdateShareParams{ + ExpShareID: sh.ExpShareID, + Share: share, + UserID: sh.User.UserID, + Calculated: calculated, + }) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were updated") + } + + return nil +} + +func (p PgExpRepo) UpdateShare(ctx context.Context, sh mod.Share) error { + return p.updateShare(ctx, pgsqlc.New(p.DB), sh) +} + +func (p *PgExpRepo) deleteShare( + ctx context.Context, q *pgsqlc.Queries, sh mod.Share) error { + + res, err := q.DeleteShare(ctx, sh.ExpShareID) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were deleted") + } + + return nil +} + +func (p PgExpRepo) DeleteShare(ctx context.Context, sh mod.Share) error { + return p.deleteShare(ctx, pgsqlc.New(p.DB), sh) +} + +func (p *PgExpRepo) getShares( + ctx context.Context, q *pgsqlc.Queries, eId int32) (mod.Shares, error) { + + shares, err := q.GetShares(ctx, eId) + if err != nil { + return mod.Shares{}, err + } + + return mapRepoGetSharesRows(shares), nil +} + +func (p PgExpRepo) GetShares(ctx context.Context, eId int32) (mod.Shares, error) { + return p.getShares(ctx, pgsqlc.New(p.DB), eId) +} diff --git a/src/expenses/models/expenseShareRepoMap.go b/src/expenses/repo/pg_expenseShareRepoMapper.go similarity index 56% rename from src/expenses/models/expenseShareRepoMap.go rename to src/expenses/repo/pg_expenseShareRepoMapper.go index 6357173..51e453e 100644 --- a/src/expenses/models/expenseShareRepoMap.go +++ b/src/expenses/repo/pg_expenseShareRepoMapper.go @@ -1,17 +1,18 @@ -package models +package repo import ( - repo "expenses/expenses/db/repository" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" ) -func mapRepoGetSharesRow(s repo.GetSharesRow) Share { +func mapRepoGetSharesRow(s pgsqlc.GetSharesRow) mod.Share { share := pgNumericToDecimal(s.ExpensesShare.Share) calculated := pgNumericToDecimal(s.ExpensesShare.Calculated) - return Share{ + return mod.Share{ ExpShareID: s.ExpensesShare.ExpShareID, Share: share, - User: User{ + User: mod.User{ UserID: s.User.UserID, UserName: s.User.UserName, }, @@ -19,8 +20,8 @@ func mapRepoGetSharesRow(s repo.GetSharesRow) Share { } } -func mapRepoGetSharesRows(es []repo.GetSharesRow) []Share { - shares := make([]Share, len(es)) +func mapRepoGetSharesRows(es []pgsqlc.GetSharesRow) mod.Shares { + shares := make(mod.Shares, len(es)) for k, exp := range es { shares[k] = mapRepoGetSharesRow(exp) } diff --git a/src/expenses/repo/pg_storeRepo.go b/src/expenses/repo/pg_storeRepo.go new file mode 100644 index 0000000..d372d2b --- /dev/null +++ b/src/expenses/repo/pg_storeRepo.go @@ -0,0 +1,83 @@ +package repo + +import ( + "context" + experr "expenses/expenses/errors" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" + "fmt" + "github.com/jackc/pgx/v5/pgxpool" +) + +type PgStoreRepo struct { + DB *pgxpool.Pool +} + +func NewPgStoreRepo(db *pgxpool.Pool) StoreRepository { + return PgStoreRepo{ + DB: db, + } +} + +func (p PgStoreRepo) Get(ctx context.Context, id int32) (mod.Store, error) { + queries := pgsqlc.New(p.DB) + store, err := queries.GetStore(ctx, id) + if err != nil { + return mod.Store{}, err + } + + return mapRepoStore(store), nil +} + +func (p PgStoreRepo) GetAll(ctx context.Context) (mod.Stores, error) { + queries := pgsqlc.New(p.DB) + storeList, err := queries.GetStores(ctx) + if err != nil { + return mod.Stores{}, err + } + + return mapRepoStores(storeList), nil +} + +func (p PgStoreRepo) Update(ctx context.Context, s mod.Store) error { + queries := pgsqlc.New(p.DB) + _, err := queries.UpdateStore(ctx, pgsqlc.UpdateStoreParams{ + StoreID: s.StoreID, + StoreName: s.StoreName, + }) + if err != nil { + return err + } + + return nil +} + +func (p PgStoreRepo) Insert(ctx context.Context, s mod.Store) error { + queries := pgsqlc.New(p.DB) + res, err := queries.InsertStore(ctx, s.StoreName) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were created") + } + + return nil +} + +func (p PgStoreRepo) Delete(ctx context.Context, id int32) error { + queries := pgsqlc.New(p.DB) + res, err := queries.DeleteStore(ctx, id) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return experr.ErrNotFound + } + + return nil +} diff --git a/src/expenses/repo/pg_storeRepoMapper.go b/src/expenses/repo/pg_storeRepoMapper.go new file mode 100644 index 0000000..7f46ba5 --- /dev/null +++ b/src/expenses/repo/pg_storeRepoMapper.go @@ -0,0 +1,21 @@ +package repo + +import ( + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" +) + +func mapRepoStore(rs pgsqlc.Store) mod.Store { + return mod.Store{ + StoreID: rs.StoreID, + StoreName: rs.StoreName, + } +} + +func mapRepoStores(rs []pgsqlc.Store) mod.Stores { + stores := make(mod.Stores, len(rs)) + for k, store := range rs { + stores[k] = mapRepoStore(store) + } + return stores +} diff --git a/src/expenses/repo/pg_typeRepo.go b/src/expenses/repo/pg_typeRepo.go new file mode 100644 index 0000000..b4c4698 --- /dev/null +++ b/src/expenses/repo/pg_typeRepo.go @@ -0,0 +1,91 @@ +package repo + +import ( + "context" + experr "expenses/expenses/errors" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" + "fmt" + "github.com/jackc/pgx/v5/pgxpool" +) + +type PgTypeRepo struct { + DB *pgxpool.Pool +} + +func NewPgTypeRepo(db *pgxpool.Pool) TypeRepository { + return PgTypeRepo{ + DB: db, + } +} + +func (p PgTypeRepo) Get(ctx context.Context, id int32) (mod.Type, error) { + queries := pgsqlc.New(p.DB) + typ, err := queries.GetType(ctx, id) + if err != nil { + return mod.Type{}, err + } + + return mapRepoType(typ), nil +} + +func (p PgTypeRepo) GetAll(ctx context.Context) (mod.Types, error) { + queries := pgsqlc.New(p.DB) + typeList, err := queries.GetTypes(ctx) + if err != nil { + return mod.Types{}, err + } + + return mapRepoTypes(typeList), nil +} + +func (p PgTypeRepo) Update(ctx context.Context, typ mod.Type) error { + queries := pgsqlc.New(p.DB) + res, err := queries.UpdateType(ctx, pgsqlc.UpdateTypeParams{ + TypeID: typ.TypeID, + TypeName: typ.TypeName, + }) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return experr.ErrNotFound + } + + return nil +} + +func (p PgTypeRepo) Insert(ctx context.Context, typ mod.Type) error { + queries := pgsqlc.New(p.DB) + res, err := queries.InsertType(ctx, typ.TypeName) + if err != nil { + return err + } + + // TODO + // Move all theses things outside of this, I'll handle it wherever I'm doing + // logics + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return fmt.Errorf("no rows were created") + } + + return nil +} + +func (p PgTypeRepo) Delete(ctx context.Context, id int32) error { + queries := pgsqlc.New(p.DB) + res, err := queries.DeleteType(ctx, id) + if err != nil { + return err + } + + rowsAffected := res.RowsAffected() + if rowsAffected == 0 { + return experr.ErrNotFound + } + + return nil +} diff --git a/src/expenses/repo/pg_typeRepoMapper.go b/src/expenses/repo/pg_typeRepoMapper.go new file mode 100644 index 0000000..5245a42 --- /dev/null +++ b/src/expenses/repo/pg_typeRepoMapper.go @@ -0,0 +1,21 @@ +package repo + +import ( + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" +) + +func mapRepoType(rt pgsqlc.ExpenseType) mod.Type { + return mod.Type{ + TypeID: rt.TypeID, + TypeName: rt.TypeName, + } +} + +func mapRepoTypes(rt []pgsqlc.ExpenseType) mod.Types { + types := make(mod.Types, len(rt)) + for k, typ := range rt { + types[k] = mapRepoType(typ) + } + return types +} diff --git a/src/expenses/repo/pg_userRepo.go b/src/expenses/repo/pg_userRepo.go new file mode 100644 index 0000000..b7702fe --- /dev/null +++ b/src/expenses/repo/pg_userRepo.go @@ -0,0 +1,28 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" + "github.com/jackc/pgx/v5/pgxpool" +) + +type PgUserRepo struct { + DB *pgxpool.Pool +} + +func NewPgUserRepo(db *pgxpool.Pool) UserRepository { + return PgUserRepo{ + DB: db, + } +} + +func (p PgUserRepo) GetAll(ctx context.Context) (mod.Users, error) { + queries := pgsqlc.New(p.DB) + userList, err := queries.GetUsers(ctx) + if err != nil { + return mod.Users{}, err + } + + return mapRepoUsers(userList), nil +} diff --git a/src/expenses/repo/pg_userRepoMapper.go b/src/expenses/repo/pg_userRepoMapper.go new file mode 100644 index 0000000..1df1966 --- /dev/null +++ b/src/expenses/repo/pg_userRepoMapper.go @@ -0,0 +1,21 @@ +package repo + +import ( + mod "expenses/expenses/models" + "expenses/expenses/repo/pgdb/pgsqlc" +) + +func mapRepoUser(ru pgsqlc.User) mod.User { + return mod.User{ + UserID: ru.UserID, + UserName: ru.UserName, + } +} + +func mapRepoUsers(ru []pgsqlc.User) mod.Users { + users := make(mod.Users, len(ru)) + for k, u := range ru { + users[k] = mapRepoUser(u) + } + return users +} diff --git a/src/expenses/db/repository/categories.sql.go b/src/expenses/repo/pgdb/pgsqlc/categories.sql.go similarity index 99% rename from src/expenses/db/repository/categories.sql.go rename to src/expenses/repo/pgdb/pgsqlc/categories.sql.go index 408741a..7a5dfcf 100644 --- a/src/expenses/db/repository/categories.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/categories.sql.go @@ -3,7 +3,7 @@ // sqlc v1.29.0 // source: categories.sql -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/repository/db.go b/src/expenses/repo/pgdb/pgsqlc/db.go similarity index 96% rename from src/expenses/db/repository/db.go rename to src/expenses/repo/pgdb/pgsqlc/db.go index 89e33c0..96ba66b 100644 --- a/src/expenses/db/repository/db.go +++ b/src/expenses/repo/pgdb/pgsqlc/db.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.29.0 -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/repository/expenses.sql.go b/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go similarity index 99% rename from src/expenses/db/repository/expenses.sql.go rename to src/expenses/repo/pgdb/pgsqlc/expenses.sql.go index f5777a9..020d530 100644 --- a/src/expenses/db/repository/expenses.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go @@ -3,7 +3,7 @@ // sqlc v1.29.0 // source: expenses.sql -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/repository/models.go b/src/expenses/repo/pgdb/pgsqlc/models.go similarity index 98% rename from src/expenses/db/repository/models.go rename to src/expenses/repo/pgdb/pgsqlc/models.go index 9739845..00aec59 100644 --- a/src/expenses/db/repository/models.go +++ b/src/expenses/repo/pgdb/pgsqlc/models.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.29.0 -package repository +package pgsqlc import ( "github.com/jackc/pgx/v5/pgtype" diff --git a/src/expenses/db/repository/payments.sql.go b/src/expenses/repo/pgdb/pgsqlc/payments.sql.go similarity index 99% rename from src/expenses/db/repository/payments.sql.go rename to src/expenses/repo/pgdb/pgsqlc/payments.sql.go index 284179e..f5b7737 100644 --- a/src/expenses/db/repository/payments.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/payments.sql.go @@ -3,7 +3,7 @@ // sqlc v1.29.0 // source: payments.sql -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/repository/shares.sql.go b/src/expenses/repo/pgdb/pgsqlc/shares.sql.go similarity index 99% rename from src/expenses/db/repository/shares.sql.go rename to src/expenses/repo/pgdb/pgsqlc/shares.sql.go index f48acb3..fcaf0ec 100644 --- a/src/expenses/db/repository/shares.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/shares.sql.go @@ -3,7 +3,7 @@ // sqlc v1.29.0 // source: shares.sql -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/repository/stores.sql.go b/src/expenses/repo/pgdb/pgsqlc/stores.sql.go similarity index 98% rename from src/expenses/db/repository/stores.sql.go rename to src/expenses/repo/pgdb/pgsqlc/stores.sql.go index ccabbf6..837a1ec 100644 --- a/src/expenses/db/repository/stores.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/stores.sql.go @@ -3,7 +3,7 @@ // sqlc v1.29.0 // source: stores.sql -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/repository/types.sql.go b/src/expenses/repo/pgdb/pgsqlc/types.sql.go similarity index 98% rename from src/expenses/db/repository/types.sql.go rename to src/expenses/repo/pgdb/pgsqlc/types.sql.go index 55f19e4..44d8474 100644 --- a/src/expenses/db/repository/types.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/types.sql.go @@ -3,7 +3,7 @@ // sqlc v1.29.0 // source: types.sql -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/repository/users.sql.go b/src/expenses/repo/pgdb/pgsqlc/users.sql.go similarity index 97% rename from src/expenses/db/repository/users.sql.go rename to src/expenses/repo/pgdb/pgsqlc/users.sql.go index 4b5c6d5..2d2f23c 100644 --- a/src/expenses/db/repository/users.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/users.sql.go @@ -3,7 +3,7 @@ // sqlc v1.29.0 // source: users.sql -package repository +package pgsqlc import ( "context" diff --git a/src/expenses/db/queries/categories.sql b/src/expenses/repo/pgdb/queries/categories.sql similarity index 100% rename from src/expenses/db/queries/categories.sql rename to src/expenses/repo/pgdb/queries/categories.sql diff --git a/src/expenses/db/queries/expenses.sql b/src/expenses/repo/pgdb/queries/expenses.sql similarity index 100% rename from src/expenses/db/queries/expenses.sql rename to src/expenses/repo/pgdb/queries/expenses.sql diff --git a/src/expenses/db/queries/payments.sql b/src/expenses/repo/pgdb/queries/payments.sql similarity index 100% rename from src/expenses/db/queries/payments.sql rename to src/expenses/repo/pgdb/queries/payments.sql diff --git a/src/expenses/db/queries/shares.sql b/src/expenses/repo/pgdb/queries/shares.sql similarity index 100% rename from src/expenses/db/queries/shares.sql rename to src/expenses/repo/pgdb/queries/shares.sql diff --git a/src/expenses/db/queries/stores.sql b/src/expenses/repo/pgdb/queries/stores.sql similarity index 100% rename from src/expenses/db/queries/stores.sql rename to src/expenses/repo/pgdb/queries/stores.sql diff --git a/src/expenses/db/queries/types.sql b/src/expenses/repo/pgdb/queries/types.sql similarity index 100% rename from src/expenses/db/queries/types.sql rename to src/expenses/repo/pgdb/queries/types.sql diff --git a/src/expenses/db/queries/users.sql b/src/expenses/repo/pgdb/queries/users.sql similarity index 100% rename from src/expenses/db/queries/users.sql rename to src/expenses/repo/pgdb/queries/users.sql diff --git a/src/expenses/db/schema.sql b/src/expenses/repo/pgdb/schema.sql similarity index 100% rename from src/expenses/db/schema.sql rename to src/expenses/repo/pgdb/schema.sql diff --git a/src/expenses/db/sqlc.yaml b/src/expenses/repo/pgdb/sqlc.yaml similarity index 83% rename from src/expenses/db/sqlc.yaml rename to src/expenses/repo/pgdb/sqlc.yaml index d5a89a0..d580e09 100644 --- a/src/expenses/db/sqlc.yaml +++ b/src/expenses/repo/pgdb/sqlc.yaml @@ -6,8 +6,8 @@ sql: gen: go: sql_package: "pgx/v5" - package: "repository" - out: "repository" + package: "pgsqlc" + out: "pgsqlc" rename: expenseTypes: "ExpenseTypes" expenseShares: "ExpenseShares" diff --git a/src/expenses/repo/storeRepo.go b/src/expenses/repo/storeRepo.go new file mode 100644 index 0000000..9544d51 --- /dev/null +++ b/src/expenses/repo/storeRepo.go @@ -0,0 +1,14 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" +) + +type StoreRepository interface { + Get(ctx context.Context, id int32) (mod.Store, error) + GetAll(ctx context.Context) (mod.Stores, error) + Update(ctx context.Context, cat mod.Store) error + Insert(ctx context.Context, cat mod.Store) error + Delete(ctx context.Context, id int32) error +} diff --git a/src/expenses/repo/typeRepo.go b/src/expenses/repo/typeRepo.go new file mode 100644 index 0000000..53f9e5b --- /dev/null +++ b/src/expenses/repo/typeRepo.go @@ -0,0 +1,14 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" +) + +type TypeRepository interface { + Get(ctx context.Context, id int32) (mod.Type, error) + GetAll(ctx context.Context) (mod.Types, error) + Update(ctx context.Context, typ mod.Type) error + Insert(ctx context.Context, typ mod.Type) error + Delete(ctx context.Context, id int32) error +} diff --git a/src/expenses/repo/userRepo.go b/src/expenses/repo/userRepo.go new file mode 100644 index 0000000..f71abc7 --- /dev/null +++ b/src/expenses/repo/userRepo.go @@ -0,0 +1,10 @@ +package repo + +import ( + "context" + mod "expenses/expenses/models" +) + +type UserRepository interface { + GetAll(ctx context.Context) (mod.Users, error) +} diff --git a/src/go.mod b/src/go.mod index 998f10d..5502f1e 100644 --- a/src/go.mod +++ b/src/go.mod @@ -30,6 +30,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/leodido/go-urn v1.4.0 // indirect @@ -45,6 +46,7 @@ require ( golang.org/x/arch v0.8.0 // indirect golang.org/x/crypto v0.36.0 // indirect golang.org/x/net v0.38.0 // indirect + golang.org/x/sync v0.12.0 // indirect golang.org/x/sys v0.31.0 // indirect golang.org/x/text v0.23.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/src/pages/expensesHelper.go b/src/pages/expensesHelper.go index 6b1383b..df56d2d 100644 --- a/src/pages/expensesHelper.go +++ b/src/pages/expensesHelper.go @@ -17,7 +17,7 @@ func processFormShares(c *gin.Context) ([]mod.Share, error) { return expenses.ParseFormShares(userIDS, shares, shareIDs) } -func processFormPayments(c *gin.Context) ([]mod.ExpensePayment, error) { +func processFormPayments(c *gin.Context) ([]mod.Payment, error) { userIDs := c.PostFormArray("payments-user-ids[]") paymentIDs := c.PostFormArray("payments-ids[]") values := c.PostFormArray("payments-payment[]")