Moving the domain models to a models package in expenses

This commit is contained in:
2025-08-07 18:02:28 +01:00
parent 86db133640
commit f0ca0051b6
15 changed files with 213 additions and 181 deletions
+18 -121
View File
@@ -1,141 +1,38 @@
package expenses package expenses
import ( import (
"context" mod "expenses/expenses/models"
"database/sql"
"fmt"
"expenses/config"
repo "expenses/expenses/db/repository"
_ "github.com/mattn/go-sqlite3"
) )
var ( func GetAllCategories() ([]mod.Category, error) {
ErrNotFound = fmt.Errorf("not found") return mod.GetAllCategories()
)
type Category struct {
CategoryID int64
CategoryName string
} }
func NewCategory() Category { func GetCategory(id int64) (mod.Category, error) {
return Category{ return mod.GetCategory(id)
CategoryID: -1,
CategoryName: "",
}
} }
func GetAllCategories() ([]Category, error) { func CreateCategory(name string) error {
cfg := config.GetInstance() newCat := mod.Category{
ctx := context.Background() CategoryName: name,
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return nil, err
}
defer db.Close()
queries := repo.New(db)
categories, err := queries.GetCategories(ctx)
if err != nil {
return []Category{}, nil
} }
return mapRepoCategories(categories), nil return newCat.Insert()
} }
func GetCategory(catID int64) (Category, error) { func UpdateCategory(id int64, name string) error {
cfg := config.GetInstance() cat := mod.Category{
ctx := context.Background() CategoryID: id,
CategoryName: name,
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return Category{}, err
} }
defer db.Close()
queries := repo.New(db) return cat.Update()
category, err := queries.GetCategory(ctx, catID)
return mapRepoCategory(category), err
} }
func (cat *Category) Insert() error { func DeleteCategory(id int64) error {
cfg := config.GetInstance() cat := mod.Category{
ctx := context.Background() CategoryID: id,
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
return err
}
defer db.Close()
queries := repo.New(db)
res, err := queries.InsertCategory(ctx, cat.CategoryName)
if err != nil {
return err
} }
rowsAffected, err := res.RowsAffected() return cat.Delete()
if err != nil {
return err
} else if rowsAffected == 0 {
return fmt.Errorf("no rows were created")
}
return nil
}
func (cat *Category) Delete() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
return err
}
defer db.Close()
queries := repo.New(db)
res, err := queries.DeleteCategory(ctx, cat.CategoryID)
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return ErrNotFound
}
return nil
}
func (cat *Category) Update() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
return err
}
defer db.Close()
queries := repo.New(db)
res, err := queries.UpdateCategory(ctx, repo.UpdateCategoryParams{
CategoryName: cat.CategoryName,
CategoryID: cat.CategoryID,
})
if err != nil {
return err
}
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return ErrNotFound
}
return nil
} }
-20
View File
@@ -1,20 +0,0 @@
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
}
+8
View File
@@ -0,0 +1,8 @@
package errors
import "fmt"
var (
ErrNotFound = fmt.Errorf("not found")
)
+5 -4
View File
@@ -1,6 +1,7 @@
package expenses package expenses
import ( import (
mod "expenses/expenses/models"
repo "expenses/expenses/db/repository" repo "expenses/expenses/db/repository"
) )
@@ -10,7 +11,7 @@ type Expense struct {
Value float64 Value float64
Store Store Store Store
Type Type Type Type
Category Category Category mod.Category
Owner User Owner User
Date int64 Date int64
Payments []ExpensePayment Payments []ExpensePayment
@@ -24,7 +25,7 @@ func NewExpense() Expense {
Description: "", Description: "",
Value: 0.0, Value: 0.0,
Store: NewStore(), Store: NewStore(),
Category: NewCategory(), Category: mod.NewCategory(),
Owner: NewUser(), Owner: NewUser(),
Date: 0, Date: 0,
Payments: []ExpensePayment{}, Payments: []ExpensePayment{},
@@ -46,7 +47,7 @@ func mapRepoGetExpenseRow(e repo.GetExpenseRow) Expense {
TypeID: e.ExpenseType.TypeID, TypeID: e.ExpenseType.TypeID,
TypeName: e.ExpenseType.TypeName, TypeName: e.ExpenseType.TypeName,
}, },
Category: Category{ Category: mod.Category{
CategoryID: e.Category.CategoryID, CategoryID: e.Category.CategoryID,
CategoryName: e.Category.CategoryName, CategoryName: e.Category.CategoryName,
}, },
@@ -74,7 +75,7 @@ func mapRepoGetExpenseRowMulti(e repo.GetExpensesRow) Expense {
TypeID: e.ExpenseType.TypeID, TypeID: e.ExpenseType.TypeID,
TypeName: e.ExpenseType.TypeName, TypeName: e.ExpenseType.TypeName,
}, },
Category: Category{ Category: mod.Category{
CategoryID: e.Category.CategoryID, CategoryID: e.Category.CategoryID,
CategoryName: e.Category.CategoryName, CategoryName: e.Category.CategoryName,
}, },
+151
View File
@@ -0,0 +1,151 @@
package models
import (
"context"
"database/sql"
config "expenses/config"
repo "expenses/expenses/db/repository"
experr "expenses/expenses/errors"
"fmt"
_ "github.com/mattn/go-sqlite3"
)
type Category struct {
CategoryID int64
CategoryName string
}
func NewCategory() Category {
return Category{
CategoryID: -1,
CategoryName: "",
}
}
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
}
func GetAllCategories() ([]Category, error) {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return nil, err
}
defer db.Close()
queries := repo.New(db)
categories, err := queries.GetCategories(ctx)
if err != nil {
return []Category{}, nil
}
return MapRepoCategories(categories), nil
}
func GetCategory(catID int64) (Category, error) {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return Category{}, err
}
defer db.Close()
queries := repo.New(db)
category, err := queries.GetCategory(ctx, catID)
return MapRepoCategory(category), err
}
func (cat *Category) Insert() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
return err
}
defer db.Close()
queries := repo.New(db)
res, err := queries.InsertCategory(ctx, cat.CategoryName)
if err != nil {
return err
}
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return fmt.Errorf("no rows were created")
}
return nil
}
func (cat *Category) Delete() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
return err
}
defer db.Close()
queries := repo.New(db)
res, err := queries.DeleteCategory(ctx, cat.CategoryID)
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return experr.ErrNotFound
}
return nil
}
func (cat *Category) Update() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on")
if err != nil {
return err
}
defer db.Close()
queries := repo.New(db)
res, err := queries.UpdateCategory(ctx, repo.UpdateCategoryParams{
CategoryName: cat.CategoryName,
CategoryID: cat.CategoryID,
})
if err != nil {
return err
}
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return experr.ErrNotFound
}
return nil
}
+3 -7
View File
@@ -2,6 +2,7 @@ package expenses
import ( import (
"context" "context"
experr "expenses/expenses/errors"
"expenses/config" "expenses/config"
repo "expenses/expenses/db/repository" repo "expenses/expenses/db/repository"
@@ -11,11 +12,6 @@ import (
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type Store struct {
StoreID int64
StoreName string
}
func NewStore() Store { func NewStore() Store {
return Store{ return Store{
StoreID: -1, StoreID: -1,
@@ -104,7 +100,7 @@ func (s *Store) Update() error {
if err != nil { if err != nil {
return err return err
} else if rowsAffected == 0 { } else if rowsAffected == 0 {
return ErrNotFound return experr.ErrNotFound
} }
return nil return nil
@@ -127,7 +123,7 @@ func (s *Store) Delete() error {
if err != nil { if err != nil {
return err return err
} else if rowsAffected == 0 { } else if rowsAffected == 0 {
return ErrNotFound return experr.ErrNotFound
} }
return nil return nil
@@ -2,6 +2,11 @@ package expenses
import repo "expenses/expenses/db/repository" import repo "expenses/expenses/db/repository"
type Store struct {
StoreID int64
StoreName string
}
func mapRepoStore(rs repo.Store) Store { func mapRepoStore(rs repo.Store) Store {
return Store{ return Store{
StoreID: rs.StoreID, StoreID: rs.StoreID,
+3 -7
View File
@@ -4,6 +4,7 @@ import (
"context" "context"
"expenses/config" "expenses/config"
repo "expenses/expenses/db/repository" repo "expenses/expenses/db/repository"
experr "expenses/expenses/errors"
"database/sql" "database/sql"
"fmt" "fmt"
@@ -11,11 +12,6 @@ import (
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type Type struct {
TypeID int64
TypeName string
}
func NewType() Type { func NewType() Type {
return Type{ return Type{
TypeID: -1, TypeID: -1,
@@ -110,7 +106,7 @@ func (typ *Type) Delete() error {
if err != nil { if err != nil {
return err return err
} else if rowsAffected == 0 { } else if rowsAffected == 0 {
return ErrNotFound return experr.ErrNotFound
} }
return nil return nil
@@ -139,7 +135,7 @@ func (typ *Type) Update() error {
if err != nil { if err != nil {
return err return err
} else if rowsAffected == 0 { } else if rowsAffected == 0 {
return ErrNotFound return experr.ErrNotFound
} }
return nil return nil
@@ -2,6 +2,11 @@ package expenses
import repo "expenses/expenses/db/repository" import repo "expenses/expenses/db/repository"
type Type struct {
TypeID int64
TypeName string
}
func mapRepoType(rt repo.ExpenseType) Type { func mapRepoType(rt repo.ExpenseType) Type {
return Type{ return Type{
TypeID: rt.TypeID, TypeID: rt.TypeID,
+5 -17
View File
@@ -3,6 +3,7 @@ package pages
import ( import (
"database/sql" "database/sql"
"expenses/expenses" "expenses/expenses"
experr "expenses/expenses/errors"
"encoding/json" "encoding/json"
"fmt" "fmt"
@@ -68,12 +69,8 @@ func newCategoryPage(c *gin.Context) {
func createCategory(c *gin.Context) { func createCategory(c *gin.Context) {
newCatName := c.PostForm("category-name") newCatName := c.PostForm("category-name")
err := expenses.CreateCategory(newCatName)
newCat := expenses.Category{
CategoryName: newCatName,
}
err := newCat.Insert()
if err != nil { if err != nil {
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
} }
@@ -87,14 +84,9 @@ func updateCategory(c *gin.Context) {
NotFoundView(c, "No such category") NotFoundView(c, "No such category")
return return
} }
categoryName := c.PostForm("category-name") categoryName := c.PostForm("category-name")
cat := expenses.Category{
CategoryID: categoryID,
CategoryName: categoryName,
}
err = cat.Update() err = expenses.UpdateCategory(categoryID, categoryName)
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))
@@ -111,12 +103,8 @@ func deleteCategory(c *gin.Context) {
return return
} }
cat := expenses.Category{ err = expenses.DeleteCategory(categoryID)
CategoryID: categoryID, if err == experr.ErrNotFound {
}
err = cat.Delete()
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)
return return
+2 -1
View File
@@ -4,6 +4,7 @@ import (
"database/sql" "database/sql"
"encoding/json" "encoding/json"
"expenses/expenses" "expenses/expenses"
experr "expenses/expenses/errors"
"fmt" "fmt"
"strconv" "strconv"
@@ -204,7 +205,7 @@ func deleteExpense(c *gin.Context) {
} }
err = payment.Delete() err = payment.Delete()
if err == expenses.ErrNotFound { if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", expenseID) errMsg := fmt.Sprintf("category %d not found", expenseID)
c.String(http.StatusNotFound, errMsg) c.String(http.StatusNotFound, errMsg)
return return
+2 -1
View File
@@ -1,6 +1,7 @@
package pages package pages
import ( import (
mod "expenses/expenses/models"
"expenses/expenses" "expenses/expenses"
"strconv" "strconv"
"time" "time"
@@ -138,7 +139,7 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
Type: expenses.Type{ Type: expenses.Type{
TypeID: typID, TypeID: typID,
}, },
Category: expenses.Category{ Category: mod.Category{
CategoryID: catID, CategoryID: catID,
}, },
Store: expenses.Store{ Store: expenses.Store{
+2 -1
View File
@@ -2,6 +2,7 @@ package pages
import ( import (
"expenses/expenses" "expenses/expenses"
experr "expenses/expenses/errors"
"strconv" "strconv"
"fmt" "fmt"
"net/http" "net/http"
@@ -21,7 +22,7 @@ func deletePayment(c *gin.Context) {
} }
err = payment.Delete() err = payment.Delete()
if err == expenses.ErrNotFound { if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", paymentID) errMsg := fmt.Sprintf("category %d not found", paymentID)
c.String(http.StatusNotFound, errMsg) c.String(http.StatusNotFound, errMsg)
return return
+2 -1
View File
@@ -3,6 +3,7 @@ package pages
import ( import (
"database/sql" "database/sql"
"expenses/expenses" "expenses/expenses"
experr "expenses/expenses/errors"
"fmt" "fmt"
"net/http" "net/http"
@@ -111,7 +112,7 @@ func deleteStore(c *gin.Context) {
StoreID: storeID, StoreID: storeID,
} }
err = store.Delete() err = store.Delete()
if err == expenses.ErrNotFound { if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", storeID) errMsg := fmt.Sprintf("category %d not found", storeID)
c.String(http.StatusNotFound, errMsg) c.String(http.StatusNotFound, errMsg)
return return
+2 -1
View File
@@ -3,6 +3,7 @@ package pages
import ( import (
"database/sql" "database/sql"
"expenses/expenses" "expenses/expenses"
experr "expenses/expenses/errors"
"fmt" "fmt"
"net/http" "net/http"
@@ -90,7 +91,7 @@ func deleteType(c *gin.Context) {
TypeID: typeID, TypeID: typeID,
} }
err = typ.Delete() err = typ.Delete()
if err == expenses.ErrNotFound { if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", typeID) errMsg := fmt.Sprintf("category %d not found", typeID)
c.String(http.StatusNotFound, errMsg) c.String(http.StatusNotFound, errMsg)
return return