sqlc migration done

This commit is contained in:
2025-08-07 13:47:34 +01:00
parent 31f596a150
commit 86db133640
14 changed files with 286 additions and 132 deletions
+3
View File
@@ -10,3 +10,6 @@ used
- [ ] Make the models just return errors and not do any handling themselves
- [ ] Reduce the size of the font file
- [ ] Add some migration tool
- [ ] The shares float values aren't being stored correctly : (
- [ ] Ownership on the image for the expenses webapp dir need to be changed
- [ ] The button for deleting share rows isn't working at all unlike the payments
+1 -1
View File
@@ -36,7 +36,7 @@
</td>
</tr>
{{ range .payments }}
{{ range .expense.Payments }}
{{ $payment := . }}
<tr data-id="{{ $payment.ExpPaymID }}">
<td>
+1 -1
View File
@@ -34,7 +34,7 @@
</td>
</tr>
{{ range .shares }}
{{ range .expense.Shares }}
{{ $share := . }}
<tr>
<td>
+20 -1
View File
@@ -13,7 +13,11 @@ JOIN
JOIN
Users ON UserID = OwnerUserId
JOIN
"expenseTypes" as types ON types.TypeID = expenses.TypeID;
"expenseTypes" as types ON types.TypeID = expenses.TypeID
WHERE
(sqlc.narg(startDate) IS NULL OR expenses."ExpDate" >= sqlc.narg(startDate))
AND
(sqlc.narg(endDate) IS NULL OR expenses."ExpDate" <= sqlc.narg(endDate));
-- name: GetExpense :one
SELECT
@@ -44,3 +48,18 @@ INSERT INTO expenses(
"ExpDate","CreationDate"
)
VALUES(?, ?, ? , ?, ?, ?, ?, ?);
-- name: DeleteExpense :execresult
DELETE FROM expenses WHERE "ExpID" = ?;
-- name: UpdateExpense :execresult
UPDATE expenses
SET
"Description" = ?,
"Value" = ?,
"StoreID" = ?,
"CategoryID" = ?,
"TypeID" = ?,
"OwnerUserID" = ?,
"ExpDate" = ?
WHERE "ExpID" = ?;
+14
View File
@@ -6,3 +6,17 @@ FROM
JOIN
users as users ON users.UserID = payments.UserID
WHERE "ExpID" = ?;
-- name: InsertPayment :execresult
INSERT INTO "expensesPayments"(
"ExpID", "UserID", "Payed"
)
VALUES(?, ?, ?);
-- name: UpdatePayment :execresult
UPDATE expensesPayments
SET "UserID" = ?, "Payed" = ?
WHERE "ExpPaymID" = ?;
-- name: DeletePayment :execresult
DELETE FROM "expensesPayments" WHERE "ExpPaymID" = ?;
+11
View File
@@ -6,3 +6,14 @@ FROM
JOIN
users as users ON users.UserID = shares.UserID
WHERE "ExpID" = ?;
-- name: InsertShare :execresult
INSERT INTO "expensesShares"(
"ExpID", "UserID", "Share"
)
VALUES(?, ?, ?);
-- name: UpdateShare :execresult
UPDATE expensesShares
SET "UserID" = ?, "Share" = ?
WHERE "ExpShareID" = ?;
+56 -2
View File
@@ -10,6 +10,14 @@ import (
"database/sql"
)
const deleteExpense = `-- name: DeleteExpense :execresult
DELETE FROM expenses WHERE "ExpID" = ?
`
func (q *Queries) DeleteExpense(ctx context.Context, expid int64) (sql.Result, error) {
return q.db.ExecContext(ctx, deleteExpense, expid)
}
const getExpense = `-- name: GetExpense :one
SELECT
expenses.ExpID, expenses.Description, expenses.Value, expenses.StoreID, expenses.CategoryID, expenses.OwnerUserID, expenses.TypeID, expenses.ExpDate, expenses.CreationDate,
@@ -80,8 +88,17 @@ JOIN
Users ON UserID = OwnerUserId
JOIN
"expenseTypes" as types ON types.TypeID = expenses.TypeID
WHERE
(?1 IS NULL OR expenses."ExpDate" >= ?1)
AND
(?2 IS NULL OR expenses."ExpDate" <= ?2)
`
type GetExpensesParams struct {
Startdate interface{}
Enddate interface{}
}
type GetExpensesRow struct {
Expense Expense
Store Store
@@ -90,8 +107,8 @@ type GetExpensesRow struct {
ExpenseType ExpenseType
}
func (q *Queries) GetExpenses(ctx context.Context) ([]GetExpensesRow, error) {
rows, err := q.db.QueryContext(ctx, getExpenses)
func (q *Queries) GetExpenses(ctx context.Context, arg GetExpensesParams) ([]GetExpensesRow, error) {
rows, err := q.db.QueryContext(ctx, getExpenses, arg.Startdate, arg.Enddate)
if err != nil {
return nil, err
}
@@ -167,3 +184,40 @@ func (q *Queries) InsertExpense(ctx context.Context, arg InsertExpenseParams) (s
arg.CreationDate,
)
}
const updateExpense = `-- name: UpdateExpense :execresult
UPDATE expenses
SET
"Description" = ?,
"Value" = ?,
"StoreID" = ?,
"CategoryID" = ?,
"TypeID" = ?,
"OwnerUserID" = ?,
"ExpDate" = ?
WHERE "ExpID" = ?
`
type UpdateExpenseParams struct {
Description string
Value float64
StoreID int64
CategoryID int64
TypeID int64
OwnerUserID int64
ExpDate int64
ExpID int64
}
func (q *Queries) UpdateExpense(ctx context.Context, arg UpdateExpenseParams) (sql.Result, error) {
return q.db.ExecContext(ctx, updateExpense,
arg.Description,
arg.Value,
arg.StoreID,
arg.CategoryID,
arg.TypeID,
arg.OwnerUserID,
arg.ExpDate,
arg.ExpID,
)
}
@@ -7,8 +7,17 @@ package repository
import (
"context"
"database/sql"
)
const deletePayment = `-- name: DeletePayment :execresult
DELETE FROM "expensesPayments" WHERE "ExpPaymID" = ?
`
func (q *Queries) DeletePayment(ctx context.Context, exppaymid int64) (sql.Result, error) {
return q.db.ExecContext(ctx, deletePayment, exppaymid)
}
const getPayments = `-- name: GetPayments :many
SELECT
payments.ExpPaymID, payments.ExpID, payments.UserID, payments.Payed, users.UserID, users.UserName, users.UserPass
@@ -54,3 +63,36 @@ func (q *Queries) GetPayments(ctx context.Context, expid int64) ([]GetPaymentsRo
}
return items, nil
}
const insertPayment = `-- name: InsertPayment :execresult
INSERT INTO "expensesPayments"(
"ExpID", "UserID", "Payed"
)
VALUES(?, ?, ?)
`
type InsertPaymentParams struct {
ExpID int64
UserID int64
Payed float64
}
func (q *Queries) InsertPayment(ctx context.Context, arg InsertPaymentParams) (sql.Result, error) {
return q.db.ExecContext(ctx, insertPayment, arg.ExpID, arg.UserID, arg.Payed)
}
const updatePayment = `-- name: UpdatePayment :execresult
UPDATE expensesPayments
SET "UserID" = ?, "Payed" = ?
WHERE "ExpPaymID" = ?
`
type UpdatePaymentParams struct {
UserID int64
Payed float64
ExpPaymID int64
}
func (q *Queries) UpdatePayment(ctx context.Context, arg UpdatePaymentParams) (sql.Result, error) {
return q.db.ExecContext(ctx, updatePayment, arg.UserID, arg.Payed, arg.ExpPaymID)
}
+34
View File
@@ -7,6 +7,7 @@ package repository
import (
"context"
"database/sql"
)
const getShares = `-- name: GetShares :many
@@ -54,3 +55,36 @@ func (q *Queries) GetShares(ctx context.Context, expid int64) ([]GetSharesRow, e
}
return items, nil
}
const insertShare = `-- name: InsertShare :execresult
INSERT INTO "expensesShares"(
"ExpID", "UserID", "Share"
)
VALUES(?, ?, ?)
`
type InsertShareParams struct {
ExpID int64
UserID int64
Share float64
}
func (q *Queries) InsertShare(ctx context.Context, arg InsertShareParams) (sql.Result, error) {
return q.db.ExecContext(ctx, insertShare, arg.ExpID, arg.UserID, arg.Share)
}
const updateShare = `-- name: UpdateShare :execresult
UPDATE expensesShares
SET "UserID" = ?, "Share" = ?
WHERE "ExpShareID" = ?
`
type UpdateShareParams struct {
UserID int64
Share float64
ExpShareID int64
}
func (q *Queries) UpdateShare(ctx context.Context, arg UpdateShareParams) (sql.Result, error) {
return q.db.ExecContext(ctx, updateShare, arg.UserID, arg.Share, arg.ExpShareID)
}
+25 -24
View File
@@ -3,7 +3,7 @@ package expenses
import (
"context"
"expenses/config"
"expenses/expenses/db/repository"
repo "expenses/expenses/db/repository"
"database/sql"
"fmt"
@@ -11,27 +11,29 @@ import (
_ "github.com/mattn/go-sqlite3"
)
func GetPayments(expID int64) ([]ExpensePayment, error) {
func (e *Expense) GetPayments() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return []ExpensePayment{}, err
return err
}
defer db.Close()
queries := repository.New(db)
payments, err := queries.GetPayments(ctx, expID)
queries := repo.New(db)
payments, err := queries.GetPayments(ctx, e.ExpID)
if err != nil {
return []ExpensePayment{}, err
return err
}
return mapRepoGetPaymentsRows(payments), nil
e.Payments = mapRepoGetPaymentsRows(payments)
return nil
}
func (p *ExpensePayment) Insert(expID int64) error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
@@ -39,12 +41,12 @@ func (p *ExpensePayment) Insert(expID int64) error {
}
defer db.Close()
query := "INSERT INTO expensesPayments(" +
"ExpID,UserID,Payed" +
") " +
"VALUES(?, ?, ?)"
res, err := db.Exec(query, expID, p.User.UserID, p.PayedAmount)
queries := repo.New(db)
res, err := queries.InsertPayment(ctx, repo.InsertPaymentParams{
ExpID: expID,
UserID: p.User.UserID,
Payed: p.PayedAmount,
})
if err != nil {
return err
}
@@ -61,6 +63,7 @@ func (p *ExpensePayment) Insert(expID int64) error {
func (p *ExpensePayment) Update() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
@@ -68,13 +71,12 @@ func (p *ExpensePayment) Update() error {
}
defer db.Close()
query := "UPDATE expensesPayments " +
"SET " +
"UserID = ?," +
"Payed = ? " +
"WHERE ExpPaymID = ?"
res, err := db.Exec(query, p.User.UserID, p.PayedAmount, p.ExpPaymID)
queries := repo.New(db)
res, err := queries.UpdatePayment(ctx, repo.UpdatePaymentParams{
ExpPaymID: p.ExpPaymID,
Payed: p.PayedAmount,
UserID: p.User.UserID,
})
if err != nil {
return err
}
@@ -91,6 +93,7 @@ func (p *ExpensePayment) Update() error {
func (p *ExpensePayment) Delete() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
@@ -98,10 +101,8 @@ func (p *ExpensePayment) Delete() error {
}
defer db.Close()
query := "DELETE FROM expensesPayments " +
"WHERE ExpPaymID = ?"
res, err := db.Exec(query, p.ExpPaymID)
queries := repo.New(db)
res, err := queries.DeletePayment(ctx, p.ExpPaymID)
if err != nil {
return err
}
+21 -18
View File
@@ -4,6 +4,7 @@ import (
"context"
"expenses/config"
"expenses/expenses/db/repository"
repo "expenses/expenses/db/repository"
"database/sql"
"fmt"
@@ -11,27 +12,29 @@ import (
_ "github.com/mattn/go-sqlite3"
)
func GetShares(expID int64) ([]ExpenseShare, error) {
func (e *Expense) GetShares() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return []ExpenseShare{}, err
return err
}
defer db.Close()
queries := repository.New(db)
shares, err := queries.GetShares(ctx, expID)
shares, err := queries.GetShares(ctx, e.ExpID)
if err != nil {
return []ExpenseShare{}, err
return err
}
return mapRepoGetSharesRows(shares), nil
e.Shares = mapRepoGetSharesRows(shares)
return nil
}
func (sh *ExpenseShare) Insert(expID int64) error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
@@ -39,12 +42,12 @@ func (sh *ExpenseShare) Insert(expID int64) error {
}
defer db.Close()
query := "INSERT INTO expensesShares(" +
"ExpID,UserID,Share" +
") " +
"VALUES(?, ?, ?)"
res, err := db.Exec(query, expID, sh.User.UserID, sh.Share)
queries := repo.New(db)
res, err := queries.InsertShare(ctx, repo.InsertShareParams{
ExpID: expID,
Share: sh.Share,
UserID: sh.User.UserID,
})
if err != nil {
return err
}
@@ -61,6 +64,7 @@ func (sh *ExpenseShare) Insert(expID int64) error {
func (sh *ExpenseShare) Update() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
@@ -68,13 +72,12 @@ func (sh *ExpenseShare) Update() error {
}
defer db.Close()
query := "UPDATE expensesShares " +
"SET " +
"UserID = ?," +
"Share = ? " +
"WHERE ExpShareID = ?"
res, err := db.Exec(query, sh.User.UserID, sh.Share, sh.ExpShareID)
queries := repo.New(db)
res, err := queries.UpdateShare(ctx, repo.UpdateShareParams{
ExpShareID: sh.ExpShareID,
Share: sh.Share,
UserID: sh.User.UserID,
})
if err != nil {
return err
}
+44 -69
View File
@@ -7,7 +7,6 @@ import (
"database/sql"
"fmt"
"log"
_ "github.com/mattn/go-sqlite3"
)
@@ -23,7 +22,10 @@ func GetAllExpenses() ([]Expense, error) {
defer db.Close()
queries := repo.New(db)
expenses, err := queries.GetExpenses(ctx)
expenses, err := queries.GetExpenses(ctx, repo.GetExpensesParams{
Startdate: nil,
Enddate: nil,
})
if err != nil {
return []Expense{}, err
}
@@ -60,13 +62,13 @@ func (exp *Expense) Insert() error {
}
defer db.Close()
tx, err := db.Begin()
if err != nil {
return err
}
defer tx.Rollback()
// tx, err := db.Begin()
// if err != nil {
// return err
// }
// defer tx.Rollback()
queries := repo.New(tx)
queries := repo.New(db)
res, err := queries.InsertExpense(ctx, repo.InsertExpenseParams{
Description: exp.Description,
Value: exp.Value,
@@ -108,17 +110,18 @@ func (exp *Expense) Insert() error {
return fmt.Errorf("no rows were created")
}
if err = tx.Commit(); err != nil {
// TODO
// Add some kind of log here otherwise we could jusr return the commit res
return err
}
// 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
}
func (exp *Expense) Update() error {
func (e *Expense) Update() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
@@ -126,29 +129,24 @@ func (exp *Expense) Update() error {
}
defer db.Close()
query := "UPDATE expenses " +
"SET " +
"Description = ?," +
"Value = ?," +
"StoreID = ?," +
"CategoryID = ?," +
"TypeID = ?," +
"OwnerUserID = ?," +
"ExpDate = ?" +
"WHERE ExpID = ?"
res, err := db.Exec(query,
exp.Description, exp.Value, exp.Store.StoreID,
exp.Category.CategoryID, exp.Type.TypeID, exp.Owner.UserID,
exp.Date, exp.ExpID,
)
queries := repo.New(db)
res, err := queries.UpdateExpense(ctx, repo.UpdateExpenseParams{
ExpID: e.ExpID,
Description: e.Description,
Value: e.Value,
StoreID: e.Store.StoreID,
CategoryID: e.Category.CategoryID,
TypeID: e.Type.TypeID,
OwnerUserID: e.Owner.UserID,
ExpDate: e.Date,
})
if err != nil {
return err
}
for _, share := range exp.Shares {
for _, share := range e.Shares {
if share.ExpShareID == -1 {
err := share.Insert(exp.ExpID)
err := share.Insert(e.ExpID)
if err != nil {
return err
}
@@ -157,9 +155,9 @@ func (exp *Expense) Update() error {
}
}
for _, paym := range exp.Payments {
for _, paym := range e.Payments {
if paym.ExpPaymID == -1 {
err := paym.Insert(exp.ExpID)
err := paym.Insert(e.ExpID)
if err != nil {
return err
}
@@ -180,6 +178,7 @@ func (exp *Expense) Update() error {
func (e *Expense) Delete() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
@@ -187,10 +186,8 @@ func (e *Expense) Delete() error {
}
defer db.Close()
query := "DELETE FROM expenses " +
"WHERE ExpID = ?"
res, err := db.Exec(query, e.ExpID)
queries := repo.New(db)
res, err := queries.DeleteExpense(ctx, e.ExpID)
if err != nil {
return err
}
@@ -208,44 +205,22 @@ func (e *Expense) Delete() error {
// SHITTY QUERIES THAT I NEED TO PUT IN SOMEWHERE MORE OGRANHJASLD
func GetExpensesRange(start int64, end int64) ([]Expense, error) {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return nil, err
return []Expense{}, err
}
defer db.Close()
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 " +
"WHERE ExpDate >= ? and ExpDate <= ?"
var expList []Expense
rows, err := db.Query(query, start, end)
queries := repo.New(db)
expenses, err := queries.GetExpenses(ctx, repo.GetExpensesParams{
Startdate: start,
Enddate: end,
})
if err != nil {
return nil, err
return []Expense{}, err
}
for rows.Next() {
exp := &Expense{}
err := rows.Scan(
&exp.ExpID, &exp.Description, &exp.Value,
&exp.Store.StoreID, &exp.Store.StoreName,
&exp.Category.CategoryID, &exp.Category.CategoryName,
&exp.Owner.UserID, &exp.Owner.UserName,
&exp.Date, &exp.CreationDate,
)
if err != nil {
log.Fatalf("Failed to parse data from db: %v", err)
}
expList = append(expList, *exp)
}
return expList, nil
return mapRepoGetExpensesRows(expenses), nil
}
+2 -4
View File
@@ -55,13 +55,13 @@ func expensePage(c *gin.Context) {
return
}
shares, err := expenses.GetShares(expense.ExpID)
err = expense.GetShares()
if err != nil {
ServerErrorView(c, "failed to fetch shares")
return
}
payments, err := expenses.GetPayments(expense.ExpID)
err = expense.GetPayments()
if err != nil {
ServerErrorView(c, "failed to fetch payments")
return
@@ -107,8 +107,6 @@ func expensePage(c *gin.Context) {
"stores": stores,
"types": types,
"users": users,
"shares": shares,
"payments": payments,
// "summary": summary,
})
}
+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]float64)
expensesWithDebts := []ExpenseDebtOverview{}