diff --git a/src/expenses/categories.go b/src/expenses/categories.go index 88bb0c7..e423a31 100644 --- a/src/expenses/categories.go +++ b/src/expenses/categories.go @@ -1,141 +1,38 @@ package expenses import ( - "context" - "database/sql" - "fmt" - - "expenses/config" - repo "expenses/expenses/db/repository" - - _ "github.com/mattn/go-sqlite3" + mod "expenses/expenses/models" ) -var ( - ErrNotFound = fmt.Errorf("not found") -) - -type Category struct { - CategoryID int64 - CategoryName string +func GetAllCategories() ([]mod.Category, error) { + return mod.GetAllCategories() } -func NewCategory() Category { - return Category{ - CategoryID: -1, - CategoryName: "", - } +func GetCategory(id int64) (mod.Category, error) { + return mod.GetCategory(id) } -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 +func CreateCategory(name string) error { + newCat := mod.Category{ + CategoryName: name, } - return mapRepoCategories(categories), nil + return newCat.Insert() } -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 +func UpdateCategory(id int64, name string) error { + cat := mod.Category{ + CategoryID: id, + CategoryName: name, } - defer db.Close() - queries := repo.New(db) - category, err := queries.GetCategory(ctx, catID) - - return mapRepoCategory(category), err + return cat.Update() } -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 +func DeleteCategory(id int64) error { + cat := mod.Category{ + CategoryID: id, } - 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 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 + return cat.Delete() } diff --git a/src/expenses/categoriesMapper.go b/src/expenses/categoriesMapper.go deleted file mode 100644 index 3d4a298..0000000 --- a/src/expenses/categoriesMapper.go +++ /dev/null @@ -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 -} diff --git a/src/expenses/errors/errors.go b/src/expenses/errors/errors.go new file mode 100644 index 0000000..24be0e6 --- /dev/null +++ b/src/expenses/errors/errors.go @@ -0,0 +1,8 @@ +package errors + +import "fmt" + +var ( + ErrNotFound = fmt.Errorf("not found") +) + diff --git a/src/expenses/expensesDomainModel.go b/src/expenses/expensesDomainModel.go index c522711..089dbd6 100644 --- a/src/expenses/expensesDomainModel.go +++ b/src/expenses/expensesDomainModel.go @@ -1,6 +1,7 @@ package expenses import ( + mod "expenses/expenses/models" repo "expenses/expenses/db/repository" ) @@ -10,7 +11,7 @@ type Expense struct { Value float64 Store Store Type Type - Category Category + Category mod.Category Owner User Date int64 Payments []ExpensePayment @@ -24,7 +25,7 @@ func NewExpense() Expense { Description: "", Value: 0.0, Store: NewStore(), - Category: NewCategory(), + Category: mod.NewCategory(), Owner: NewUser(), Date: 0, Payments: []ExpensePayment{}, @@ -46,7 +47,7 @@ func mapRepoGetExpenseRow(e repo.GetExpenseRow) Expense { TypeID: e.ExpenseType.TypeID, TypeName: e.ExpenseType.TypeName, }, - Category: Category{ + Category: mod.Category{ CategoryID: e.Category.CategoryID, CategoryName: e.Category.CategoryName, }, @@ -74,7 +75,7 @@ func mapRepoGetExpenseRowMulti(e repo.GetExpensesRow) Expense { TypeID: e.ExpenseType.TypeID, TypeName: e.ExpenseType.TypeName, }, - Category: Category{ + Category: mod.Category{ CategoryID: e.Category.CategoryID, CategoryName: e.Category.CategoryName, }, diff --git a/src/expenses/models/categories.go b/src/expenses/models/categories.go new file mode 100644 index 0000000..aef9712 --- /dev/null +++ b/src/expenses/models/categories.go @@ -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 +} diff --git a/src/expenses/stores.go b/src/expenses/stores.go index fab4efc..55057f3 100644 --- a/src/expenses/stores.go +++ b/src/expenses/stores.go @@ -2,6 +2,7 @@ package expenses import ( "context" + experr "expenses/expenses/errors" "expenses/config" repo "expenses/expenses/db/repository" @@ -11,11 +12,6 @@ import ( _ "github.com/mattn/go-sqlite3" ) -type Store struct { - StoreID int64 - StoreName string -} - func NewStore() Store { return Store{ StoreID: -1, @@ -104,7 +100,7 @@ func (s *Store) Update() error { if err != nil { return err } else if rowsAffected == 0 { - return ErrNotFound + return experr.ErrNotFound } return nil @@ -127,7 +123,7 @@ func (s *Store) Delete() error { if err != nil { return err } else if rowsAffected == 0 { - return ErrNotFound + return experr.ErrNotFound } return nil diff --git a/src/expenses/storesMapper.go b/src/expenses/storesDomainModel.go.go similarity index 85% rename from src/expenses/storesMapper.go rename to src/expenses/storesDomainModel.go.go index f5e8b45..35a3455 100644 --- a/src/expenses/storesMapper.go +++ b/src/expenses/storesDomainModel.go.go @@ -2,6 +2,11 @@ package expenses import repo "expenses/expenses/db/repository" +type Store struct { + StoreID int64 + StoreName string +} + func mapRepoStore(rs repo.Store) Store { return Store{ StoreID: rs.StoreID, diff --git a/src/expenses/types.go b/src/expenses/types.go index 3349ebc..c9ee751 100644 --- a/src/expenses/types.go +++ b/src/expenses/types.go @@ -4,6 +4,7 @@ import ( "context" "expenses/config" repo "expenses/expenses/db/repository" + experr "expenses/expenses/errors" "database/sql" "fmt" @@ -11,11 +12,6 @@ import ( _ "github.com/mattn/go-sqlite3" ) -type Type struct { - TypeID int64 - TypeName string -} - func NewType() Type { return Type{ TypeID: -1, @@ -110,7 +106,7 @@ func (typ *Type) Delete() error { if err != nil { return err } else if rowsAffected == 0 { - return ErrNotFound + return experr.ErrNotFound } return nil @@ -139,7 +135,7 @@ func (typ *Type) Update() error { if err != nil { return err } else if rowsAffected == 0 { - return ErrNotFound + return experr.ErrNotFound } return nil diff --git a/src/expenses/typesMapper.go b/src/expenses/typesDomainModel.go.go similarity index 85% rename from src/expenses/typesMapper.go rename to src/expenses/typesDomainModel.go.go index 864f213..aada7da 100644 --- a/src/expenses/typesMapper.go +++ b/src/expenses/typesDomainModel.go.go @@ -2,6 +2,11 @@ package expenses import repo "expenses/expenses/db/repository" +type Type struct { + TypeID int64 + TypeName string +} + func mapRepoType(rt repo.ExpenseType) Type { return Type{ TypeID: rt.TypeID, diff --git a/src/pages/categories.go b/src/pages/categories.go index 3bb9f36..a4ef09a 100644 --- a/src/pages/categories.go +++ b/src/pages/categories.go @@ -3,6 +3,7 @@ package pages import ( "database/sql" "expenses/expenses" + experr "expenses/expenses/errors" "encoding/json" "fmt" @@ -68,12 +69,8 @@ func newCategoryPage(c *gin.Context) { func createCategory(c *gin.Context) { newCatName := c.PostForm("category-name") + err := expenses.CreateCategory(newCatName) - newCat := expenses.Category{ - CategoryName: newCatName, - } - - err := newCat.Insert() if err != nil { c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) } @@ -87,14 +84,9 @@ func updateCategory(c *gin.Context) { NotFoundView(c, "No such category") return } - categoryName := c.PostForm("category-name") - cat := expenses.Category{ - CategoryID: categoryID, - CategoryName: categoryName, - } - err = cat.Update() + err = expenses.UpdateCategory(categoryID, categoryName) if err != nil { errMsg, _ := json.Marshal(err.Error()) c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg)) @@ -111,12 +103,8 @@ func deleteCategory(c *gin.Context) { return } - cat := expenses.Category{ - CategoryID: categoryID, - } - - err = cat.Delete() - if err == expenses.ErrNotFound { + err = expenses.DeleteCategory(categoryID) + if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", categoryID) c.String(http.StatusNotFound, errMsg) return diff --git a/src/pages/expenses.go b/src/pages/expenses.go index b7b9ce6..f34ed50 100644 --- a/src/pages/expenses.go +++ b/src/pages/expenses.go @@ -4,6 +4,7 @@ import ( "database/sql" "encoding/json" "expenses/expenses" + experr "expenses/expenses/errors" "fmt" "strconv" @@ -204,7 +205,7 @@ func deleteExpense(c *gin.Context) { } err = payment.Delete() - if err == expenses.ErrNotFound { + if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", expenseID) c.String(http.StatusNotFound, errMsg) return diff --git a/src/pages/expensesHelper.go b/src/pages/expensesHelper.go index 9623ae9..5d91353 100644 --- a/src/pages/expensesHelper.go +++ b/src/pages/expensesHelper.go @@ -1,6 +1,7 @@ package pages import ( + mod "expenses/expenses/models" "expenses/expenses" "strconv" "time" @@ -138,7 +139,7 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) { Type: expenses.Type{ TypeID: typID, }, - Category: expenses.Category{ + Category: mod.Category{ CategoryID: catID, }, Store: expenses.Store{ diff --git a/src/pages/payments.go b/src/pages/payments.go index b711254..1aa0a1f 100644 --- a/src/pages/payments.go +++ b/src/pages/payments.go @@ -2,6 +2,7 @@ package pages import ( "expenses/expenses" + experr "expenses/expenses/errors" "strconv" "fmt" "net/http" @@ -21,7 +22,7 @@ func deletePayment(c *gin.Context) { } err = payment.Delete() - if err == expenses.ErrNotFound { + if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", paymentID) c.String(http.StatusNotFound, errMsg) return diff --git a/src/pages/stores.go b/src/pages/stores.go index 0484180..6064e2f 100644 --- a/src/pages/stores.go +++ b/src/pages/stores.go @@ -3,6 +3,7 @@ package pages import ( "database/sql" "expenses/expenses" + experr "expenses/expenses/errors" "fmt" "net/http" @@ -111,7 +112,7 @@ func deleteStore(c *gin.Context) { StoreID: storeID, } err = store.Delete() - if err == expenses.ErrNotFound { + if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", storeID) c.String(http.StatusNotFound, errMsg) return diff --git a/src/pages/types.go b/src/pages/types.go index bfb4d1b..1763cbb 100644 --- a/src/pages/types.go +++ b/src/pages/types.go @@ -3,6 +3,7 @@ package pages import ( "database/sql" "expenses/expenses" + experr "expenses/expenses/errors" "fmt" "net/http" @@ -90,7 +91,7 @@ func deleteType(c *gin.Context) { TypeID: typeID, } err = typ.Delete() - if err == expenses.ErrNotFound { + if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", typeID) c.String(http.StatusNotFound, errMsg) return