Whatever I'm doing here I think I will regret it, sqlc migration

This commit is contained in:
2025-08-05 13:57:37 +01:00
parent b194818c93
commit 31f596a150
40 changed files with 715 additions and 269 deletions
+3
View File
@@ -7,3 +7,6 @@ used
- [ ] Debts table - [ ] Debts table
- [ ] Ability to export data in multiple formats and with a selection of columns - [ ] Ability to export data in multiple formats and with a selection of columns
- [ ] Migrate every column named "ExpenseSomething" to "ExpSomething" - [ ] 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
+7 -7
View File
@@ -30,19 +30,19 @@
opacity: 1; opacity: 1;
} }
20% { 20% {
opacity: 1; opacity: 1.1;
} }
40% { 40% {
opacity: 1.1; opacity: 0.9;
} }
60% { 60% {
opacity: 1.1; opacity: 1;
} }
80% { 80% {
opacity: 1.1; opacity: 0.9;
} }
100% { 100% {
opacity: 0.9; opacity: 1;
} }
} }
@keyframes beam { @keyframes beam {
@@ -340,7 +340,7 @@ dt {
} }
.text-color { .text-color {
color: var(--text-color) !important; color: var(--text-color);
} }
#container { #container {
@@ -414,7 +414,7 @@ dt {
} }
.warning { .warning {
color: var(--warning-color); color: var(--warning-color) !important;
} }
@media (max-width: 900px) { @media (max-width: 900px) {
+2 -2
View File
@@ -128,7 +128,7 @@ dt {
} }
.text-color { .text-color {
color: var(--text-color) !important; color: var(--text-color);
} }
#container { #container {
@@ -210,7 +210,7 @@ dt {
} }
.warning { .warning {
color: var(--warning-color); color: var(--warning-color) !important;
} }
@media (max-width: 900px) { @media (max-width: 900px) {
+7 -7
View File
@@ -10,29 +10,29 @@
<input <input
readonly readonly
class="tui-input underline" type="text" name="expense-id" class="tui-input underline" type="text" name="expense-id"
value="{{ .expense.Expense.ExpID }}" id="expense-id"> value="{{ .expense.ExpID }}" id="expense-id">
{{ end }} {{ end }}
<label for="expense-desc">Description:</label> <label for="expense-desc">Description:</label>
<input <input
class="tui-input underline" type="text" name="expense-desc" class="tui-input underline" type="text" name="expense-desc"
value="{{ .expense.Expense.Description }}" id="expense-desc"> value="{{ .expense.Description }}" id="expense-desc">
<label for="expense-date">Date:</label> <label for="expense-date">Date:</label>
<input <input
class="tui-input underline" type="text" name="expense-date" class="tui-input underline" type="text" name="expense-date"
value="{{ formatDate .expense.Expense.ExpDate }}" id="expense-date"> value="{{ formatDate .expense.Date }}" id="expense-date">
<label for="expense-value">Value:</label> <label for="expense-value">Value:</label>
<input <input
class="tui-input underline" type="text" name="expense-value" class="tui-input underline" type="text" name="expense-value"
value="{{ formatPrice .expense.Expense.Value }}" id="expense-value"> value="{{ formatPrice .expense.Value }}" id="expense-value">
<label for="newexp-type-dropdown">Type:</label> <label for="newexp-type-dropdown">Type:</label>
<select name="newexp-type-dropdown" id="newexp-type-dropdown" class="tui-dropdown"> <select name="newexp-type-dropdown" id="newexp-type-dropdown" class="tui-dropdown">
{{ range .types }} {{ range .types }}
<option <option
{{ if eq .TypeID $.expense.ExpenseType.TypeID }}selected{{ end }} {{ if eq .TypeID $.expense.Type.TypeID }}selected{{ end }}
value="{{ .TypeID }}">{{ .TypeName }}</option> value="{{ .TypeID }}">{{ .TypeName }}</option>
{{ end}} {{ end}}
</select> </select>
@@ -71,7 +71,7 @@
<button <button
class="subbutton" class="subbutton"
{{ if eq .method "put" }} {{ if eq .method "put" }}
hx-put="/expenses/{{ .expense.Expense.ExpID }}" hx-put="/expenses/{{ .expense.ExpID }}"
{{ end }} {{ end }}
{{ if eq .method "post" }} {{ if eq .method "post" }}
hx-post="/expenses/new" hx-post="/expenses/new"
@@ -86,7 +86,7 @@
onclick="confirmDelete(this)" onclick="confirmDelete(this)"
type="button" type="button"
class="delete-button" class="delete-button"
data-delete-url="/expenses/{{ .expense.Expense.ExpID }}" data-delete-url="/expenses/{{ .expense.ExpID }}"
id="expense-delete-button">DELETE</button> id="expense-delete-button">DELETE</button>
{{ end }} {{ end }}
</form> </form>
+5 -5
View File
@@ -21,7 +21,7 @@
<select name="payments-user-ids[]" disabled class="tui-dropdown"> <select name="payments-user-ids[]" disabled class="tui-dropdown">
{{ range .users }} {{ range .users }}
<option <option
{{ if eq .UserID $.expense.User.UserID }}selected{{ end }} {{ if eq .UserID $.expense.Owner.UserID }}selected{{ end }}
value="{{ .UserID }}">{{ .UserName }}</option> value="{{ .UserID }}">{{ .UserName }}</option>
{{ end }} {{ end }}
</select> </select>
@@ -38,10 +38,10 @@
{{ range .payments }} {{ range .payments }}
{{ $payment := . }} {{ $payment := . }}
<tr data-id="{{ $payment.ExpensesPayment.ExpPaymID }}"> <tr data-id="{{ $payment.ExpPaymID }}">
<td> <td>
<input name="payments-ids[]" readonly <input name="payments-ids[]" readonly
value="{{ $payment.ExpensesPayment.ExpPaymID }}" class="tui-input"> value="{{ $payment.ExpPaymID }}" class="tui-input">
</td> </td>
<td> <td>
<select name="payments-user-ids[]" class="tui-dropdown"> <select name="payments-user-ids[]" class="tui-dropdown">
@@ -56,13 +56,13 @@
</td> </td>
<td> <td>
<input type="number" name="payments-payment[]" <input type="number" name="payments-payment[]"
value="{{ formatPrice $payment.ExpensesPayment.Payed }}" class="tui-input"> value="{{ formatPrice $payment.PayedAmount }}" class="tui-input">
</td> </td>
<td class="row-delete-button"> <td class="row-delete-button">
<button <button
type="button" type="button"
class="delete-button" class="delete-button"
hx-delete="/payments/{{ $payment.ExpensesPayment.ExpPaymID }}" hx-delete="/payments/{{ $payment.ExpPaymID }}"
hx-target="closest tr">X</button> hx-target="closest tr">X</button>
</td> </td>
</tr> </tr>
+3 -3
View File
@@ -20,7 +20,7 @@
<select name="shares-user-ids[]" disabled class="tui-dropdown"> <select name="shares-user-ids[]" disabled class="tui-dropdown">
{{ range .users }} {{ range .users }}
<option <option
{{ if eq .UserID $.expense.User.UserID }}selected{{ end }} {{ if eq .UserID $.expense.Owner.UserID }}selected{{ end }}
value="{{ .UserID }}">{{ .UserName }}</option> value="{{ .UserID }}">{{ .UserName }}</option>
{{ end }} {{ end }}
</select> </select>
@@ -40,7 +40,7 @@
<td> <td>
<input <input
name="shares-ids[]" readonly name="shares-ids[]" readonly
value="{{ $share.ExpensesShare.ExpShareID }}" class="tui-input"> value="{{ $share.ExpShareID }}" class="tui-input">
</td> </td>
<td> <td>
<select name="shares-user-ids[]" class="tui-dropdown"> <select name="shares-user-ids[]" class="tui-dropdown">
@@ -55,7 +55,7 @@
</td> </td>
<td> <td>
<input type="number" name="shares-percent[]" <input type="number" name="shares-percent[]"
value="{{ $share.ExpensesShare.Share }}" class="tui-input"> value="{{ $share.Share }}" class="tui-input">
</td> </td>
<td class="row-delete-button"> <td class="row-delete-button">
<button type="button" onclick="deleteShareRow(this)">X</button> <button type="button" onclick="deleteShareRow(this)">X</button>
+4 -4
View File
@@ -11,10 +11,10 @@
</tr> </tr>
{{ range .expenses }} {{ range .expenses }}
<tr> <tr>
<th><a href="/expenses/{{ .Expense.ExpID }}">{{ .Expense.ExpID }}</th> <th><a href="/expenses/{{ .ExpID }}">{{ .ExpID }}</th>
<th spellcheck="false" contenteditable>{{ .Expense.Description }}</th> <th spellcheck="false" contenteditable>{{ .Description }}</th>
<th spellcheck="false" contenteditable>{{ formatPrice .Expense.Value }}</th> <th spellcheck="false" contenteditable>{{ formatPrice .Value }}</th>
<th spellcheck="false" contenteditable>{{ formatDate .Expense.ExpDate }}</th> <th spellcheck="false" contenteditable>{{ formatDate .Date }}</th>
<th spellcheck="false">{{ .Category.CategoryName }}</th> <th spellcheck="false">{{ .Category.CategoryName }}</th>
</tr> </tr>
{{ end }} {{ end }}
+2 -3
View File
@@ -19,9 +19,8 @@
<div class="scanline"></div> <div class="scanline"></div>
<fieldset class="main-container neon-text {{ if .warning }}warning{{ end }}"> <fieldset class="main-container neon-text {{ if .warning }}warning{{ end }}">
<legend id="home-button" <legend id="home-button" class="neon-text">
class="neon-text {{ if .warning }}warning{{ end }}"> <a class="text-color {{ if .warning }}warning{{ end }}" href="/">EXPENSES</a>
<a class="text-color" href="/">EXPENSES</a>
</legend> </legend>
<div id="main-container-content" class="main-container-content"> <div id="main-container-content" class="main-container-content">
{{ if .renderNavBar }} {{ if .renderNavBar }}
+19 -16
View File
@@ -16,7 +16,7 @@ var (
) )
type Category struct { type Category struct {
CategoryID int CategoryID int64
CategoryName string CategoryName string
} }
@@ -27,7 +27,7 @@ func NewCategory() Category {
} }
} }
func GetAllCategories() ([]repo.Category, error) { func GetAllCategories() ([]Category, error) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background() ctx := context.Background()
@@ -40,30 +40,31 @@ func GetAllCategories() ([]repo.Category, error) {
queries := repo.New(db) queries := repo.New(db)
categories, err := queries.GetCategories(ctx) categories, err := queries.GetCategories(ctx)
if err != nil { 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() cfg := config.GetInstance()
ctx := context.Background() ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
return repo.Category{}, err return Category{}, err
} }
defer db.Close() defer db.Close()
queries := repo.New(db) queries := repo.New(db)
category, err := queries.GetCategory(ctx, catID) category, err := queries.GetCategory(ctx, catID)
return category, nil return mapRepoCategory(category), err
} }
func (cat *Category) Insert() error { func (cat *Category) Insert() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -71,8 +72,8 @@ func (cat *Category) Insert() error {
} }
defer db.Close() defer db.Close()
query := "INSERT INTO categories(CategoryName) VALUES(?)" queries := repo.New(db)
res, err := db.Exec(query, cat.CategoryName) res, err := queries.InsertCategory(ctx, cat.CategoryName)
if err != nil { if err != nil {
return err return err
} }
@@ -89,6 +90,7 @@ func (cat *Category) Insert() error {
func (cat *Category) Delete() error { func (cat *Category) Delete() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -96,11 +98,8 @@ func (cat *Category) Delete() error {
} }
defer db.Close() defer db.Close()
query := "DELETE FROM categories WHERE CategoryID = ?" queries := repo.New(db)
res, err := db.Exec(query, cat.CategoryID) res, err := queries.DeleteCategory(ctx, cat.CategoryID)
if err != nil {
return err
}
rowsAffected, err := res.RowsAffected() rowsAffected, err := res.RowsAffected()
if err != nil { if err != nil {
@@ -114,6 +113,7 @@ func (cat *Category) Delete() error {
func (cat *Category) Update() error { func (cat *Category) Update() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -121,8 +121,11 @@ func (cat *Category) Update() error {
} }
defer db.Close() defer db.Close()
query := "UPDATE categories SET CategoryName = ? WHERE CategoryID = ?" queries := repo.New(db)
res, err := db.Exec(query, cat.CategoryName, cat.CategoryID) res, err := queries.UpdateCategory(ctx, repo.UpdateCategoryParams{
CategoryName: cat.CategoryName,
CategoryID: cat.CategoryID,
})
if err != nil { if err != nil {
return err return err
} }
+20
View File
@@ -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
}
+9
View File
@@ -3,3 +3,12 @@ SELECT * FROM categories;
-- name: GetCategory :one -- name: GetCategory :one
SELECT * FROM categories WHERE "CategoryID" = ?; 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(?)
+11
View File
@@ -33,3 +33,14 @@ JOIN
"expenseTypes" as types ON types.TypeID = expenses.TypeID "expenseTypes" as types ON types.TypeID = expenses.TypeID
WHERE WHERE
"ExpID" = ?; "ExpID" = ?;
-- name: InsertExpense :execresult
INSERT INTO expenses(
"Description","Value",
"StoreID",
"CategoryID",
"TypeID",
"OwnerUserID",
"ExpDate","CreationDate"
)
VALUES(?, ?, ? , ?, ?, ?, ?, ?);
+14
View File
@@ -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" = ?;
+14
View File
@@ -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" = ?;
@@ -7,8 +7,17 @@ package repository
import ( import (
"context" "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 const getCategories = `-- name: GetCategories :many
SELECT CategoryID, CategoryName FROM categories 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) err := row.Scan(&i.CategoryID, &i.CategoryName)
return i, err 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)
}
@@ -7,6 +7,7 @@ package repository
import ( import (
"context" "context"
"database/sql"
) )
const getExpense = `-- name: GetExpense :one const getExpense = `-- name: GetExpense :one
@@ -130,3 +131,39 @@ func (q *Queries) GetExpenses(ctx context.Context) ([]GetExpensesRow, error) {
} }
return items, nil 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,
)
}
+78
View File
@@ -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)
}
+78
View File
@@ -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)
}
+1 -1
View File
@@ -2,7 +2,7 @@ package expenses
type Debt struct { type Debt struct {
Debtor User Debtor User
Sum float32 Sum float64
} }
func sortBySum(a, b Debt) int { func sortBySum(a, b Debt) int {
+7 -7
View File
@@ -1,16 +1,16 @@
package expenses package expenses
type DebtCalculator struct { type DebtCalculator struct {
Shares map[User]float32 Shares map[User]float64
Payments map[User]float32 Payments map[User]float64
Expense *Expense Expense *Expense
} }
func NewDebtCalculator(e *Expense) *DebtCalculator { func NewDebtCalculator(e *Expense) *DebtCalculator {
return &DebtCalculator{ return &DebtCalculator{
Shares: make(map[User]float32), Shares: make(map[User]float64),
Payments: make(map[User]float32), Payments: make(map[User]float64),
Expense: e, Expense: e,
} }
} }
@@ -28,7 +28,7 @@ func (dc *DebtCalculator) mapPayments() {
} }
func (dc *DebtCalculator) getDebts() []Debt { func (dc *DebtCalculator) getDebts() []Debt {
debts := []Debt{} debts := []Debt{}
for user := range dc.Payments { for user := range dc.Payments {
debt := (dc.Shares[user] * dc.Expense.Value) - dc.Payments[user] debt := (dc.Shares[user] * dc.Expense.Value) - dc.Payments[user]
+4 -4
View File
@@ -67,19 +67,19 @@ func TestCalculateDebtsTestCase1(t *testing.T) {
ExpID: 1, ExpID: 1,
Description: "Test Exp", Description: "Test Exp",
Value: 150.0, Value: 150.0,
ExpType: Type{ Type: Type{
TypeID: 1, TypeID: 1,
TypeName: "Despesa", TypeName: "Despesa",
}, },
ExpCategory: Category{ Category: Category{
CategoryID: 0, CategoryID: 0,
CategoryName: "Groceries", CategoryName: "Groceries",
}, },
OwnerUser: User{ Owner: User{
UserID: 1, UserID: 1,
UserName: "ESilva", UserName: "ESilva",
}, },
ExpDate: 1753307982, Date: 1753307982,
Payments: []ExpensePayment{ Payments: []ExpensePayment{
{ {
ExpPaymID: 0, ExpPaymID: 0,
+5 -11
View File
@@ -11,32 +11,26 @@ import (
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type ExpensePayment struct { func GetPayments(expID int64) ([]ExpensePayment, error) {
ExpPaymID int
User User
PayedAmount float32
}
func GetPayments(expID int64) ([]repository.GetPaymentsRow, error) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background() ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
return []repository.GetPaymentsRow{}, err return []ExpensePayment{}, err
} }
defer db.Close() defer db.Close()
queries := repository.New(db) queries := repository.New(db)
payments, err := queries.GetPayments(ctx, expID) payments, err := queries.GetPayments(ctx, expID)
if err != nil { 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() cfg := config.GetInstance()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
@@ -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
}
+5 -11
View File
@@ -11,32 +11,26 @@ import (
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type ExpenseShare struct { func GetShares(expID int64) ([]ExpenseShare, error) {
ExpShareID int
User User
Share float32
}
func GetShares(expID int64) ([]repository.GetSharesRow, error) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background() ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
return []repository.GetSharesRow{}, err return []ExpenseShare{}, err
} }
defer db.Close() defer db.Close()
queries := repository.New(db) queries := repository.New(db)
shares, err := queries.GetShares(ctx, expID) shares, err := queries.GetShares(ctx, expID)
if err != nil { 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() cfg := config.GetInstance()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
+2 -2
View File
@@ -2,8 +2,8 @@ package expenses
type UserExpenseSummary struct { type UserExpenseSummary struct {
User User User User
Share float32 Share float64
PayedTotal float32 PayedTotal float64
} }
func NewUserExpenseSummary() UserExpenseSummary { func NewUserExpenseSummary() UserExpenseSummary {
+45 -58
View File
@@ -3,7 +3,7 @@ package expenses
import ( import (
"context" "context"
"expenses/config" "expenses/config"
"expenses/expenses/db/repository" repo "expenses/expenses/db/repository"
"database/sql" "database/sql"
"fmt" "fmt"
@@ -12,75 +12,47 @@ import (
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type Expense struct { func GetAllExpenses() ([]Expense, error) {
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) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background() ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
return nil, err return []Expense{}, err
} }
defer db.Close() defer db.Close()
queries := repository.New(db) queries := repo.New(db)
expenses, err := queries.GetExpenses(ctx) expenses, err := queries.GetExpenses(ctx)
if err != nil { 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() cfg := config.GetInstance()
ctx := context.Background() ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
return repository.GetExpenseRow{}, err return Expense{}, err
} }
defer db.Close() defer db.Close()
queries := repository.New(db) queries := repo.New(db)
expense, err := queries.GetExpense(ctx, expID) expense, err := queries.GetExpense(ctx, expID)
if err != nil { if err != nil {
return repository.GetExpenseRow{}, err return Expense{}, err
} }
return expense, nil return mapRepoGetExpenseRow(expense), nil
} }
func (exp *Expense) Insert() error { func (exp *Expense) Insert() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -88,16 +60,23 @@ func (exp *Expense) Insert() error {
} }
defer db.Close() defer db.Close()
query := "INSERT INTO expenses(" + tx, err := db.Begin()
"Description,Value,StoreID,CategoryID,TypeID,OwnerUserID,ExpDate,CreationDate" + if err != nil {
") " + return err
"VALUES(?, ?, ? , ?, ?, ?, ?, ?)" }
defer tx.Rollback()
// TODO queries := repo.New(tx)
// Add a transaction here so that it fails when necessary res, err := queries.InsertExpense(ctx, repo.InsertExpenseParams{
res, err := db.Exec(query, exp.Description, exp.Value, exp.ExpStore.StoreID, Description: exp.Description,
exp.ExpCategory.CategoryID, exp.ExpType.TypeID, 1, exp.ExpDate, exp.CreationDate, 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 { if err != nil {
return err return err
} }
@@ -106,7 +85,9 @@ func (exp *Expense) Insert() error {
if err != nil { if err != nil {
return fmt.Errorf("failed to retrieve last inserted expense ID: %v", err) return fmt.Errorf("failed to retrieve last inserted expense ID: %v", err)
} }
exp.ExpID = int(expenseID)
exp.ExpID = expenseID
for _, share := range exp.Shares { for _, share := range exp.Shares {
err := share.Insert(exp.ExpID) err := share.Insert(exp.ExpID)
if err != nil { if err != nil {
@@ -127,6 +108,12 @@ func (exp *Expense) Insert() error {
return fmt.Errorf("no rows were created") 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 return nil
} }
@@ -151,9 +138,9 @@ func (exp *Expense) Update() error {
"WHERE ExpID = ?" "WHERE ExpID = ?"
res, err := db.Exec(query, res, err := db.Exec(query,
exp.Description, exp.Value, exp.ExpStore.StoreID, exp.Description, exp.Value, exp.Store.StoreID,
exp.ExpCategory.CategoryID, exp.ExpType.TypeID, exp.OwnerUser.UserID, exp.Category.CategoryID, exp.Type.TypeID, exp.Owner.UserID,
exp.ExpDate, exp.ExpID, exp.Date, exp.ExpID,
) )
if err != nil { if err != nil {
return err return err
@@ -236,7 +223,7 @@ func GetExpensesRange(start int64, end int64) ([]Expense, error) {
"FROM expenses " + "FROM expenses " +
"JOIN Stores ON stores.StoreID = expenses.StoreID " + "JOIN Stores ON stores.StoreID = expenses.StoreID " +
"JOIN Categories ON categories.CategoryID = expenses.CategoryID " + "JOIN Categories ON categories.CategoryID = expenses.CategoryID " +
"JOIN Users ON UserID = OwnerUserId "+ "JOIN Users ON UserID = OwnerUserId " +
"WHERE ExpDate >= ? and ExpDate <= ?" "WHERE ExpDate >= ? and ExpDate <= ?"
var expList []Expense var expList []Expense
@@ -249,10 +236,10 @@ func GetExpensesRange(start int64, end int64) ([]Expense, error) {
exp := &Expense{} exp := &Expense{}
err := rows.Scan( err := rows.Scan(
&exp.ExpID, &exp.Description, &exp.Value, &exp.ExpID, &exp.Description, &exp.Value,
&exp.ExpStore.StoreID, &exp.ExpStore.StoreName, &exp.Store.StoreID, &exp.Store.StoreName,
&exp.ExpCategory.CategoryID, &exp.ExpCategory.CategoryName, &exp.Category.CategoryID, &exp.Category.CategoryName,
&exp.OwnerUser.UserID, &exp.OwnerUser.UserName, &exp.Owner.UserID, &exp.Owner.UserName,
&exp.ExpDate, &exp.CreationDate, &exp.Date, &exp.CreationDate,
) )
if err != nil { if err != nil {
log.Fatalf("Failed to parse data from db: %v", err) log.Fatalf("Failed to parse data from db: %v", err)
+98
View File
@@ -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
}
+30
View File
@@ -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
}
+27 -43
View File
@@ -1,17 +1,18 @@
package expenses package expenses
import ( import (
"context"
"expenses/config" "expenses/config"
repo "expenses/expenses/db/repository"
"database/sql" "database/sql"
"fmt" "fmt"
"log"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type Store struct { type Store struct {
StoreID int StoreID int64
StoreName string StoreName string
} }
@@ -24,36 +25,26 @@ func NewStore() Store {
func GetAllStores() ([]Store, error) { func GetAllStores() ([]Store, error) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
return nil, err return []Store{}, err
} }
defer db.Close() defer db.Close()
query := "SELECT StoreID,StoreName " + queries := repo.New(db)
"FROM stores" storeList, err := queries.GetStores(ctx)
var storeList []Store
rows, err := db.Query(query)
if err != nil { if err != nil {
return nil, err return []Store{}, err
} }
for rows.Next() { return mapRepoStores(storeList), nil
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
} }
func GetStore(storeID int) (Store, error) { func GetStore(storeID int64) (Store, error) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
@@ -61,21 +52,18 @@ func GetStore(storeID int) (Store, error) {
} }
defer db.Close() defer db.Close()
query := "SELECT StoreID,StoreName " + queries := repo.New(db)
"FROM stores " + store, err := queries.GetStore(ctx, storeID)
"WHERE StoreID = ?"
store := Store{StoreID: -1}
err = db.QueryRow(query, storeID).Scan(&store.StoreID, &store.StoreName)
if err != nil { if err != nil {
return Store{StoreID: -1}, nil return Store{}, err
} }
return store, nil return mapRepoStore(store), nil
} }
func (s *Store) Insert() error { func (s *Store) Insert() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -83,11 +71,8 @@ func (s *Store) Insert() error {
} }
defer db.Close() defer db.Close()
query := "INSERT INTO stores(StoreName) VALUES(?)" queries := repo.New(db)
res, err := db.Exec(query, s.StoreName) res, err := queries.InsertStore(ctx, s.StoreName)
if err != nil {
return err
}
rowsAffected, err := res.RowsAffected() rowsAffected, err := res.RowsAffected()
if err != nil { if err != nil {
@@ -101,6 +86,7 @@ func (s *Store) Insert() error {
func (s *Store) Update() error { func (s *Store) Update() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -108,11 +94,11 @@ func (s *Store) Update() error {
} }
defer db.Close() defer db.Close()
query := "UPDATE stores SET StoreName = ? WHERE StoreID = ?" queries := repo.New(db)
res, err := db.Exec(query, s.StoreName, s.StoreID) res, err := queries.UpdateStore(ctx, repo.UpdateStoreParams{
if err != nil { StoreID: s.StoreID,
return err StoreName: s.StoreName,
} })
rowsAffected, err := res.RowsAffected() rowsAffected, err := res.RowsAffected()
if err != nil { if err != nil {
@@ -126,6 +112,7 @@ func (s *Store) Update() error {
func (s *Store) Delete() error { func (s *Store) Delete() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -133,11 +120,8 @@ func (s *Store) Delete() error {
} }
defer db.Close() defer db.Close()
query := "DELETE FROM stores WHERE StoreID = ?" queries := repo.New(db)
res, err := db.Exec(query, s.StoreID) res, err := queries.DeleteStore(ctx, s.StoreID)
if err != nil {
return err
}
rowsAffected, err := res.RowsAffected() rowsAffected, err := res.RowsAffected()
if err != nil { if err != nil {
+18
View File
@@ -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
}
+30 -34
View File
@@ -1,17 +1,18 @@
package expenses package expenses
import ( import (
"context"
"expenses/config" "expenses/config"
repo "expenses/expenses/db/repository"
"database/sql" "database/sql"
"fmt" "fmt"
"log"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type Type struct { type Type struct {
TypeID int TypeID int64
TypeName string TypeName string
} }
@@ -24,36 +25,26 @@ func NewType() Type {
func GetAllTypes() ([]Type, error) { func GetAllTypes() ([]Type, error) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
return nil, err return []Type{}, err
} }
defer db.Close() defer db.Close()
query := "SELECT TypeID,TypeName " + queries := repo.New(db)
"FROM expenseTypes" typeList, err := queries.GetTypes(ctx)
var typeList []Type
rows, err := db.Query(query)
if err != nil { if err != nil {
return nil, err return []Type{}, err
} }
for rows.Next() { return mapRepoTypes(typeList), nil
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
} }
func GetType(typID int) (Type, error) { func GetType(typID int64) (Type, error) {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath) db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil { if err != nil {
@@ -61,21 +52,18 @@ func GetType(typID int) (Type, error) {
} }
defer db.Close() defer db.Close()
query := "SELECT TypeID,TypeName " + queries := repo.New(db)
"FROM expenseTypes " + typ, err := queries.GetType(ctx, typID)
"WHERE TypeID = ?"
nType := Type{TypeID: -1}
err = db.QueryRow(query, typID).Scan(&nType.TypeID, &nType.TypeName)
if err != nil { if err != nil {
return Type{TypeID: -1}, nil return Type{}, err
} }
return nType, nil return mapRepoType(typ), nil
} }
func (typ *Type) Insert() error { func (typ *Type) Insert() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -83,12 +71,15 @@ func (typ *Type) Insert() error {
} }
defer db.Close() defer db.Close()
query := "INSERT INTO expenseTypes(TypeName) VALUES(?)" queries := repo.New(db)
res, err := db.Exec(query, typ.TypeName) res, err := queries.InsertType(ctx, typ.TypeName)
if err != nil { if err != nil {
return err return err
} }
// TODO
// Move all theses things outside of this, I'll handle it wherever I'm doing
// logics
rowsAffected, err := res.RowsAffected() rowsAffected, err := res.RowsAffected()
if err != nil { if err != nil {
return err return err
@@ -101,6 +92,7 @@ func (typ *Type) Insert() error {
func (typ *Type) Delete() error { func (typ *Type) Delete() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -108,8 +100,8 @@ func (typ *Type) Delete() error {
} }
defer db.Close() defer db.Close()
query := "DELETE FROM expenseTypes WHERE TypeID = ?" queries := repo.New(db)
res, err := db.Exec(query, typ.TypeID) res, err := queries.DeleteType(ctx, typ.TypeID)
if err != nil { if err != nil {
return err return err
} }
@@ -126,6 +118,7 @@ func (typ *Type) Delete() error {
func (typ *Type) Update() error { func (typ *Type) Update() error {
cfg := config.GetInstance() cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil { if err != nil {
@@ -133,8 +126,11 @@ func (typ *Type) Update() error {
} }
defer db.Close() defer db.Close()
query := "UPDATE expenseTypes SET TypeName = ? WHERE TypeID = ?" queries := repo.New(db)
res, err := db.Exec(query, typ.TypeName, typ.TypeID) res, err := queries.UpdateType(ctx, repo.UpdateTypeParams{
TypeID: typ.TypeID,
TypeName: typ.TypeName,
})
if err != nil { if err != nil {
return err return err
} }
+18
View File
@@ -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
}
+1 -1
View File
@@ -10,7 +10,7 @@ import (
) )
type User struct { type User struct {
UserID int UserID int64
UserName string UserName string
} }
+7 -6
View File
@@ -82,19 +82,19 @@ func createCategory(c *gin.Context) {
} }
func updateCategory(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 { if err != nil {
NotFoundView(c, "No such category") NotFoundView(c, "No such category")
return return
} }
categoryName := c.PostForm("category-name") categoryName := c.PostForm("category-name")
category := expenses.Category{ cat := expenses.Category{
CategoryID: categoryID, CategoryID: categoryID,
CategoryName: categoryName, CategoryName: categoryName,
} }
err = category.Update() err = cat.Update()
if err != nil { if err != nil {
errMsg, _ := json.Marshal(err.Error()) errMsg, _ := json.Marshal(err.Error())
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg)) c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg))
@@ -105,16 +105,17 @@ func updateCategory(c *gin.Context) {
} }
func deleteCategory(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 { if err != nil {
NotFoundView(c, "No such category") NotFoundView(c, "No such category")
return return
} }
category := expenses.Category{ cat := expenses.Category{
CategoryID: categoryID, CategoryID: categoryID,
} }
err = category.Delete()
err = cat.Delete()
if err == expenses.ErrNotFound { if err == expenses.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", categoryID) errMsg := fmt.Sprintf("category %d not found", categoryID)
c.String(http.StatusNotFound, errMsg) c.String(http.StatusNotFound, errMsg)
+4 -6
View File
@@ -5,7 +5,6 @@ import (
"encoding/json" "encoding/json"
"expenses/expenses" "expenses/expenses"
"fmt" "fmt"
"log"
"strconv" "strconv"
"net/http" "net/http"
@@ -56,18 +55,17 @@ func expensePage(c *gin.Context) {
return return
} }
shares, err := expenses.GetShares(expense.Expense.ExpID) shares, err := expenses.GetShares(expense.ExpID)
if err != nil { if err != nil {
ServerErrorView(c, "failed to fetch shares") ServerErrorView(c, "failed to fetch shares")
return return
} }
payments, err := expenses.GetPayments(expense.Expense.ExpID) payments, err := expenses.GetPayments(expense.ExpID)
if err != nil { if err != nil {
ServerErrorView(c, "failed to fetch payments") ServerErrorView(c, "failed to fetch payments")
return return
} }
log.Println(payments)
categories, err := expenses.GetAllCategories() categories, err := expenses.GetAllCategories()
if err != nil { if err != nil {
@@ -171,7 +169,7 @@ func createExpense(c *gin.Context) {
} }
func updateExpense(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 { if err != nil {
c.Header("HX-Redirect", "/404") c.Header("HX-Redirect", "/404")
return return
@@ -197,7 +195,7 @@ func updateExpense(c *gin.Context) {
} }
func deleteExpense(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 { if err != nil {
c.Header("HX-Redirect", "/404") c.Header("HX-Redirect", "/404")
return return
+20 -20
View File
@@ -16,7 +16,7 @@ func processFormShares(c *gin.Context) ([]expenses.ExpenseShare, error) {
formShares := c.PostFormArray("shares-percent[]") formShares := c.PostFormArray("shares-percent[]")
for i := range sharesUserIDs { for i := range sharesUserIDs {
userID, err := strconv.Atoi(sharesUserIDs[i]) userID, err := strconv.ParseInt(sharesUserIDs[i], 10, 16)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -31,11 +31,11 @@ func processFormShares(c *gin.Context) ([]expenses.ExpenseShare, error) {
User: expenses.User{ User: expenses.User{
UserID: userID, UserID: userID,
}, },
Share: float32(share), Share: share,
} }
if formSharesIDs[i] != "" { if formSharesIDs[i] != "" {
id, err := strconv.Atoi(formSharesIDs[i]) id, err := strconv.ParseInt(formSharesIDs[i], 10, 16)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -54,9 +54,9 @@ func processFormPayments(c *gin.Context) ([]expenses.ExpensePayment, error) {
paymentsUserIDs := c.PostFormArray("payments-user-ids[]") paymentsUserIDs := c.PostFormArray("payments-user-ids[]")
formPaymentsIDs := c.PostFormArray("payments-ids[]") formPaymentsIDs := c.PostFormArray("payments-ids[]")
formPaymentsValues := c.PostFormArray("payments-payment[]") formPaymentsValues := c.PostFormArray("payments-payment[]")
for k := range paymentsUserIDs { for k := range paymentsUserIDs {
userID, err := strconv.Atoi(paymentsUserIDs[k]) userID, err := strconv.ParseInt(paymentsUserIDs[k], 10, 16)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -71,11 +71,11 @@ func processFormPayments(c *gin.Context) ([]expenses.ExpensePayment, error) {
User: expenses.User{ User: expenses.User{
UserID: userID, UserID: userID,
}, },
PayedAmount: float32(payed), PayedAmount: payed,
} }
if formPaymentsIDs[k] != "" { if formPaymentsIDs[k] != "" {
id, err := strconv.Atoi(formPaymentsIDs[k]) id, err := strconv.ParseInt(formPaymentsIDs[k], 10, 16)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -105,19 +105,19 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
} }
newTyp := c.PostForm("newexp-type-dropdown") newTyp := c.PostForm("newexp-type-dropdown")
typID, err := strconv.Atoi(newTyp) typID, err := strconv.ParseInt(newTyp, 10, 16)
if err != nil { if err != nil {
return nil, err return nil, err
} }
newCat := c.PostForm("newexp-cat-dropdown") newCat := c.PostForm("newexp-cat-dropdown")
catID, err := strconv.Atoi(newCat) catID, err := strconv.ParseInt(newCat, 10, 16)
if err != nil { if err != nil {
return nil, err return nil, err
} }
newStore := c.PostForm("newexp-store-dropdown") newStore := c.PostForm("newexp-store-dropdown")
storeID, err := strconv.Atoi(newStore) storeID, err := strconv.ParseInt(newStore, 10, 16)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -133,25 +133,25 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
newExp := expenses.Expense{ newExp := expenses.Expense{
Description: newDescription, Description: newDescription,
ExpDate: date, Date: date,
Value: float32(value), Value: value,
ExpType: expenses.Type{ Type: expenses.Type{
TypeID: typID, TypeID: typID,
}, },
ExpCategory: expenses.Category{ Category: expenses.Category{
CategoryID: catID, CategoryID: catID,
}, },
ExpStore: expenses.Store{ Store: expenses.Store{
StoreID: storeID, StoreID: storeID,
}, },
OwnerUser: expenses.User{ Owner: expenses.User{
// TODO // TODO
// This needs to be dynamic - to be added once we have logins and whatnot // This needs to be dynamic - to be added once we have logins and whatnot
UserID: 1, UserID: 1,
}, },
CreationDate: time.Now().Unix(), CreationDate: time.Now().Unix(),
Shares: shares, Shares: shares,
Payments: payments, Payments: payments,
} }
return &newExp, nil return &newExp, nil
} }
+3 -3
View File
@@ -17,7 +17,7 @@ type ExpenseDebtOverview struct {
type UserDebtSummary struct { type UserDebtSummary struct {
Debtor expenses.User Debtor expenses.User
Total float32 Total float64
} }
func overviewPartialPage(c *gin.Context) { 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{} expensesWithDebts := []ExpenseDebtOverview{}
for _, exp := range queriedExpenses { for _, exp := range queriedExpenses {
if len(exp.Shares) <= 1 { if len(exp.Shares) <= 1 {
@@ -97,7 +97,7 @@ func getResults(c *gin.Context) {
c.HTML(http.StatusOK, "overviewResults", gin.H{ c.HTML(http.StatusOK, "overviewResults", gin.H{
"expenses": expensesWithDebts, "expenses": expensesWithDebts,
"summary": userDebtSummary, "summary": userDebtSummary,
}) })
} }
+1 -1
View File
@@ -10,7 +10,7 @@ import (
) )
func deletePayment(c *gin.Context) { func deletePayment(c *gin.Context) {
paymentID, err := strconv.Atoi(c.Param("id")) paymentID, err := strconv.ParseInt(c.Param("id"), 10, 16)
if err != nil { if err != nil {
NotFoundView(c, "failed to fetch payment") NotFoundView(c, "failed to fetch payment")
return return
+8 -7
View File
@@ -1,6 +1,7 @@
package pages package pages
import ( import (
"database/sql"
"expenses/expenses" "expenses/expenses"
"fmt" "fmt"
@@ -30,19 +31,19 @@ func storesGlobalPage(c *gin.Context) {
} }
func storePage(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 { if err != nil {
NotFoundView(c, "didn't find request store") NotFoundView(c, "didn't find request store")
return return
} }
store, err := expenses.GetStore(storeID) store, err := expenses.GetStore(storeID)
if err != nil { if err == sql.ErrNoRows {
ServerErrorView(c, fmt.Sprintf("error getting store: %+v", err.Error())) NotFoundView(c, fmt.Sprintf("didn't find store with ID `%d`", storeID))
return return
} }
if store.StoreID == -1 { if err != nil {
NotFoundView(c, fmt.Sprintf("didn't store with ID `%d`", storeID)) ServerErrorView(c, fmt.Sprintf("error getting store: %+v", err.Error()))
return return
} }
@@ -80,7 +81,7 @@ func createStore(c *gin.Context) {
} }
func updateStore(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 { if err != nil {
c.Redirect(404, "/404") c.Redirect(404, "/404")
} }
@@ -101,7 +102,7 @@ func updateStore(c *gin.Context) {
} }
func deleteStore(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 { if err != nil {
c.Redirect(404, "/404") c.Redirect(404, "/404")
} }
+8 -7
View File
@@ -1,6 +1,7 @@
package pages package pages
import ( import (
"database/sql"
"expenses/expenses" "expenses/expenses"
"fmt" "fmt"
@@ -30,19 +31,19 @@ func typesGlobalPage(c *gin.Context) {
} }
func typePage(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 { if err != nil {
NotFoundView(c, "requested type doesn't exist") NotFoundView(c, "requested type doesn't exist")
return return
} }
typ, err := expenses.GetType(typeID) typ, err := expenses.GetType(typeID)
if err != nil { if err == sql.ErrNoRows {
ServerErrorView(c, "failed to retrieve requested type") NotFoundView(c, fmt.Sprintf("Couldn't find type `%d`", typeID))
return return
} }
if typ.TypeID == -1 { if err != nil {
NotFoundView(c, fmt.Sprintf("Couldn't find type `%d`", typeID)) ServerErrorView(c, "failed to retrieve requested type")
return return
} }
@@ -80,7 +81,7 @@ func createType(c *gin.Context) {
} }
func deleteType(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 { if err != nil {
c.Redirect(404, "/404") c.Redirect(404, "/404")
} }
@@ -105,7 +106,7 @@ func deleteType(c *gin.Context) {
} }
func updateType(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 { if err != nil {
c.Redirect(404, "/404") c.Redirect(404, "/404")
} }