From 31f596a1509d643db28aa64cc94bb918fa62174b Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Tue, 5 Aug 2025 13:57:37 +0100 Subject: [PATCH] Whatever I'm doing here I think I will regret it, sqlc migration --- src/TODO.md | 3 + src/assets/css/aesthetic.css | 14 +-- src/assets/css/main.scss | 4 +- src/assets/htmx/expense.html | 14 +-- src/assets/htmx/expensePaymentsTable.html | 10 +- src/assets/htmx/expenseShares.html | 6 +- src/assets/htmx/expenses.html | 8 +- src/assets/htmx/terminal.html | 5 +- src/expenses/categories.go | 35 ++++--- src/expenses/categoriesMapper.go | 20 ++++ src/expenses/db/queries/categories.sql | 9 ++ src/expenses/db/queries/expenses.sql | 11 ++ src/expenses/db/queries/stores.sql | 14 +++ src/expenses/db/queries/types.sql | 14 +++ src/expenses/db/repository/categories.sql.go | 30 ++++++ src/expenses/db/repository/expenses.sql.go | 37 +++++++ src/expenses/db/repository/stores.sql.go | 78 ++++++++++++++ src/expenses/db/repository/types.sql.go | 78 ++++++++++++++ src/expenses/expenseDebts.go | 2 +- src/expenses/expenseDebts_aux.go | 14 +-- src/expenses/expenseDebts_test.go | 8 +- src/expenses/expensePayments.go | 16 +-- src/expenses/expensePaymentsDomainModel.go | 30 ++++++ src/expenses/expenseShares.go | 16 +-- src/expenses/expenseSummary.go | 4 +- src/expenses/expenses.go | 103 ++++++++----------- src/expenses/expensesDomainModel.go | 98 ++++++++++++++++++ src/expenses/expensesSharesDomainModel.go | 30 ++++++ src/expenses/stores.go | 70 +++++-------- src/expenses/storesMapper.go | 18 ++++ src/expenses/types.go | 64 ++++++------ src/expenses/typesMapper.go | 18 ++++ src/expenses/users.go | 2 +- src/pages/categories.go | 13 +-- src/pages/expenses.go | 10 +- src/pages/expensesHelper.go | 40 +++---- src/pages/overview.go | 6 +- src/pages/payments.go | 2 +- src/pages/stores.go | 15 +-- src/pages/types.go | 15 +-- 40 files changed, 715 insertions(+), 269 deletions(-) create mode 100644 src/expenses/categoriesMapper.go create mode 100644 src/expenses/db/queries/stores.sql create mode 100644 src/expenses/db/queries/types.sql create mode 100644 src/expenses/db/repository/stores.sql.go create mode 100644 src/expenses/db/repository/types.sql.go create mode 100644 src/expenses/expensePaymentsDomainModel.go create mode 100644 src/expenses/expensesDomainModel.go create mode 100644 src/expenses/expensesSharesDomainModel.go create mode 100644 src/expenses/storesMapper.go create mode 100644 src/expenses/typesMapper.go diff --git a/src/TODO.md b/src/TODO.md index eb13f7c..3b3257b 100644 --- a/src/TODO.md +++ b/src/TODO.md @@ -7,3 +7,6 @@ used - [ ] Debts table - [ ] Ability to export data in multiple formats and with a selection of columns - [ ] Migrate every column named "ExpenseSomething" to "ExpSomething" +- [ ] Make the models just return errors and not do any handling themselves +- [ ] Reduce the size of the font file +- [ ] Add some migration tool diff --git a/src/assets/css/aesthetic.css b/src/assets/css/aesthetic.css index 8e1bb8c..60d12ee 100644 --- a/src/assets/css/aesthetic.css +++ b/src/assets/css/aesthetic.css @@ -30,19 +30,19 @@ opacity: 1; } 20% { - opacity: 1; + opacity: 1.1; } 40% { - opacity: 1.1; + opacity: 0.9; } 60% { - opacity: 1.1; + opacity: 1; } 80% { - opacity: 1.1; + opacity: 0.9; } 100% { - opacity: 0.9; + opacity: 1; } } @keyframes beam { @@ -340,7 +340,7 @@ dt { } .text-color { - color: var(--text-color) !important; + color: var(--text-color); } #container { @@ -414,7 +414,7 @@ dt { } .warning { - color: var(--warning-color); + color: var(--warning-color) !important; } @media (max-width: 900px) { diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 0ac2aca..e6fa942 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -128,7 +128,7 @@ dt { } .text-color { - color: var(--text-color) !important; + color: var(--text-color); } #container { @@ -210,7 +210,7 @@ dt { } .warning { - color: var(--warning-color); + color: var(--warning-color) !important; } @media (max-width: 900px) { diff --git a/src/assets/htmx/expense.html b/src/assets/htmx/expense.html index 7be9b9c..0a6c118 100644 --- a/src/assets/htmx/expense.html +++ b/src/assets/htmx/expense.html @@ -10,29 +10,29 @@ + value="{{ .expense.ExpID }}" id="expense-id"> {{ end }} + value="{{ .expense.Description }}" id="expense-desc"> + value="{{ formatDate .expense.Date }}" id="expense-date"> + value="{{ formatPrice .expense.Value }}" id="expense-value"> @@ -71,7 +71,7 @@ {{ end }} diff --git a/src/assets/htmx/expensePaymentsTable.html b/src/assets/htmx/expensePaymentsTable.html index 1832c04..9194782 100644 --- a/src/assets/htmx/expensePaymentsTable.html +++ b/src/assets/htmx/expensePaymentsTable.html @@ -21,7 +21,7 @@ @@ -38,10 +38,10 @@ {{ range .payments }} {{ $payment := . }} - + + value="{{ $payment.ExpPaymID }}" class="tui-input"> + value="{{ formatPrice $payment.PayedAmount }}" class="tui-input"> diff --git a/src/assets/htmx/expenseShares.html b/src/assets/htmx/expenseShares.html index 4db4850..7e563fd 100644 --- a/src/assets/htmx/expenseShares.html +++ b/src/assets/htmx/expenseShares.html @@ -20,7 +20,7 @@ @@ -40,7 +40,7 @@ + value="{{ $share.ExpShareID }}" class="tui-input"> + value="{{ $share.Share }}" class="tui-input"> diff --git a/src/assets/htmx/expenses.html b/src/assets/htmx/expenses.html index bcadef1..aa60c27 100644 --- a/src/assets/htmx/expenses.html +++ b/src/assets/htmx/expenses.html @@ -11,10 +11,10 @@ {{ range .expenses }} - {{ .Expense.ExpID }} - {{ .Expense.Description }} - {{ formatPrice .Expense.Value }} - {{ formatDate .Expense.ExpDate }} + {{ .ExpID }} + {{ .Description }} + {{ formatPrice .Value }} + {{ formatDate .Date }} {{ .Category.CategoryName }} {{ end }} diff --git a/src/assets/htmx/terminal.html b/src/assets/htmx/terminal.html index 7000a24..8b4ce52 100644 --- a/src/assets/htmx/terminal.html +++ b/src/assets/htmx/terminal.html @@ -19,9 +19,8 @@
- - EXPENSES + + EXPENSES
{{ if .renderNavBar }} diff --git a/src/expenses/categories.go b/src/expenses/categories.go index 874974f..88bb0c7 100644 --- a/src/expenses/categories.go +++ b/src/expenses/categories.go @@ -16,7 +16,7 @@ var ( ) type Category struct { - CategoryID int + CategoryID int64 CategoryName string } @@ -27,7 +27,7 @@ func NewCategory() Category { } } -func GetAllCategories() ([]repo.Category, error) { +func GetAllCategories() ([]Category, error) { cfg := config.GetInstance() ctx := context.Background() @@ -40,30 +40,31 @@ func GetAllCategories() ([]repo.Category, error) { queries := repo.New(db) categories, err := queries.GetCategories(ctx) if err != nil { - return []repo.Category{}, nil + return []Category{}, nil } - return categories, nil + return mapRepoCategories(categories), nil } -func GetCategory(catID int64) (repo.Category, error) { +func GetCategory(catID int64) (Category, error) { cfg := config.GetInstance() ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return repo.Category{}, err + return Category{}, err } defer db.Close() queries := repo.New(db) category, err := queries.GetCategory(ctx, catID) - return category, nil + return mapRepoCategory(category), err } func (cat *Category) Insert() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -71,8 +72,8 @@ func (cat *Category) Insert() error { } defer db.Close() - query := "INSERT INTO categories(CategoryName) VALUES(?)" - res, err := db.Exec(query, cat.CategoryName) + queries := repo.New(db) + res, err := queries.InsertCategory(ctx, cat.CategoryName) if err != nil { return err } @@ -89,6 +90,7 @@ func (cat *Category) Insert() error { func (cat *Category) Delete() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -96,11 +98,8 @@ func (cat *Category) Delete() error { } defer db.Close() - query := "DELETE FROM categories WHERE CategoryID = ?" - res, err := db.Exec(query, cat.CategoryID) - if err != nil { - return err - } + queries := repo.New(db) + res, err := queries.DeleteCategory(ctx, cat.CategoryID) rowsAffected, err := res.RowsAffected() if err != nil { @@ -114,6 +113,7 @@ func (cat *Category) Delete() error { func (cat *Category) Update() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -121,8 +121,11 @@ func (cat *Category) Update() error { } defer db.Close() - query := "UPDATE categories SET CategoryName = ? WHERE CategoryID = ?" - res, err := db.Exec(query, cat.CategoryName, cat.CategoryID) + queries := repo.New(db) + res, err := queries.UpdateCategory(ctx, repo.UpdateCategoryParams{ + CategoryName: cat.CategoryName, + CategoryID: cat.CategoryID, + }) if err != nil { return err } diff --git a/src/expenses/categoriesMapper.go b/src/expenses/categoriesMapper.go new file mode 100644 index 0000000..3d4a298 --- /dev/null +++ b/src/expenses/categoriesMapper.go @@ -0,0 +1,20 @@ +package expenses + +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/db/queries/categories.sql b/src/expenses/db/queries/categories.sql index bf3ae03..fdc5116 100644 --- a/src/expenses/db/queries/categories.sql +++ b/src/expenses/db/queries/categories.sql @@ -3,3 +3,12 @@ SELECT * FROM categories; -- name: GetCategory :one SELECT * FROM categories WHERE "CategoryID" = ?; + +-- name: UpdateCategory :execresult +UPDATE categories SET "CategoryName" = ? WHERE "CategoryID" = ?; + +-- name: DeleteCategory :execresult +DELETE FROM categories WHERE "CategoryID" = ?; + +-- name: InsertCategory :execresult +INSERT INTO categories("CategoryName") VALUES(?) diff --git a/src/expenses/db/queries/expenses.sql b/src/expenses/db/queries/expenses.sql index b033d4d..908b766 100644 --- a/src/expenses/db/queries/expenses.sql +++ b/src/expenses/db/queries/expenses.sql @@ -33,3 +33,14 @@ JOIN "expenseTypes" as types ON types.TypeID = expenses.TypeID WHERE "ExpID" = ?; + +-- name: InsertExpense :execresult +INSERT INTO expenses( + "Description","Value", + "StoreID", + "CategoryID", + "TypeID", + "OwnerUserID", + "ExpDate","CreationDate" +) +VALUES(?, ?, ? , ?, ?, ?, ?, ?); diff --git a/src/expenses/db/queries/stores.sql b/src/expenses/db/queries/stores.sql new file mode 100644 index 0000000..3085926 --- /dev/null +++ b/src/expenses/db/queries/stores.sql @@ -0,0 +1,14 @@ +-- name: GetStores :many +SELECT * FROM stores; + +-- name: GetStore :one +SELECT * FROM stores WHERE "StoreID" = ?; + +-- name: InsertStore :execresult +INSERT INTO stores("StoreName") VALUES(?); + +-- name: UpdateStore :execresult +UPDATE stores SET "StoreName" = ? WHERE "StoreID" = ?; + +-- name: DeleteStore :execresult +DELETE FROM stores WHERE "StoreID" = ?; diff --git a/src/expenses/db/queries/types.sql b/src/expenses/db/queries/types.sql new file mode 100644 index 0000000..073fda6 --- /dev/null +++ b/src/expenses/db/queries/types.sql @@ -0,0 +1,14 @@ +-- name: GetTypes :many +SELECT * FROM "expenseTypes"; + +-- name: GetType :one +SELECT * FROM "expenseTypes" WHERE "TypeID" = ?; + +-- name: InsertType :execresult +INSERT INTO "expenseTypes"("TypeName") VALUES(?); + +-- name: UpdateType :execresult +UPDATE expenseTypes SET "TypeName" = ? WHERE "TypeID" = ?; + +-- name: DeleteType :execresult +DELETE FROM "expenseTypes" WHERE "TypeID" = ?; diff --git a/src/expenses/db/repository/categories.sql.go b/src/expenses/db/repository/categories.sql.go index 584e997..a011148 100644 --- a/src/expenses/db/repository/categories.sql.go +++ b/src/expenses/db/repository/categories.sql.go @@ -7,8 +7,17 @@ package repository import ( "context" + "database/sql" ) +const deleteCategory = `-- name: DeleteCategory :execresult +DELETE FROM categories WHERE "CategoryID" = ? +` + +func (q *Queries) DeleteCategory(ctx context.Context, categoryid int64) (sql.Result, error) { + return q.db.ExecContext(ctx, deleteCategory, categoryid) +} + const getCategories = `-- name: GetCategories :many SELECT CategoryID, CategoryName FROM categories ` @@ -46,3 +55,24 @@ func (q *Queries) GetCategory(ctx context.Context, categoryid int64) (Category, err := row.Scan(&i.CategoryID, &i.CategoryName) return i, err } + +const insertCategory = `-- name: InsertCategory :execresult +INSERT INTO categories("CategoryName") VALUES(?) +` + +func (q *Queries) InsertCategory(ctx context.Context, categoryname string) (sql.Result, error) { + return q.db.ExecContext(ctx, insertCategory, categoryname) +} + +const updateCategory = `-- name: UpdateCategory :execresult +UPDATE categories SET "CategoryName" = ? WHERE "CategoryID" = ? +` + +type UpdateCategoryParams struct { + CategoryName string + CategoryID int64 +} + +func (q *Queries) UpdateCategory(ctx context.Context, arg UpdateCategoryParams) (sql.Result, error) { + return q.db.ExecContext(ctx, updateCategory, arg.CategoryName, arg.CategoryID) +} diff --git a/src/expenses/db/repository/expenses.sql.go b/src/expenses/db/repository/expenses.sql.go index 4a15daa..701a23a 100644 --- a/src/expenses/db/repository/expenses.sql.go +++ b/src/expenses/db/repository/expenses.sql.go @@ -7,6 +7,7 @@ package repository import ( "context" + "database/sql" ) const getExpense = `-- name: GetExpense :one @@ -130,3 +131,39 @@ func (q *Queries) GetExpenses(ctx context.Context) ([]GetExpensesRow, error) { } return items, nil } + +const insertExpense = `-- name: InsertExpense :execresult +INSERT INTO expenses( + "Description","Value", + "StoreID", + "CategoryID", + "TypeID", + "OwnerUserID", + "ExpDate","CreationDate" +) +VALUES(?, ?, ? , ?, ?, ?, ?, ?) +` + +type InsertExpenseParams struct { + Description string + Value float64 + StoreID int64 + CategoryID int64 + TypeID int64 + OwnerUserID int64 + ExpDate int64 + CreationDate int64 +} + +func (q *Queries) InsertExpense(ctx context.Context, arg InsertExpenseParams) (sql.Result, error) { + return q.db.ExecContext(ctx, insertExpense, + arg.Description, + arg.Value, + arg.StoreID, + arg.CategoryID, + arg.TypeID, + arg.OwnerUserID, + arg.ExpDate, + arg.CreationDate, + ) +} diff --git a/src/expenses/db/repository/stores.sql.go b/src/expenses/db/repository/stores.sql.go new file mode 100644 index 0000000..b1ace64 --- /dev/null +++ b/src/expenses/db/repository/stores.sql.go @@ -0,0 +1,78 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: stores.sql + +package repository + +import ( + "context" + "database/sql" +) + +const deleteStore = `-- name: DeleteStore :execresult +DELETE FROM stores WHERE "StoreID" = ? +` + +func (q *Queries) DeleteStore(ctx context.Context, storeid int64) (sql.Result, error) { + return q.db.ExecContext(ctx, deleteStore, storeid) +} + +const getStore = `-- name: GetStore :one +SELECT StoreID, StoreName FROM stores WHERE "StoreID" = ? +` + +func (q *Queries) GetStore(ctx context.Context, storeid int64) (Store, error) { + row := q.db.QueryRowContext(ctx, getStore, storeid) + var i Store + err := row.Scan(&i.StoreID, &i.StoreName) + return i, err +} + +const getStores = `-- name: GetStores :many +SELECT StoreID, StoreName FROM stores +` + +func (q *Queries) GetStores(ctx context.Context) ([]Store, error) { + rows, err := q.db.QueryContext(ctx, getStores) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Store + for rows.Next() { + var i Store + if err := rows.Scan(&i.StoreID, &i.StoreName); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const insertStore = `-- name: InsertStore :execresult +INSERT INTO stores("StoreName") VALUES(?) +` + +func (q *Queries) InsertStore(ctx context.Context, storename string) (sql.Result, error) { + return q.db.ExecContext(ctx, insertStore, storename) +} + +const updateStore = `-- name: UpdateStore :execresult +UPDATE stores SET "StoreName" = ? WHERE "StoreID" = ? +` + +type UpdateStoreParams struct { + StoreName string + StoreID int64 +} + +func (q *Queries) UpdateStore(ctx context.Context, arg UpdateStoreParams) (sql.Result, error) { + return q.db.ExecContext(ctx, updateStore, arg.StoreName, arg.StoreID) +} diff --git a/src/expenses/db/repository/types.sql.go b/src/expenses/db/repository/types.sql.go new file mode 100644 index 0000000..b1ad84c --- /dev/null +++ b/src/expenses/db/repository/types.sql.go @@ -0,0 +1,78 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: types.sql + +package repository + +import ( + "context" + "database/sql" +) + +const deleteType = `-- name: DeleteType :execresult +DELETE FROM "expenseTypes" WHERE "TypeID" = ? +` + +func (q *Queries) DeleteType(ctx context.Context, typeid int64) (sql.Result, error) { + return q.db.ExecContext(ctx, deleteType, typeid) +} + +const getType = `-- name: GetType :one +SELECT TypeID, TypeName FROM "expenseTypes" WHERE "TypeID" = ? +` + +func (q *Queries) GetType(ctx context.Context, typeid int64) (ExpenseType, error) { + row := q.db.QueryRowContext(ctx, getType, typeid) + var i ExpenseType + err := row.Scan(&i.TypeID, &i.TypeName) + return i, err +} + +const getTypes = `-- name: GetTypes :many +SELECT TypeID, TypeName FROM "expenseTypes" +` + +func (q *Queries) GetTypes(ctx context.Context) ([]ExpenseType, error) { + rows, err := q.db.QueryContext(ctx, getTypes) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ExpenseType + for rows.Next() { + var i ExpenseType + if err := rows.Scan(&i.TypeID, &i.TypeName); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const insertType = `-- name: InsertType :execresult +INSERT INTO "expenseTypes"("TypeName") VALUES(?) +` + +func (q *Queries) InsertType(ctx context.Context, typename string) (sql.Result, error) { + return q.db.ExecContext(ctx, insertType, typename) +} + +const updateType = `-- name: UpdateType :execresult +UPDATE expenseTypes SET "TypeName" = ? WHERE "TypeID" = ? +` + +type UpdateTypeParams struct { + TypeName string + TypeID int64 +} + +func (q *Queries) UpdateType(ctx context.Context, arg UpdateTypeParams) (sql.Result, error) { + return q.db.ExecContext(ctx, updateType, arg.TypeName, arg.TypeID) +} diff --git a/src/expenses/expenseDebts.go b/src/expenses/expenseDebts.go index 36141b6..6616a36 100644 --- a/src/expenses/expenseDebts.go +++ b/src/expenses/expenseDebts.go @@ -2,7 +2,7 @@ package expenses type Debt struct { Debtor User - Sum float32 + Sum float64 } func sortBySum(a, b Debt) int { diff --git a/src/expenses/expenseDebts_aux.go b/src/expenses/expenseDebts_aux.go index c5ef4d7..3f2992e 100644 --- a/src/expenses/expenseDebts_aux.go +++ b/src/expenses/expenseDebts_aux.go @@ -1,16 +1,16 @@ package expenses type DebtCalculator struct { - Shares map[User]float32 - Payments map[User]float32 - Expense *Expense + Shares map[User]float64 + Payments map[User]float64 + Expense *Expense } func NewDebtCalculator(e *Expense) *DebtCalculator { return &DebtCalculator{ - Shares: make(map[User]float32), - Payments: make(map[User]float32), - Expense: e, + Shares: make(map[User]float64), + Payments: make(map[User]float64), + Expense: e, } } @@ -28,7 +28,7 @@ func (dc *DebtCalculator) mapPayments() { } func (dc *DebtCalculator) getDebts() []Debt { - debts := []Debt{} + debts := []Debt{} for user := range dc.Payments { debt := (dc.Shares[user] * dc.Expense.Value) - dc.Payments[user] diff --git a/src/expenses/expenseDebts_test.go b/src/expenses/expenseDebts_test.go index 0c10dfa..7038997 100644 --- a/src/expenses/expenseDebts_test.go +++ b/src/expenses/expenseDebts_test.go @@ -67,19 +67,19 @@ func TestCalculateDebtsTestCase1(t *testing.T) { ExpID: 1, Description: "Test Exp", Value: 150.0, - ExpType: Type{ + Type: Type{ TypeID: 1, TypeName: "Despesa", }, - ExpCategory: Category{ + Category: Category{ CategoryID: 0, CategoryName: "Groceries", }, - OwnerUser: User{ + Owner: User{ UserID: 1, UserName: "ESilva", }, - ExpDate: 1753307982, + Date: 1753307982, Payments: []ExpensePayment{ { ExpPaymID: 0, diff --git a/src/expenses/expensePayments.go b/src/expenses/expensePayments.go index 7e4c7b2..83ddc94 100644 --- a/src/expenses/expensePayments.go +++ b/src/expenses/expensePayments.go @@ -11,32 +11,26 @@ import ( _ "github.com/mattn/go-sqlite3" ) -type ExpensePayment struct { - ExpPaymID int - User User - PayedAmount float32 -} - -func GetPayments(expID int64) ([]repository.GetPaymentsRow, error) { +func GetPayments(expID int64) ([]ExpensePayment, error) { cfg := config.GetInstance() ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return []repository.GetPaymentsRow{}, err + return []ExpensePayment{}, err } defer db.Close() queries := repository.New(db) payments, err := queries.GetPayments(ctx, expID) if err != nil { - return []repository.GetPaymentsRow{}, err + return []ExpensePayment{}, err } - return payments, nil + return mapRepoGetPaymentsRows(payments), nil } -func (p *ExpensePayment) Insert(expID int) error { +func (p *ExpensePayment) Insert(expID int64) error { cfg := config.GetInstance() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") diff --git a/src/expenses/expensePaymentsDomainModel.go b/src/expenses/expensePaymentsDomainModel.go new file mode 100644 index 0000000..5628f61 --- /dev/null +++ b/src/expenses/expensePaymentsDomainModel.go @@ -0,0 +1,30 @@ +package expenses + +import ( + repo "expenses/expenses/db/repository" +) + +type ExpensePayment struct { + ExpPaymID int64 + User User + PayedAmount float64 +} + +func mapRepoGetPaymentsRow(s repo.GetPaymentsRow) ExpensePayment { + return ExpensePayment{ + ExpPaymID: s.ExpensesPayment.ExpPaymID, + PayedAmount: s.ExpensesPayment.Payed, + User: User{ + UserID: s.User.UserID, + UserName: s.User.UserName, + }, + } +} + +func mapRepoGetPaymentsRows(ep []repo.GetPaymentsRow) []ExpensePayment { + payments := make([]ExpensePayment, len(ep)) + for k, exp := range ep { + payments[k] = mapRepoGetPaymentsRow(exp) + } + return payments +} diff --git a/src/expenses/expenseShares.go b/src/expenses/expenseShares.go index 885f008..a330fe8 100644 --- a/src/expenses/expenseShares.go +++ b/src/expenses/expenseShares.go @@ -11,32 +11,26 @@ import ( _ "github.com/mattn/go-sqlite3" ) -type ExpenseShare struct { - ExpShareID int - User User - Share float32 -} - -func GetShares(expID int64) ([]repository.GetSharesRow, error) { +func GetShares(expID int64) ([]ExpenseShare, error) { cfg := config.GetInstance() ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return []repository.GetSharesRow{}, err + return []ExpenseShare{}, err } defer db.Close() queries := repository.New(db) shares, err := queries.GetShares(ctx, expID) if err != nil { - return []repository.GetSharesRow{}, err + return []ExpenseShare{}, err } - return shares, nil + return mapRepoGetSharesRows(shares), nil } -func (sh *ExpenseShare) Insert(expID int) error { +func (sh *ExpenseShare) Insert(expID int64) error { cfg := config.GetInstance() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") diff --git a/src/expenses/expenseSummary.go b/src/expenses/expenseSummary.go index b4b5a07..f208684 100644 --- a/src/expenses/expenseSummary.go +++ b/src/expenses/expenseSummary.go @@ -2,8 +2,8 @@ package expenses type UserExpenseSummary struct { User User - Share float32 - PayedTotal float32 + Share float64 + PayedTotal float64 } func NewUserExpenseSummary() UserExpenseSummary { diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index 7900dcc..a5e94a2 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -3,7 +3,7 @@ package expenses import ( "context" "expenses/config" - "expenses/expenses/db/repository" + repo "expenses/expenses/db/repository" "database/sql" "fmt" @@ -12,75 +12,47 @@ import ( _ "github.com/mattn/go-sqlite3" ) -type Expense struct { - ExpID int - Description string - Value float32 - ExpStore Store - ExpType Type - ExpCategory Category - OwnerUser User - ExpDate int64 - Payments []ExpensePayment - Shares []ExpenseShare - CreationDate int64 -} - -func NewExpense() Expense { - return Expense{ - ExpID: -1, - Description: "", - Value: 0.0, - ExpStore: NewStore(), - ExpCategory: NewCategory(), - OwnerUser: NewUser(), - ExpDate: 0, - Payments: []ExpensePayment{}, - Shares: []ExpenseShare{}, - CreationDate: 0, - } -} - -func GetAllExpenses() ([]repository.GetExpensesRow, error) { +func GetAllExpenses() ([]Expense, error) { cfg := config.GetInstance() ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return nil, err + return []Expense{}, err } defer db.Close() - queries := repository.New(db) + queries := repo.New(db) expenses, err := queries.GetExpenses(ctx) if err != nil { - return nil, err + return []Expense{}, err } - return expenses, nil + return mapRepoGetExpensesRows(expenses), nil } -func GetExpense(expID int64) (repository.GetExpenseRow, error) { +func GetExpense(expID int64) (Expense, error) { cfg := config.GetInstance() ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return repository.GetExpenseRow{}, err + return Expense{}, err } defer db.Close() - queries := repository.New(db) + queries := repo.New(db) expense, err := queries.GetExpense(ctx, expID) if err != nil { - return repository.GetExpenseRow{}, err + return Expense{}, err } - return expense, nil + return mapRepoGetExpenseRow(expense), nil } func (exp *Expense) Insert() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -88,16 +60,23 @@ func (exp *Expense) Insert() error { } defer db.Close() - query := "INSERT INTO expenses(" + - "Description,Value,StoreID,CategoryID,TypeID,OwnerUserID,ExpDate,CreationDate" + - ") " + - "VALUES(?, ?, ? , ?, ?, ?, ?, ?)" + tx, err := db.Begin() + if err != nil { + return err + } + defer tx.Rollback() - // TODO - // Add a transaction here so that it fails when necessary - res, err := db.Exec(query, exp.Description, exp.Value, exp.ExpStore.StoreID, - exp.ExpCategory.CategoryID, exp.ExpType.TypeID, 1, exp.ExpDate, exp.CreationDate, - ) + queries := repo.New(tx) + res, err := queries.InsertExpense(ctx, repo.InsertExpenseParams{ + Description: exp.Description, + Value: exp.Value, + StoreID: exp.Store.StoreID, + CategoryID: exp.Category.CategoryID, + TypeID: exp.Type.TypeID, + OwnerUserID: exp.Owner.UserID, + ExpDate: exp.Date, + CreationDate: exp.CreationDate, + }) if err != nil { return err } @@ -106,7 +85,9 @@ func (exp *Expense) Insert() error { if err != nil { return fmt.Errorf("failed to retrieve last inserted expense ID: %v", err) } - exp.ExpID = int(expenseID) + + exp.ExpID = expenseID + for _, share := range exp.Shares { err := share.Insert(exp.ExpID) if err != nil { @@ -127,6 +108,12 @@ func (exp *Expense) Insert() error { return fmt.Errorf("no rows were created") } + if err = tx.Commit(); err != nil { + // TODO + // Add some kind of log here otherwise we could jusr return the commit res + return err + } + return nil } @@ -151,9 +138,9 @@ func (exp *Expense) Update() error { "WHERE ExpID = ?" res, err := db.Exec(query, - exp.Description, exp.Value, exp.ExpStore.StoreID, - exp.ExpCategory.CategoryID, exp.ExpType.TypeID, exp.OwnerUser.UserID, - exp.ExpDate, exp.ExpID, + exp.Description, exp.Value, exp.Store.StoreID, + exp.Category.CategoryID, exp.Type.TypeID, exp.Owner.UserID, + exp.Date, exp.ExpID, ) if err != nil { return err @@ -236,7 +223,7 @@ func GetExpensesRange(start int64, end int64) ([]Expense, error) { "FROM expenses " + "JOIN Stores ON stores.StoreID = expenses.StoreID " + "JOIN Categories ON categories.CategoryID = expenses.CategoryID " + - "JOIN Users ON UserID = OwnerUserId "+ + "JOIN Users ON UserID = OwnerUserId " + "WHERE ExpDate >= ? and ExpDate <= ?" var expList []Expense @@ -249,10 +236,10 @@ func GetExpensesRange(start int64, end int64) ([]Expense, error) { exp := &Expense{} err := rows.Scan( &exp.ExpID, &exp.Description, &exp.Value, - &exp.ExpStore.StoreID, &exp.ExpStore.StoreName, - &exp.ExpCategory.CategoryID, &exp.ExpCategory.CategoryName, - &exp.OwnerUser.UserID, &exp.OwnerUser.UserName, - &exp.ExpDate, &exp.CreationDate, + &exp.Store.StoreID, &exp.Store.StoreName, + &exp.Category.CategoryID, &exp.Category.CategoryName, + &exp.Owner.UserID, &exp.Owner.UserName, + &exp.Date, &exp.CreationDate, ) if err != nil { log.Fatalf("Failed to parse data from db: %v", err) diff --git a/src/expenses/expensesDomainModel.go b/src/expenses/expensesDomainModel.go new file mode 100644 index 0000000..c522711 --- /dev/null +++ b/src/expenses/expensesDomainModel.go @@ -0,0 +1,98 @@ +package expenses + +import ( + repo "expenses/expenses/db/repository" +) + +type Expense struct { + ExpID int64 + Description string + Value float64 + Store Store + Type Type + Category Category + Owner User + Date int64 + Payments []ExpensePayment + Shares []ExpenseShare + CreationDate int64 +} + +func NewExpense() Expense { + return Expense{ + ExpID: -1, + Description: "", + Value: 0.0, + Store: NewStore(), + Category: NewCategory(), + Owner: NewUser(), + Date: 0, + Payments: []ExpensePayment{}, + Shares: []ExpenseShare{}, + CreationDate: 0, + } +} + +func mapRepoGetExpenseRow(e repo.GetExpenseRow) Expense { + return Expense{ + ExpID: e.Expense.ExpID, + Description: e.Expense.Description, + Value: e.Expense.Value, + Store: Store{ + StoreID: e.Store.StoreID, + StoreName: e.Store.StoreName, + }, + Type: Type{ + TypeID: e.ExpenseType.TypeID, + TypeName: e.ExpenseType.TypeName, + }, + Category: Category{ + CategoryID: e.Category.CategoryID, + CategoryName: e.Category.CategoryName, + }, + Owner: User{ + UserID: e.User.UserID, + UserName: e.User.UserName, + }, + Date: e.Expense.ExpDate, + Shares: []ExpenseShare{}, + Payments: []ExpensePayment{}, + CreationDate: e.Expense.CreationDate, + } +} + +func mapRepoGetExpenseRowMulti(e repo.GetExpensesRow) Expense { + return Expense{ + ExpID: e.Expense.ExpID, + Description: e.Expense.Description, + Value: e.Expense.Value, + Store: Store{ + StoreID: e.Store.StoreID, + StoreName: e.Store.StoreName, + }, + Type: Type{ + TypeID: e.ExpenseType.TypeID, + TypeName: e.ExpenseType.TypeName, + }, + Category: Category{ + CategoryID: e.Category.CategoryID, + CategoryName: e.Category.CategoryName, + }, + Owner: User{ + UserID: e.User.UserID, + UserName: e.User.UserName, + }, + Date: e.Expense.ExpDate, + Shares: []ExpenseShare{}, + Payments: []ExpensePayment{}, + CreationDate: e.Expense.CreationDate, + } +} + +func mapRepoGetExpensesRows(er []repo.GetExpensesRow) []Expense { + expenses := make([]Expense, len(er)) + for k, exp := range er { + expenses[k] = mapRepoGetExpenseRowMulti(exp) + } + return expenses +} diff --git a/src/expenses/expensesSharesDomainModel.go b/src/expenses/expensesSharesDomainModel.go new file mode 100644 index 0000000..cd4d216 --- /dev/null +++ b/src/expenses/expensesSharesDomainModel.go @@ -0,0 +1,30 @@ +package expenses + +import ( + repo "expenses/expenses/db/repository" +) + +type ExpenseShare struct { + ExpShareID int64 + User User + Share float64 +} + +func mapRepoGetSharesRow(s repo.GetSharesRow) ExpenseShare { + return ExpenseShare{ + ExpShareID: s.ExpensesShare.ExpShareID, + Share: s.ExpensesShare.Share, + User: User{ + UserID: s.User.UserID, + UserName: s.User.UserName, + }, + } +} + +func mapRepoGetSharesRows(es []repo.GetSharesRow) []ExpenseShare { + shares := make([]ExpenseShare, len(es)) + for k, exp := range es { + shares[k] = mapRepoGetSharesRow(exp) + } + return shares +} diff --git a/src/expenses/stores.go b/src/expenses/stores.go index 39941cc..fab4efc 100644 --- a/src/expenses/stores.go +++ b/src/expenses/stores.go @@ -1,17 +1,18 @@ package expenses import ( + "context" "expenses/config" + repo "expenses/expenses/db/repository" "database/sql" "fmt" - "log" _ "github.com/mattn/go-sqlite3" ) type Store struct { - StoreID int + StoreID int64 StoreName string } @@ -24,36 +25,26 @@ func NewStore() Store { func GetAllStores() ([]Store, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return nil, err + return []Store{}, err } defer db.Close() - query := "SELECT StoreID,StoreName " + - "FROM stores" - - var storeList []Store - rows, err := db.Query(query) + queries := repo.New(db) + storeList, err := queries.GetStores(ctx) if err != nil { - return nil, err + return []Store{}, err } - for rows.Next() { - store := &Store{} - err := rows.Scan(&store.StoreID, &store.StoreName) - if err != nil { - log.Fatalf("Failed to parse data from db: %v", err) - } - storeList = append(storeList, *store) - } - - return storeList, nil + return mapRepoStores(storeList), nil } -func GetStore(storeID int) (Store, error) { +func GetStore(storeID int64) (Store, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { @@ -61,21 +52,18 @@ func GetStore(storeID int) (Store, error) { } defer db.Close() - query := "SELECT StoreID,StoreName " + - "FROM stores " + - "WHERE StoreID = ?" - - store := Store{StoreID: -1} - err = db.QueryRow(query, storeID).Scan(&store.StoreID, &store.StoreName) + queries := repo.New(db) + store, err := queries.GetStore(ctx, storeID) if err != nil { - return Store{StoreID: -1}, nil + return Store{}, err } - return store, nil + return mapRepoStore(store), nil } func (s *Store) Insert() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -83,11 +71,8 @@ func (s *Store) Insert() error { } defer db.Close() - query := "INSERT INTO stores(StoreName) VALUES(?)" - res, err := db.Exec(query, s.StoreName) - if err != nil { - return err - } + queries := repo.New(db) + res, err := queries.InsertStore(ctx, s.StoreName) rowsAffected, err := res.RowsAffected() if err != nil { @@ -101,6 +86,7 @@ func (s *Store) Insert() error { func (s *Store) Update() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -108,11 +94,11 @@ func (s *Store) Update() error { } defer db.Close() - query := "UPDATE stores SET StoreName = ? WHERE StoreID = ?" - res, err := db.Exec(query, s.StoreName, s.StoreID) - if err != nil { - return err - } + queries := repo.New(db) + res, err := queries.UpdateStore(ctx, repo.UpdateStoreParams{ + StoreID: s.StoreID, + StoreName: s.StoreName, + }) rowsAffected, err := res.RowsAffected() if err != nil { @@ -126,6 +112,7 @@ func (s *Store) Update() error { func (s *Store) Delete() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -133,11 +120,8 @@ func (s *Store) Delete() error { } defer db.Close() - query := "DELETE FROM stores WHERE StoreID = ?" - res, err := db.Exec(query, s.StoreID) - if err != nil { - return err - } + queries := repo.New(db) + res, err := queries.DeleteStore(ctx, s.StoreID) rowsAffected, err := res.RowsAffected() if err != nil { diff --git a/src/expenses/storesMapper.go b/src/expenses/storesMapper.go new file mode 100644 index 0000000..f5e8b45 --- /dev/null +++ b/src/expenses/storesMapper.go @@ -0,0 +1,18 @@ +package expenses + +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/types.go b/src/expenses/types.go index 84ef662..3349ebc 100644 --- a/src/expenses/types.go +++ b/src/expenses/types.go @@ -1,17 +1,18 @@ package expenses import ( + "context" "expenses/config" + repo "expenses/expenses/db/repository" "database/sql" "fmt" - "log" _ "github.com/mattn/go-sqlite3" ) type Type struct { - TypeID int + TypeID int64 TypeName string } @@ -24,36 +25,26 @@ func NewType() Type { func GetAllTypes() ([]Type, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return nil, err + return []Type{}, err } defer db.Close() - query := "SELECT TypeID,TypeName " + - "FROM expenseTypes" - - var typeList []Type - rows, err := db.Query(query) + queries := repo.New(db) + typeList, err := queries.GetTypes(ctx) if err != nil { - return nil, err + return []Type{}, err } - for rows.Next() { - nType := &Type{} - err := rows.Scan(&nType.TypeID, &nType.TypeName) - if err != nil { - log.Fatalf("Failed to parse data from db: %v", err) - } - typeList = append(typeList, *nType) - } - - return typeList, nil + return mapRepoTypes(typeList), nil } -func GetType(typID int) (Type, error) { +func GetType(typID int64) (Type, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { @@ -61,21 +52,18 @@ func GetType(typID int) (Type, error) { } defer db.Close() - query := "SELECT TypeID,TypeName " + - "FROM expenseTypes " + - "WHERE TypeID = ?" - - nType := Type{TypeID: -1} - err = db.QueryRow(query, typID).Scan(&nType.TypeID, &nType.TypeName) + queries := repo.New(db) + typ, err := queries.GetType(ctx, typID) if err != nil { - return Type{TypeID: -1}, nil + return Type{}, err } - return nType, nil + return mapRepoType(typ), nil } func (typ *Type) Insert() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -83,12 +71,15 @@ func (typ *Type) Insert() error { } defer db.Close() - query := "INSERT INTO expenseTypes(TypeName) VALUES(?)" - res, err := db.Exec(query, typ.TypeName) + queries := repo.New(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, err := res.RowsAffected() if err != nil { return err @@ -101,6 +92,7 @@ func (typ *Type) Insert() error { func (typ *Type) Delete() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -108,8 +100,8 @@ func (typ *Type) Delete() error { } defer db.Close() - query := "DELETE FROM expenseTypes WHERE TypeID = ?" - res, err := db.Exec(query, typ.TypeID) + queries := repo.New(db) + res, err := queries.DeleteType(ctx, typ.TypeID) if err != nil { return err } @@ -126,6 +118,7 @@ func (typ *Type) Delete() error { func (typ *Type) Update() error { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { @@ -133,8 +126,11 @@ func (typ *Type) Update() error { } defer db.Close() - query := "UPDATE expenseTypes SET TypeName = ? WHERE TypeID = ?" - res, err := db.Exec(query, typ.TypeName, typ.TypeID) + queries := repo.New(db) + res, err := queries.UpdateType(ctx, repo.UpdateTypeParams{ + TypeID: typ.TypeID, + TypeName: typ.TypeName, + }) if err != nil { return err } diff --git a/src/expenses/typesMapper.go b/src/expenses/typesMapper.go new file mode 100644 index 0000000..864f213 --- /dev/null +++ b/src/expenses/typesMapper.go @@ -0,0 +1,18 @@ +package expenses + +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/users.go b/src/expenses/users.go index aca08eb..4f7deeb 100644 --- a/src/expenses/users.go +++ b/src/expenses/users.go @@ -10,7 +10,7 @@ import ( ) type User struct { - UserID int + UserID int64 UserName string } diff --git a/src/pages/categories.go b/src/pages/categories.go index df7ddc8..3bb9f36 100644 --- a/src/pages/categories.go +++ b/src/pages/categories.go @@ -82,19 +82,19 @@ func createCategory(c *gin.Context) { } func updateCategory(c *gin.Context) { - categoryID, err := strconv.Atoi(c.Param("id")) + categoryID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { NotFoundView(c, "No such category") return } categoryName := c.PostForm("category-name") - category := expenses.Category{ + cat := expenses.Category{ CategoryID: categoryID, CategoryName: categoryName, } - err = category.Update() + err = cat.Update() if err != nil { errMsg, _ := json.Marshal(err.Error()) c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg)) @@ -105,16 +105,17 @@ func updateCategory(c *gin.Context) { } func deleteCategory(c *gin.Context) { - categoryID, err := strconv.Atoi(c.Param("id")) + categoryID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { NotFoundView(c, "No such category") return } - category := expenses.Category{ + cat := expenses.Category{ CategoryID: categoryID, } - err = category.Delete() + + err = cat.Delete() if err == expenses.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", categoryID) c.String(http.StatusNotFound, errMsg) diff --git a/src/pages/expenses.go b/src/pages/expenses.go index ec2fde7..755c67b 100644 --- a/src/pages/expenses.go +++ b/src/pages/expenses.go @@ -5,7 +5,6 @@ import ( "encoding/json" "expenses/expenses" "fmt" - "log" "strconv" "net/http" @@ -56,18 +55,17 @@ func expensePage(c *gin.Context) { return } - shares, err := expenses.GetShares(expense.Expense.ExpID) + shares, err := expenses.GetShares(expense.ExpID) if err != nil { ServerErrorView(c, "failed to fetch shares") return } - payments, err := expenses.GetPayments(expense.Expense.ExpID) + payments, err := expenses.GetPayments(expense.ExpID) if err != nil { ServerErrorView(c, "failed to fetch payments") return } - log.Println(payments) categories, err := expenses.GetAllCategories() if err != nil { @@ -171,7 +169,7 @@ func createExpense(c *gin.Context) { } func updateExpense(c *gin.Context) { - expenseID, err := strconv.Atoi(c.Param("id")) + expenseID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { c.Header("HX-Redirect", "/404") return @@ -197,7 +195,7 @@ func updateExpense(c *gin.Context) { } func deleteExpense(c *gin.Context) { - expenseID, err := strconv.Atoi(c.Param("id")) + expenseID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { c.Header("HX-Redirect", "/404") return diff --git a/src/pages/expensesHelper.go b/src/pages/expensesHelper.go index 3a00de7..9623ae9 100644 --- a/src/pages/expensesHelper.go +++ b/src/pages/expensesHelper.go @@ -16,7 +16,7 @@ func processFormShares(c *gin.Context) ([]expenses.ExpenseShare, error) { formShares := c.PostFormArray("shares-percent[]") for i := range sharesUserIDs { - userID, err := strconv.Atoi(sharesUserIDs[i]) + userID, err := strconv.ParseInt(sharesUserIDs[i], 10, 16) if err != nil { return nil, err } @@ -31,11 +31,11 @@ func processFormShares(c *gin.Context) ([]expenses.ExpenseShare, error) { User: expenses.User{ UserID: userID, }, - Share: float32(share), - } + Share: share, + } if formSharesIDs[i] != "" { - id, err := strconv.Atoi(formSharesIDs[i]) + id, err := strconv.ParseInt(formSharesIDs[i], 10, 16) if err != nil { return nil, err } @@ -54,9 +54,9 @@ func processFormPayments(c *gin.Context) ([]expenses.ExpensePayment, error) { paymentsUserIDs := c.PostFormArray("payments-user-ids[]") formPaymentsIDs := c.PostFormArray("payments-ids[]") formPaymentsValues := c.PostFormArray("payments-payment[]") - + for k := range paymentsUserIDs { - userID, err := strconv.Atoi(paymentsUserIDs[k]) + userID, err := strconv.ParseInt(paymentsUserIDs[k], 10, 16) if err != nil { return nil, err } @@ -71,11 +71,11 @@ func processFormPayments(c *gin.Context) ([]expenses.ExpensePayment, error) { User: expenses.User{ UserID: userID, }, - PayedAmount: float32(payed), - } + PayedAmount: payed, + } if formPaymentsIDs[k] != "" { - id, err := strconv.Atoi(formPaymentsIDs[k]) + id, err := strconv.ParseInt(formPaymentsIDs[k], 10, 16) if err != nil { return nil, err } @@ -105,19 +105,19 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) { } newTyp := c.PostForm("newexp-type-dropdown") - typID, err := strconv.Atoi(newTyp) + typID, err := strconv.ParseInt(newTyp, 10, 16) if err != nil { return nil, err } newCat := c.PostForm("newexp-cat-dropdown") - catID, err := strconv.Atoi(newCat) + catID, err := strconv.ParseInt(newCat, 10, 16) if err != nil { return nil, err } newStore := c.PostForm("newexp-store-dropdown") - storeID, err := strconv.Atoi(newStore) + storeID, err := strconv.ParseInt(newStore, 10, 16) if err != nil { return nil, err } @@ -133,25 +133,25 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) { newExp := expenses.Expense{ Description: newDescription, - ExpDate: date, - Value: float32(value), - ExpType: expenses.Type{ + Date: date, + Value: value, + Type: expenses.Type{ TypeID: typID, }, - ExpCategory: expenses.Category{ + Category: expenses.Category{ CategoryID: catID, }, - ExpStore: expenses.Store{ + Store: expenses.Store{ StoreID: storeID, }, - OwnerUser: expenses.User{ + Owner: expenses.User{ // TODO // This needs to be dynamic - to be added once we have logins and whatnot UserID: 1, }, CreationDate: time.Now().Unix(), - Shares: shares, - Payments: payments, + Shares: shares, + Payments: payments, } return &newExp, nil } diff --git a/src/pages/overview.go b/src/pages/overview.go index c6e4f6f..3cbd592 100644 --- a/src/pages/overview.go +++ b/src/pages/overview.go @@ -17,7 +17,7 @@ type ExpenseDebtOverview struct { type UserDebtSummary struct { Debtor expenses.User - Total float32 + Total float64 } func overviewPartialPage(c *gin.Context) { @@ -70,7 +70,7 @@ func getResults(c *gin.Context) { // } // } - userDebtSummary := make(map[expenses.User]float32) + userDebtSummary := make(map[expenses.User]float64) expensesWithDebts := []ExpenseDebtOverview{} for _, exp := range queriedExpenses { if len(exp.Shares) <= 1 { @@ -97,7 +97,7 @@ func getResults(c *gin.Context) { c.HTML(http.StatusOK, "overviewResults", gin.H{ "expenses": expensesWithDebts, - "summary": userDebtSummary, + "summary": userDebtSummary, }) } diff --git a/src/pages/payments.go b/src/pages/payments.go index ddc481e..b711254 100644 --- a/src/pages/payments.go +++ b/src/pages/payments.go @@ -10,7 +10,7 @@ import ( ) func deletePayment(c *gin.Context) { - paymentID, err := strconv.Atoi(c.Param("id")) + paymentID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { NotFoundView(c, "failed to fetch payment") return diff --git a/src/pages/stores.go b/src/pages/stores.go index 2078f08..0484180 100644 --- a/src/pages/stores.go +++ b/src/pages/stores.go @@ -1,6 +1,7 @@ package pages import ( + "database/sql" "expenses/expenses" "fmt" @@ -30,19 +31,19 @@ func storesGlobalPage(c *gin.Context) { } func storePage(c *gin.Context) { - storeID, err := strconv.Atoi(c.Param("id")) + storeID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { NotFoundView(c, "didn't find request store") return } store, err := expenses.GetStore(storeID) - if err != nil { - ServerErrorView(c, fmt.Sprintf("error getting store: %+v", err.Error())) + if err == sql.ErrNoRows { + NotFoundView(c, fmt.Sprintf("didn't find store with ID `%d`", storeID)) return } - if store.StoreID == -1 { - NotFoundView(c, fmt.Sprintf("didn't store with ID `%d`", storeID)) + if err != nil { + ServerErrorView(c, fmt.Sprintf("error getting store: %+v", err.Error())) return } @@ -80,7 +81,7 @@ func createStore(c *gin.Context) { } func updateStore(c *gin.Context) { - storeID, err := strconv.Atoi(c.Param("id")) + storeID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { c.Redirect(404, "/404") } @@ -101,7 +102,7 @@ func updateStore(c *gin.Context) { } func deleteStore(c *gin.Context) { - storeID, err := strconv.Atoi(c.Param("id")) + storeID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { c.Redirect(404, "/404") } diff --git a/src/pages/types.go b/src/pages/types.go index d44f3c1..bfb4d1b 100644 --- a/src/pages/types.go +++ b/src/pages/types.go @@ -1,6 +1,7 @@ package pages import ( + "database/sql" "expenses/expenses" "fmt" @@ -30,19 +31,19 @@ func typesGlobalPage(c *gin.Context) { } func typePage(c *gin.Context) { - typeID, err := strconv.Atoi(c.Param("id")) + typeID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { NotFoundView(c, "requested type doesn't exist") return } typ, err := expenses.GetType(typeID) - if err != nil { - ServerErrorView(c, "failed to retrieve requested type") + if err == sql.ErrNoRows { + NotFoundView(c, fmt.Sprintf("Couldn't find type `%d`", typeID)) return } - if typ.TypeID == -1 { - NotFoundView(c, fmt.Sprintf("Couldn't find type `%d`", typeID)) + if err != nil { + ServerErrorView(c, "failed to retrieve requested type") return } @@ -80,7 +81,7 @@ func createType(c *gin.Context) { } func deleteType(c *gin.Context) { - typeID, err := strconv.Atoi(c.Param("id")) + typeID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { c.Redirect(404, "/404") } @@ -105,7 +106,7 @@ func deleteType(c *gin.Context) { } func updateType(c *gin.Context) { - typeID, err := strconv.Atoi(c.Param("id")) + typeID, err := strconv.ParseInt(c.Param("id"), 10, 16) if err != nil { c.Redirect(404, "/404") }