Migrating to sqlc

This commit is contained in:
2025-08-04 22:31:29 +01:00
parent f6152188e5
commit b194818c93
25 changed files with 629 additions and 202 deletions
+1
View File
@@ -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"
+9 -9
View File
@@ -10,29 +10,29 @@
<input
readonly
class="tui-input underline" type="text" name="expense-id"
value="{{ .expense.ExpID }}" id="expense-id">
value="{{ .expense.Expense.ExpID }}" id="expense-id">
{{ end }}
<label for="expense-desc">Description:</label>
<input
class="tui-input underline" type="text" name="expense-desc"
value="{{ .expense.Description }}" id="expense-desc">
value="{{ .expense.Expense.Description }}" id="expense-desc">
<label for="expense-date">Date:</label>
<input
class="tui-input underline" type="text" name="expense-date"
value="{{ formatDate .expense.ExpDate }}" id="expense-date">
value="{{ formatDate .expense.Expense.ExpDate }}" id="expense-date">
<label for="expense-value">Value:</label>
<input
class="tui-input underline" type="text" name="expense-value"
value="{{ .expense.Value }}" id="expense-value">
value="{{ formatPrice .expense.Expense.Value }}" id="expense-value">
<label for="newexp-type-dropdown">Type:</label>
<select name="newexp-type-dropdown" id="newexp-type-dropdown" class="tui-dropdown">
{{ range .types }}
<option
{{ if eq .TypeID $.expense.ExpType.TypeID }}selected{{ end }}
{{ if eq .TypeID $.expense.ExpenseType.TypeID }}selected{{ end }}
value="{{ .TypeID }}">{{ .TypeName }}</option>
{{ end}}
</select>
@@ -41,7 +41,7 @@
<select name="newexp-cat-dropdown" id="newexp-cat-dropdown" class="tui-dropdown">
{{ range .categories }}
<option
{{ if eq .CategoryID $.expense.ExpCategory.CategoryID }}selected{{ end }}
{{ if eq .CategoryID $.expense.Category.CategoryID }}selected{{ end }}
value="{{ .CategoryID }}">{{ .CategoryName }}</option>
{{ end}}
</select>
@@ -50,7 +50,7 @@
<select name="newexp-store-dropdown" id="newexp-store-dropdown" class="tui-dropdown">
{{ range .stores }}
<option
{{ if eq .StoreID $.expense.ExpStore.StoreID }}selected{{ end }}
{{ if eq .StoreID $.expense.Store.StoreID }}selected{{ end }}
value="{{ .StoreID }}">{{ .StoreName }}</option>
{{ end}}
</select>
@@ -71,7 +71,7 @@
<button
class="subbutton"
{{ if eq .method "put" }}
hx-put="/expenses/{{ .expense.ExpID }}"
hx-put="/expenses/{{ .expense.Expense.ExpID }}"
{{ end }}
{{ if eq .method "post" }}
hx-post="/expenses/new"
@@ -86,7 +86,7 @@
onclick="confirmDelete(this)"
type="button"
class="delete-button"
data-delete-url="/expenses/{{ .expense.ExpID }}"
data-delete-url="/expenses/{{ .expense.Expense.ExpID }}"
id="expense-delete-button">DELETE</button>
{{ end }}
</form>
+6 -7
View File
@@ -21,7 +21,7 @@
<select name="payments-user-ids[]" disabled class="tui-dropdown">
{{ range .users }}
<option
{{ if eq .UserID $.expense.OwnerUser.UserID }}selected{{ end }}
{{ if eq .UserID $.expense.User.UserID }}selected{{ end }}
value="{{ .UserID }}">{{ .UserName }}</option>
{{ end }}
</select>
@@ -36,12 +36,12 @@
</td>
</tr>
{{ range .expense.Payments }}
{{ range .payments }}
{{ $payment := . }}
<tr data-id="{{ $payment.ExpPaymID }}">
<tr data-id="{{ $payment.ExpensesPayment.ExpPaymID }}">
<td>
<input name="payments-ids[]" readonly
value="{{ $payment.ExpPaymID }}" class="tui-input">
value="{{ $payment.ExpensesPayment.ExpPaymID }}" class="tui-input">
</td>
<td>
<select name="payments-user-ids[]" class="tui-dropdown">
@@ -56,14 +56,13 @@
</td>
<td>
<input type="number" name="payments-payment[]"
value="{{ $payment.PayedAmount }}" class="tui-input">
value="{{ formatPrice $payment.ExpensesPayment.Payed }}" class="tui-input">
</td>
<td class="row-delete-button">
<!-- <button type="button" onclick="deleteShareRow(this)">X</button> -->
<button
type="button"
class="delete-button"
hx-delete="/payments/{{ $payment.ExpPaymID }}"
hx-delete="/payments/{{ $payment.ExpensesPayment.ExpPaymID }}"
hx-target="closest tr">X</button>
</td>
</tr>
+4 -4
View File
@@ -20,7 +20,7 @@
<select name="shares-user-ids[]" disabled class="tui-dropdown">
{{ range .users }}
<option
{{ if eq .UserID $.expense.OwnerUser.UserID }}selected{{ end }}
{{ if eq .UserID $.expense.User.UserID }}selected{{ end }}
value="{{ .UserID }}">{{ .UserName }}</option>
{{ end }}
</select>
@@ -34,13 +34,13 @@
</td>
</tr>
{{ range .expense.Shares }}
{{ range .shares }}
{{ $share := . }}
<tr>
<td>
<input
name="shares-ids[]" readonly
value="{{ $share.ExpShareID }}" class="tui-input">
value="{{ $share.ExpensesShare.ExpShareID }}" class="tui-input">
</td>
<td>
<select name="shares-user-ids[]" class="tui-dropdown">
@@ -55,7 +55,7 @@
</td>
<td>
<input type="number" name="shares-percent[]"
value="{{ $share.Share }}" class="tui-input">
value="{{ $share.ExpensesShare.Share }}" class="tui-input">
</td>
<td class="row-delete-button">
<button type="button" onclick="deleteShareRow(this)">X</button>
+5 -7
View File
@@ -11,13 +11,11 @@
</tr>
{{ range .expenses }}
<tr>
<th><a href="/expenses/{{ .ExpID }}">{{ .ExpID }}</th>
<th spellcheck="false" contenteditable>{{ .Description }}</th>
<th spellcheck="false" contenteditable>{{ formatPrice .Value }}</th>
<th spellcheck="false" contenteditable>{{ formatDate .ExpDate }}</th>
<!-- <th spellcheck="false">{{ .ExpStore.StoreName }}</th> -->
<th spellcheck="false">{{ .ExpCategory.CategoryName }}</th>
<!-- <th spellcheck="false">{{ .OwnerUser.UserName }}</th> -->
<th><a href="/expenses/{{ .Expense.ExpID }}">{{ .Expense.ExpID }}</th>
<th spellcheck="false" contenteditable>{{ .Expense.Description }}</th>
<th spellcheck="false" contenteditable>{{ formatPrice .Expense.Value }}</th>
<th spellcheck="false" contenteditable>{{ formatDate .Expense.ExpDate }}</th>
<th spellcheck="false">{{ .Category.CategoryName }}</th>
</tr>
{{ end }}
</table>
+14 -30
View File
@@ -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 {
+5
View File
@@ -0,0 +1,5 @@
-- name: GetCategories :many
SELECT * FROM categories;
-- name: GetCategory :one
SELECT * FROM categories WHERE "CategoryID" = ?;
+35
View File
@@ -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" = ?;
+8
View File
@@ -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" = ?;
+8
View File
@@ -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" = ?;
@@ -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
}
+31
View File
@@ -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,
}
}
+132
View File
@@ -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
}
+52
View File
@@ -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
}
@@ -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
}
+56
View File
@@ -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
}
+67
View File
@@ -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
);
+14
View File
@@ -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"
+9 -23
View File
@@ -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 {
+9 -23
View File
@@ -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 {
+14 -59
View File
@@ -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 {
+1 -1
View File
@@ -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)
},
}
+6 -5
View File
@@ -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
}
+27 -22
View File
@@ -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,
})
}
+12 -12
View File
@@ -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{}