diff --git a/src/TODO.md b/src/TODO.md index 59801d5..eb13f7c 100644 --- a/src/TODO.md +++ b/src/TODO.md @@ -6,3 +6,4 @@ used - [ ] Ability to attach a document to an expense - [ ] Debts table - [ ] Ability to export data in multiple formats and with a selection of columns +- [ ] Migrate every column named "ExpenseSomething" to "ExpSomething" diff --git a/src/assets/htmx/expense.html b/src/assets/htmx/expense.html index 06ba69e..7be9b9c 100644 --- a/src/assets/htmx/expense.html +++ b/src/assets/htmx/expense.html @@ -10,29 +10,29 @@ + value="{{ .expense.Expense.ExpID }}" id="expense-id"> {{ end }} + value="{{ .expense.Expense.Description }}" id="expense-desc"> + value="{{ formatDate .expense.Expense.ExpDate }}" id="expense-date"> + value="{{ formatPrice .expense.Expense.Value }}" id="expense-value"> @@ -41,7 +41,7 @@ @@ -50,7 +50,7 @@ @@ -71,7 +71,7 @@ {{ end }} diff --git a/src/assets/htmx/expensePaymentsTable.html b/src/assets/htmx/expensePaymentsTable.html index 8cc3ca5..1832c04 100644 --- a/src/assets/htmx/expensePaymentsTable.html +++ b/src/assets/htmx/expensePaymentsTable.html @@ -21,7 +21,7 @@ @@ -36,12 +36,12 @@ - {{ range .expense.Payments }} + {{ range .payments }} {{ $payment := . }} - + + value="{{ $payment.ExpensesPayment.ExpPaymID }}" class="tui-input"> + value="{{ formatPrice $payment.ExpensesPayment.Payed }}" class="tui-input"> - diff --git a/src/assets/htmx/expenseShares.html b/src/assets/htmx/expenseShares.html index e246dc2..4db4850 100644 --- a/src/assets/htmx/expenseShares.html +++ b/src/assets/htmx/expenseShares.html @@ -20,7 +20,7 @@ @@ -34,13 +34,13 @@ - {{ range .expense.Shares }} + {{ range .shares }} {{ $share := . }} + value="{{ $share.ExpensesShare.ExpShareID }}" class="tui-input"> + value="{{ $share.ExpensesShare.Share }}" class="tui-input"> diff --git a/src/assets/htmx/expenses.html b/src/assets/htmx/expenses.html index e11ead0..bcadef1 100644 --- a/src/assets/htmx/expenses.html +++ b/src/assets/htmx/expenses.html @@ -11,13 +11,11 @@ {{ range .expenses }} - {{ .ExpID }} - {{ .Description }} - {{ formatPrice .Value }} - {{ formatDate .ExpDate }} - - {{ .ExpCategory.CategoryName }} - + {{ .Expense.ExpID }} + {{ .Expense.Description }} + {{ formatPrice .Expense.Value }} + {{ formatDate .Expense.ExpDate }} + {{ .Category.CategoryName }} {{ end }} diff --git a/src/expenses/categories.go b/src/expenses/categories.go index d29ae77..874974f 100644 --- a/src/expenses/categories.go +++ b/src/expenses/categories.go @@ -1,11 +1,12 @@ package expenses import ( + "context" "database/sql" "fmt" - "log" "expenses/config" + repo "expenses/expenses/db/repository" _ "github.com/mattn/go-sqlite3" ) @@ -26,8 +27,9 @@ func NewCategory() Category { } } -func GetAllCategories() ([]Category, error) { +func GetAllCategories() ([]repo.Category, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { @@ -35,47 +37,29 @@ func GetAllCategories() ([]Category, error) { } defer db.Close() - query := "SELECT CategoryID,CategoryName " + - "FROM categories" - - var categoryList []Category - rows, err := db.Query(query) + queries := repo.New(db) + categories, err := queries.GetCategories(ctx) if err != nil { - return nil, err + return []repo.Category{}, nil } - for rows.Next() { - exp := &Category{} - err := rows.Scan(&exp.CategoryID, &exp.CategoryName) - if err != nil { - log.Fatalf("Failed to parse data from db: %v", err) - } - categoryList = append(categoryList, *exp) - } - - return categoryList, nil + return categories, nil } -func GetCategory(catID int) (Category, error) { +func GetCategory(catID int64) (repo.Category, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return Category{}, err + return repo.Category{}, err } defer db.Close() - query := "SELECT CategoryID,CategoryName " + - "FROM categories " + - "WHERE CategoryID = ?" + queries := repo.New(db) + category, err := queries.GetCategory(ctx, catID) - cat := Category{CategoryID: -1} - err = db.QueryRow(query, catID).Scan(&cat.CategoryID, &cat.CategoryName) - if err != nil { - return Category{CategoryID: -1}, nil - } - - return cat, nil + return category, nil } func (cat *Category) Insert() error { diff --git a/src/expenses/db/queries/categories.sql b/src/expenses/db/queries/categories.sql new file mode 100644 index 0000000..bf3ae03 --- /dev/null +++ b/src/expenses/db/queries/categories.sql @@ -0,0 +1,5 @@ +-- name: GetCategories :many +SELECT * FROM categories; + +-- name: GetCategory :one +SELECT * FROM categories WHERE "CategoryID" = ?; diff --git a/src/expenses/db/queries/expenses.sql b/src/expenses/db/queries/expenses.sql new file mode 100644 index 0000000..b033d4d --- /dev/null +++ b/src/expenses/db/queries/expenses.sql @@ -0,0 +1,35 @@ +-- name: GetExpenses :many +SELECT + sqlc.embed(expenses), + sqlc.embed(stores), + sqlc.embed(categories), + sqlc.embed(users), + sqlc.embed(types) +FROM expenses +JOIN + Stores ON stores.StoreID = expenses.StoreID +JOIN + Categories ON categories.CategoryID = expenses.CategoryID +JOIN + Users ON UserID = OwnerUserId +JOIN + "expenseTypes" as types ON types.TypeID = expenses.TypeID; + +-- name: GetExpense :one +SELECT + sqlc.embed(expenses), + sqlc.embed(stores), + sqlc.embed(categories), + sqlc.embed(users), + sqlc.embed(types) +FROM expenses +JOIN + Stores ON stores.StoreID = expenses.StoreID +JOIN + Categories ON categories.CategoryID = expenses.CategoryID +JOIN + Users ON "UserID" = "OwnerUserId" +JOIN + "expenseTypes" as types ON types.TypeID = expenses.TypeID +WHERE + "ExpID" = ?; diff --git a/src/expenses/db/queries/payments.sql b/src/expenses/db/queries/payments.sql new file mode 100644 index 0000000..16b2ae7 --- /dev/null +++ b/src/expenses/db/queries/payments.sql @@ -0,0 +1,8 @@ +-- name: GetPayments :many +SELECT + sqlc.embed(payments), sqlc.embed(users) +FROM + "expensesPayments" as payments +JOIN + users as users ON users.UserID = payments.UserID +WHERE "ExpID" = ?; diff --git a/src/expenses/db/queries/shares.sql b/src/expenses/db/queries/shares.sql new file mode 100644 index 0000000..d39902e --- /dev/null +++ b/src/expenses/db/queries/shares.sql @@ -0,0 +1,8 @@ +-- name: GetShares :many +SELECT + sqlc.embed(shares), sqlc.embed(users) +FROM + "expensesShares" as shares +JOIN + users as users ON users.UserID = shares.UserID +WHERE "ExpID" = ?; diff --git a/src/expenses/db/repository/categories.sql.go b/src/expenses/db/repository/categories.sql.go new file mode 100644 index 0000000..584e997 --- /dev/null +++ b/src/expenses/db/repository/categories.sql.go @@ -0,0 +1,48 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: categories.sql + +package repository + +import ( + "context" +) + +const getCategories = `-- name: GetCategories :many +SELECT CategoryID, CategoryName FROM categories +` + +func (q *Queries) GetCategories(ctx context.Context) ([]Category, error) { + rows, err := q.db.QueryContext(ctx, getCategories) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Category + for rows.Next() { + var i Category + if err := rows.Scan(&i.CategoryID, &i.CategoryName); 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 getCategory = `-- name: GetCategory :one +SELECT CategoryID, CategoryName FROM categories WHERE "CategoryID" = ? +` + +func (q *Queries) GetCategory(ctx context.Context, categoryid int64) (Category, error) { + row := q.db.QueryRowContext(ctx, getCategory, categoryid) + var i Category + err := row.Scan(&i.CategoryID, &i.CategoryName) + return i, err +} diff --git a/src/expenses/db/repository/db.go b/src/expenses/db/repository/db.go new file mode 100644 index 0000000..e77f620 --- /dev/null +++ b/src/expenses/db/repository/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package repository + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/src/expenses/db/repository/expenses.sql.go b/src/expenses/db/repository/expenses.sql.go new file mode 100644 index 0000000..4a15daa --- /dev/null +++ b/src/expenses/db/repository/expenses.sql.go @@ -0,0 +1,132 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: expenses.sql + +package repository + +import ( + "context" +) + +const getExpense = `-- name: GetExpense :one +SELECT + expenses.ExpID, expenses.Description, expenses.Value, expenses.StoreID, expenses.CategoryID, expenses.OwnerUserID, expenses.TypeID, expenses.ExpDate, expenses.CreationDate, + stores.StoreID, stores.StoreName, + categories.CategoryID, categories.CategoryName, + users.UserID, users.UserName, users.UserPass, + types.TypeID, types.TypeName +FROM expenses +JOIN + Stores ON stores.StoreID = expenses.StoreID +JOIN + Categories ON categories.CategoryID = expenses.CategoryID +JOIN + Users ON "UserID" = "OwnerUserId" +JOIN + "expenseTypes" as types ON types.TypeID = expenses.TypeID +WHERE + "ExpID" = ? +` + +type GetExpenseRow struct { + Expense Expense + Store Store + Category Category + User User + ExpenseType ExpenseType +} + +func (q *Queries) GetExpense(ctx context.Context, expid int64) (GetExpenseRow, error) { + row := q.db.QueryRowContext(ctx, getExpense, expid) + var i GetExpenseRow + err := row.Scan( + &i.Expense.ExpID, + &i.Expense.Description, + &i.Expense.Value, + &i.Expense.StoreID, + &i.Expense.CategoryID, + &i.Expense.OwnerUserID, + &i.Expense.TypeID, + &i.Expense.ExpDate, + &i.Expense.CreationDate, + &i.Store.StoreID, + &i.Store.StoreName, + &i.Category.CategoryID, + &i.Category.CategoryName, + &i.User.UserID, + &i.User.UserName, + &i.User.UserPass, + &i.ExpenseType.TypeID, + &i.ExpenseType.TypeName, + ) + return i, err +} + +const getExpenses = `-- name: GetExpenses :many +SELECT + expenses.ExpID, expenses.Description, expenses.Value, expenses.StoreID, expenses.CategoryID, expenses.OwnerUserID, expenses.TypeID, expenses.ExpDate, expenses.CreationDate, + stores.StoreID, stores.StoreName, + categories.CategoryID, categories.CategoryName, + users.UserID, users.UserName, users.UserPass, + types.TypeID, types.TypeName +FROM expenses +JOIN + Stores ON stores.StoreID = expenses.StoreID +JOIN + Categories ON categories.CategoryID = expenses.CategoryID +JOIN + Users ON UserID = OwnerUserId +JOIN + "expenseTypes" as types ON types.TypeID = expenses.TypeID +` + +type GetExpensesRow struct { + Expense Expense + Store Store + Category Category + User User + ExpenseType ExpenseType +} + +func (q *Queries) GetExpenses(ctx context.Context) ([]GetExpensesRow, error) { + rows, err := q.db.QueryContext(ctx, getExpenses) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetExpensesRow + for rows.Next() { + var i GetExpensesRow + if err := rows.Scan( + &i.Expense.ExpID, + &i.Expense.Description, + &i.Expense.Value, + &i.Expense.StoreID, + &i.Expense.CategoryID, + &i.Expense.OwnerUserID, + &i.Expense.TypeID, + &i.Expense.ExpDate, + &i.Expense.CreationDate, + &i.Store.StoreID, + &i.Store.StoreName, + &i.Category.CategoryID, + &i.Category.CategoryName, + &i.User.UserID, + &i.User.UserName, + &i.User.UserPass, + &i.ExpenseType.TypeID, + &i.ExpenseType.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 +} diff --git a/src/expenses/db/repository/models.go b/src/expenses/db/repository/models.go new file mode 100644 index 0000000..5d48c3a --- /dev/null +++ b/src/expenses/db/repository/models.go @@ -0,0 +1,52 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package repository + +type Category struct { + CategoryID int64 + CategoryName string +} + +type Expense struct { + ExpID int64 + Description string + Value float64 + StoreID int64 + CategoryID int64 + OwnerUserID int64 + TypeID int64 + ExpDate int64 + CreationDate int64 +} + +type ExpenseType struct { + TypeID int64 + TypeName string +} + +type ExpensesPayment struct { + ExpPaymID int64 + ExpID int64 + UserID int64 + Payed float64 +} + +type ExpensesShare struct { + ExpShareID int64 + ExpID int64 + UserID int64 + Share float64 +} + +type Store struct { + StoreID int64 + StoreName string +} + +type User struct { + UserID int64 + UserName string + UserPass string +} diff --git a/src/expenses/db/repository/payments.sql.go b/src/expenses/db/repository/payments.sql.go new file mode 100644 index 0000000..7f8af11 --- /dev/null +++ b/src/expenses/db/repository/payments.sql.go @@ -0,0 +1,56 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: payments.sql + +package repository + +import ( + "context" +) + +const getPayments = `-- name: GetPayments :many +SELECT + payments.ExpPaymID, payments.ExpID, payments.UserID, payments.Payed, users.UserID, users.UserName, users.UserPass +FROM + "expensesPayments" as payments +JOIN + users as users ON users.UserID = payments.UserID +WHERE "ExpID" = ? +` + +type GetPaymentsRow struct { + ExpensesPayment ExpensesPayment + User User +} + +func (q *Queries) GetPayments(ctx context.Context, expid int64) ([]GetPaymentsRow, error) { + rows, err := q.db.QueryContext(ctx, getPayments, expid) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetPaymentsRow + for rows.Next() { + var i GetPaymentsRow + if err := rows.Scan( + &i.ExpensesPayment.ExpPaymID, + &i.ExpensesPayment.ExpID, + &i.ExpensesPayment.UserID, + &i.ExpensesPayment.Payed, + &i.User.UserID, + &i.User.UserName, + &i.User.UserPass, + ); 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 +} diff --git a/src/expenses/db/repository/shares.sql.go b/src/expenses/db/repository/shares.sql.go new file mode 100644 index 0000000..5af73e2 --- /dev/null +++ b/src/expenses/db/repository/shares.sql.go @@ -0,0 +1,56 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: shares.sql + +package repository + +import ( + "context" +) + +const getShares = `-- name: GetShares :many +SELECT + shares.ExpShareID, shares.ExpID, shares.UserID, shares.Share, users.UserID, users.UserName, users.UserPass +FROM + "expensesShares" as shares +JOIN + users as users ON users.UserID = shares.UserID +WHERE "ExpID" = ? +` + +type GetSharesRow struct { + ExpensesShare ExpensesShare + User User +} + +func (q *Queries) GetShares(ctx context.Context, expid int64) ([]GetSharesRow, error) { + rows, err := q.db.QueryContext(ctx, getShares, expid) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetSharesRow + for rows.Next() { + var i GetSharesRow + if err := rows.Scan( + &i.ExpensesShare.ExpShareID, + &i.ExpensesShare.ExpID, + &i.ExpensesShare.UserID, + &i.ExpensesShare.Share, + &i.User.UserID, + &i.User.UserName, + &i.User.UserPass, + ); 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 +} diff --git a/src/expenses/db/schema.sql b/src/expenses/db/schema.sql new file mode 100644 index 0000000..a3c3f72 --- /dev/null +++ b/src/expenses/db/schema.sql @@ -0,0 +1,67 @@ +DROP TABLE IF EXISTS expenses; +CREATE TABLE expenses ( + "ExpID" integer PRIMARY KEY AUTOINCREMENT, + "Description" text NOT NULL, + "Value" float NOT NULL DEFAULT 0, + "StoreID" int NOT NULL DEFAULT 0, + "CategoryID" int NOT NULL DEFAULT 0, + "OwnerUserID" int NOT NULL DEFAULT 0, + "TypeID" int NOT NULL DEFAULT 0, + "ExpDate" int NOT NULL DEFAULT -1, + "CreationDate" int NOT NULL DEFAULT -1, + FOREIGN KEY(StoreID) REFERENCES stores(StoreID) ON DELETE RESTRICT, + FOREIGN KEY(CategoryID) REFERENCES categories(CategoryID) ON DELETE RESTRICT, + FOREIGN KEY(OwnerUserID) REFERENCES users(UserID) ON DELETE RESTRICT, + FOREIGN KEY(TypeID) REFERENCES expensetypes(TypeID) ON DELETE RESTRICT +); + +DROP TABLE IF EXISTS stores; +CREATE TABLE stores( + "StoreID" integer PRIMARY KEY AUTOINCREMENT, + "StoreName" text NOT NULL +); +-- Create a default store for NoStore +INSERT INTO stores (StoreID, StoreName) VALUES(0, 'No Store'); + +DROP TABLE IF EXISTS categories; +CREATE TABLE categories( + "CategoryID" integer PRIMARY KEY AUTOINCREMENT, + "CategoryName" text NOT NULL +); +-- Create a default category for NoCategory +INSERT INTO categories (CategoryID, CategoryName) VALUES(0, 'No Category'); + +DROP TABLE IF EXISTS expenseTypes; +CREATE TABLE "expenseTypes"( + "TypeID" integer PRIMARY KEY AUTOINCREMENT, + "TypeName" text NOT NULL +); +-- Create a default category for NoCategory +INSERT INTO expensetypes (TypeID, TypeName) VALUES(0, 'expense'); + +DROP TABLE IF EXISTS users; +CREATE TABLE users( + "UserID" integer PRIMARY KEY AUTOINCREMENT, + "UserName" text NOT NULL, + "UserPass" text NOT NULL +); + +DROP TABLE IF EXISTS expensesShares; +CREATE TABLE "expensesShares"( + "ExpShareID" integer PRIMARY KEY AUTOINCREMENT, + "ExpID" int NOT NULL, + "UserID" int NOT NULL, + "Share" float NOT NULL DEFAULT 0.5, + FOREIGN KEY(ExpID) REFERENCES expenses(ExpID) ON DELETE RESTRICT, + FOREIGN KEY(UserID) REFERENCES users(UserID) ON DELETE RESTRICT +); + +DROP TABLE IF EXISTS expensesPayments; +CREATE TABLE "expensesPayments"( + "ExpPaymID" integer PRIMARY KEY AUTOINCREMENT, + "ExpID" int NOT NULL, + "UserID" int NOT NULL, + "Payed" float NOT NULL DEFAULT 0, + FOREIGN KEY(ExpID) REFERENCES expenses(ExpID) ON DELETE RESTRICT, + FOREIGN KEY(UserID) REFERENCES users(UserID) ON DELETE RESTRICT +); diff --git a/src/expenses/db/sqlc.yaml b/src/expenses/db/sqlc.yaml new file mode 100644 index 0000000..85e2231 --- /dev/null +++ b/src/expenses/db/sqlc.yaml @@ -0,0 +1,14 @@ +version: "2" +sql: + - engine: "sqlite" + queries: "queries/" + # Convert this to use a migrations/ (migrate) + schema: "schema.sql" + gen: + go: + package: "repository" + out: "repository" + rename: + expenseTypes: "ExpenseTypes" + expenseShares: "ExpenseShares" + expensePayments: "ExpensePayments" diff --git a/src/expenses/expensePayments.go b/src/expenses/expensePayments.go index 5657e38..7e4c7b2 100644 --- a/src/expenses/expensePayments.go +++ b/src/expenses/expensePayments.go @@ -1,10 +1,11 @@ package expenses import ( + "context" "expenses/config" + "expenses/expenses/db/repository" "database/sql" - "log" "fmt" _ "github.com/mattn/go-sqlite3" @@ -16,38 +17,23 @@ type ExpensePayment struct { PayedAmount float32 } -func (e *Expense) GetPayments() error { +func GetPayments(expID int64) ([]repository.GetPaymentsRow, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return err + return []repository.GetPaymentsRow{}, err } defer db.Close() - query := "SELECT ExpPaymID,Payed,users.UserID,users.UserName " + - "FROM expensesPayments " + - "JOIN users ON users.UserID = expensesPayments.UserID " + - "WHERE ExpID = ?" - - rows, err := db.Query(query, e.ExpID) + queries := repository.New(db) + payments, err := queries.GetPayments(ctx, expID) if err != nil { - return err + return []repository.GetPaymentsRow{}, err } - for rows.Next() { - paym := &ExpensePayment{} - err := rows.Scan( - &paym.ExpPaymID, &paym.PayedAmount, - &paym.User.UserID, &paym.User.UserName, - ) - if err != nil { - log.Fatalf("Failed to parse data from db: %v", err) - } - e.Payments = append(e.Payments, *paym) - } - - return nil + return payments, nil } func (p *ExpensePayment) Insert(expID int) error { diff --git a/src/expenses/expenseShares.go b/src/expenses/expenseShares.go index 20a7f29..885f008 100644 --- a/src/expenses/expenseShares.go +++ b/src/expenses/expenseShares.go @@ -1,11 +1,12 @@ package expenses import ( + "context" "expenses/config" + "expenses/expenses/db/repository" "database/sql" "fmt" - "log" _ "github.com/mattn/go-sqlite3" ) @@ -16,38 +17,23 @@ type ExpenseShare struct { Share float32 } -func (e *Expense) GetShares() error { +func GetShares(expID int64) ([]repository.GetSharesRow, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return err + return []repository.GetSharesRow{}, err } defer db.Close() - query := "SELECT ExpShareID,Share,users.UserID,users.UserName " + - "FROM expensesShares " + - "JOIN users ON users.UserID = expensesShares.UserID " + - "WHERE ExpID = ?" - - rows, err := db.Query(query, e.ExpID) + queries := repository.New(db) + shares, err := queries.GetShares(ctx, expID) if err != nil { - return err + return []repository.GetSharesRow{}, err } - for rows.Next() { - share := &ExpenseShare{} - err := rows.Scan( - &share.ExpShareID, &share.Share, - &share.User.UserID, &share.User.UserName, - ) - if err != nil { - log.Fatalf("Failed to parse data from db: %v", err) - } - e.Shares = append(e.Shares, *share) - } - - return nil + return shares, nil } func (sh *ExpenseShare) Insert(expID int) error { diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index 8d473be..7900dcc 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -1,7 +1,9 @@ package expenses import ( + "context" "expenses/config" + "expenses/expenses/db/repository" "database/sql" "fmt" @@ -39,8 +41,9 @@ func NewExpense() Expense { } } -func GetAllExpenses() ([]Expense, error) { +func GetAllExpenses() ([]repository.GetExpensesRow, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { @@ -48,80 +51,32 @@ func GetAllExpenses() ([]Expense, error) { } defer db.Close() - query := "SELECT ExpID,Description,Value," + - "Stores.StoreID,Stores.StoreName," + - "Categories.CategoryID,Categories.CategoryName," + - "Users.UserID,Users.UserName," + - "ExpDate,CreationDate " + - "FROM expenses " + - "JOIN Stores ON stores.StoreID = expenses.StoreID " + - "JOIN Categories ON categories.CategoryID = expenses.CategoryID " + - "JOIN Users ON UserID = OwnerUserId" - - var expList []Expense - rows, err := db.Query(query) + queries := repository.New(db) + expenses, err := queries.GetExpenses(ctx) if err != nil { return nil, err } - for rows.Next() { - 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, - ) - if err != nil { - log.Fatalf("Failed to parse data from db: %v", err) - } - expList = append(expList, *exp) - } - - return expList, nil + return expenses, nil } -func GetExpense(expID int) (Expense, error) { +func GetExpense(expID int64) (repository.GetExpenseRow, error) { cfg := config.GetInstance() + ctx := context.Background() db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { - return Expense{}, err + return repository.GetExpenseRow{}, err } defer db.Close() - query := "SELECT ExpID,Description,Value," + - "Stores.StoreID,Stores.StoreName," + - "Categories.CategoryID,Categories.CategoryName," + - "Users.UserID,Users.UserName," + - "expenseTypes.TypeID,expenseTypes.TypeName, " + - "ExpDate,CreationDate " + - "FROM expenses " + - "JOIN Stores ON stores.StoreID = expenses.StoreID " + - "JOIN Categories ON categories.CategoryID = expenses.CategoryID " + - "JOIN Users ON UserID = OwnerUserId " + - "JOIN expenseTypes ON expenseTypes.TypeID = expenses.TypeID " + - "WHERE ExpID = ?" - - exp := Expense{ExpID: -1} - err = db.QueryRow(query, expID).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.ExpType.TypeID, &exp.ExpType.TypeName, - &exp.ExpDate, &exp.CreationDate, - ) - if err == sql.ErrNoRows { - return Expense{ExpID: -1}, err - } - + queries := repository.New(db) + expense, err := queries.GetExpense(ctx, expID) if err != nil { - return Expense{}, err + return repository.GetExpenseRow{}, err } - return exp, nil + return expense, nil } func (exp *Expense) Insert() error { diff --git a/src/main.go b/src/main.go index 1e23b63..04f42e3 100644 --- a/src/main.go +++ b/src/main.go @@ -21,7 +21,7 @@ var tmplFuncMap = template.FuncMap{ "formatDate": func(ts int64) string { return time.Unix(ts, 0).Format("02-Jan-2006") }, - "formatPrice": func(v float32) string { + "formatPrice": func(v float64) string { return fmt.Sprintf("%.2f", v) }, } diff --git a/src/pages/categories.go b/src/pages/categories.go index c1c9f65..df7ddc8 100644 --- a/src/pages/categories.go +++ b/src/pages/categories.go @@ -1,6 +1,7 @@ package pages import ( + "database/sql" "expenses/expenses" "encoding/json" @@ -31,19 +32,19 @@ func categoriesGlobalPage(c *gin.Context) { } func categoryPage(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, err := expenses.GetCategory(categoryID) - if err != nil { - ServerErrorView(c, "The server too makes mistakes") + if err == sql.ErrNoRows { + NotFoundView(c, fmt.Sprintf("Could not find category `%d`", categoryID)) return } - if category.CategoryID == -1 { - NotFoundView(c, fmt.Sprintf("Could not find category `%d`", categoryID)) + if err != nil { + ServerErrorView(c, "The server too makes mistakes") return } diff --git a/src/pages/expenses.go b/src/pages/expenses.go index 7c9b7a9..ec2fde7 100644 --- a/src/pages/expenses.go +++ b/src/pages/expenses.go @@ -1,9 +1,11 @@ package pages import ( + "database/sql" "encoding/json" "expenses/expenses" "fmt" + "log" "strconv" "net/http" @@ -43,23 +45,29 @@ func ExpensesGlobalPage(c *gin.Context) { } func expensePage(c *gin.Context) { - expenseID, err := strconv.Atoi(c.Param("id")) + expenseID, err := strconv.ParseInt(c.Param("id"), 10, 64) if err != nil { c.Redirect(404, "/404") } expense, err := expenses.GetExpense(expenseID) - err = expense.GetPayments() - if err != nil { - ServerErrorView(c, "failed to fetch payments") + if err == sql.ErrNoRows { + NotFoundView(c, "didn't find requested expense") return } - err = expense.GetShares() + shares, err := expenses.GetShares(expense.Expense.ExpID) + if err != nil { + ServerErrorView(c, "failed to fetch shares") + return + } + + payments, err := expenses.GetPayments(expense.Expense.ExpID) if err != nil { ServerErrorView(c, "failed to fetch payments") return } + log.Println(payments) categories, err := expenses.GetAllCategories() if err != nil { @@ -85,16 +93,11 @@ func expensePage(c *gin.Context) { return } - summary, err := expense.GetSummary() - if err != nil { - ServerErrorView(c, "failed to get summary") - return - } - - if expense.ExpID == -1 { - NotFoundView(c, fmt.Sprintf("ID `%d` doesn't exist", expenseID)) - return - } + // summary, err := expense.GetSummary() + // if err != nil { + // ServerErrorView(c, "failed to get summary") + // return + // } c.HTML(http.StatusOK, "terminal", gin.H{ "page": "expense", @@ -105,8 +108,10 @@ func expensePage(c *gin.Context) { "categories": categories, "stores": stores, "types": types, - "summary": summary, "users": users, + "shares": shares, + "payments": payments, + // "summary": summary, }) } @@ -139,12 +144,12 @@ func newExpensePage(c *gin.Context) { "page": "expenseNew", "renderNavBar": false, "content": "newExpense", - "method": "post", - "expense": expenses.NewExpense(), - "categories": categories, - "stores": stores, - "types": types, - "users": users, + "method": "post", + "expense": expenses.NewExpense(), + "categories": categories, + "stores": stores, + "types": types, + "users": users, }) } diff --git a/src/pages/overview.go b/src/pages/overview.go index e3266b2..c6e4f6f 100644 --- a/src/pages/overview.go +++ b/src/pages/overview.go @@ -57,18 +57,18 @@ func getResults(c *gin.Context) { } // Get the expenses and shares for each expense - for k := range queriedExpenses { - err = queriedExpenses[k].GetShares() - if err != nil { - log.Printf("failed to get shares: %v", err) - return - } - err = queriedExpenses[k].GetPayments() - if err != nil { - log.Printf("failed to get payments: %v", err) - return - } - } + // for k := range queriedExpenses { + // err = queriedExpenses[k].GetShares() + // if err != nil { + // log.Printf("failed to get shares: %v", err) + // return + // } + // err = queriedExpenses[k].GetPayments() + // if err != nil { + // log.Printf("failed to get payments: %v", err) + // return + // } + // } userDebtSummary := make(map[expenses.User]float32) expensesWithDebts := []ExpenseDebtOverview{}