diff --git a/src/TODO.md b/src/TODO.md index 75e9bdc..ab0b177 100644 --- a/src/TODO.md +++ b/src/TODO.md @@ -1,6 +1,7 @@ # TODO - [ ] On the categories page, add a column of how many times a given category is used +- [ ] Multiple categories per expense - [X] Make all the other items update/create page be like expenses - [ ] Make working with the DB better, yo - [ ] Ability to attach a document to an expense @@ -10,6 +11,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 +- [ ] Use shopspring/decimal for money handling diff --git a/src/expenses/app.go b/src/expenses/app.go new file mode 100644 index 0000000..a444867 --- /dev/null +++ b/src/expenses/app.go @@ -0,0 +1,34 @@ +package expenses + +import ( + "database/sql" + "expenses/config" + "log" +) + +var ( + Serv *Service +) + +type Service struct { + DB *sql.DB +} + +func NewExpenseService(db *sql.DB) *Service { + return &Service{ + DB: db, + } +} + +func StartApp() error { + config.SetConfig("./config.yaml") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") + if err != nil { + log.Fatalf("Failed to open DB: %v", err) + } + + Serv = NewExpenseService(db) + return nil +} diff --git a/src/expenses/categories.go b/src/expenses/categories.go index e423a31..a06816e 100644 --- a/src/expenses/categories.go +++ b/src/expenses/categories.go @@ -12,27 +12,59 @@ func GetCategory(id int64) (mod.Category, error) { return mod.GetCategory(id) } -func CreateCategory(name string) error { +func (s *Service) CreateCategory(name string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + newCat := mod.Category{ CategoryName: name, } - return newCat.Insert() + err = newCat.Insert(tx) + if err != nil { + return err + } + + return tx.Commit() } -func UpdateCategory(id int64, name string) error { +func (s *Service) UpdateCategory(id int64, name string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + cat := mod.Category{ CategoryID: id, CategoryName: name, } + err = cat.Update() + if err != nil { + return err + } - return cat.Update() + return tx.Commit() } -func DeleteCategory(id int64) error { +func (s *Service) DeleteCategory(id int64) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + cat := mod.Category{ CategoryID: id, } - return cat.Delete() + err = cat.Delete() + if err != nil { + return err + } + + return tx.Commit() } diff --git a/src/expenses/db/queries/users.sql b/src/expenses/db/queries/users.sql new file mode 100644 index 0000000..7c00128 --- /dev/null +++ b/src/expenses/db/queries/users.sql @@ -0,0 +1,2 @@ +-- name: GetUsers :many +SELECT * FROM users; diff --git a/src/expenses/db/repository/users.sql.go b/src/expenses/db/repository/users.sql.go new file mode 100644 index 0000000..e6374b3 --- /dev/null +++ b/src/expenses/db/repository/users.sql.go @@ -0,0 +1,37 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: users.sql + +package repository + +import ( + "context" +) + +const getUsers = `-- name: GetUsers :many +SELECT UserID, UserName, UserPass FROM users +` + +func (q *Queries) GetUsers(ctx context.Context) ([]User, error) { + rows, err := q.db.QueryContext(ctx, getUsers) + if err != nil { + return nil, err + } + defer rows.Close() + var items []User + for rows.Next() { + var i User + if err := rows.Scan(&i.UserID, &i.UserName, &i.UserPass); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/src/expenses/expensePayments.go b/src/expenses/expensePayments.go index f4ebe9a..769871b 100644 --- a/src/expenses/expensePayments.go +++ b/src/expenses/expensePayments.go @@ -45,10 +45,21 @@ func ParseFormPayments(userIDs []string, paymentsIDs []string, return payments, nil } -func DeletePayment(id int64) error { +func (s *Service) DeletePayment(id int64) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + payment := mod.ExpensePayment{ ExpPaymID: id, } - return payment.Delete() + err = payment.Delete(tx) + if err != nil { + return err + } + + return tx.Commit() } diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index 2417adb..20a3098 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -6,11 +6,19 @@ import ( "time" ) -func GetAllExpenses() ([]mod.Expense, error) { - return mod.GetAllExpenses() +func (s *Service) GetAllExpenses() ([]mod.Expense, error) { + tx, err := s.DB.Begin() + if err != nil { + return []mod.Expense{}, err + } + defer tx.Rollback() + + expenses, err := mod.GetAllExpenses(tx) + + return expenses, tx.Commit() } -func GetExpensesRanged(startDate string, endDate string) ([]mod.Expense, error) { +func (s *Service) GetExpensesRanged(startDate string, endDate string) ([]mod.Expense, error) { startDateTime, err := time.ParseInLocation("02-Jan-2006 15:04:05", startDate, time.UTC) if err != nil { log.Printf("error startDate: %v", err) @@ -25,17 +33,77 @@ func GetExpensesRanged(startDate string, endDate string) ([]mod.Expense, error) } end := endDateTime.Unix() - return mod.GetExpensesRange(start, end) + tx, err := s.DB.Begin() + if err != nil { + return []mod.Expense{}, err + } + defer tx.Rollback() + + expenses, err := mod.GetExpensesRange(tx, start, end) + + return expenses, tx.Commit() } -func GetExpense(id int64) (mod.Expense, error) { - return mod.GetExpense(id) +func (s *Service) GetExpense(id int64) (mod.Expense, error) { + tx, err := s.DB.Begin() + if err != nil { + return mod.Expense{}, err + } + defer tx.Rollback() + + expense, err := mod.GetExpense(tx, id) + if err != nil { + return mod.Expense{}, err + } + + return expense, tx.Commit() } -func DeleteExpense(id int64) error { +func (s *Service) DeleteExpense(id int64) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + expense := mod.Expense{ ExpID: id, } - return expense.Delete() + err = expense.Delete() + if err != nil { + return err + } + + return tx.Commit() +} + +func (s *Service) NewExpense(exp mod.Expense) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + + err = exp.Insert(tx) + if err != nil { + return err + } + + return tx.Commit() +} + +func (s *Service) UpdateExpense(exp mod.Expense) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + + err = exp.Update(tx) + if err != nil { + return err + } + + return tx.Commit() } diff --git a/src/expenses/models/category.go b/src/expenses/models/category.go index 75dff0b..62963d9 100644 --- a/src/expenses/models/category.go +++ b/src/expenses/models/category.go @@ -57,17 +57,10 @@ func GetCategory(catID int64) (Category, error) { return MapRepoCategory(category), err } -func (cat *Category) Insert() error { - cfg := config.GetInstance() +func (cat *Category) Insert(tx *sql.Tx) error { 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) + queries := repo.New(tx) res, err := queries.InsertCategory(ctx, cat.CategoryName) if err != nil { return err diff --git a/src/expenses/models/expense.go b/src/expenses/models/expense.go index c3ae40c..50c1084 100644 --- a/src/expenses/models/expense.go +++ b/src/expenses/models/expense.go @@ -38,25 +38,10 @@ func NewExpense() Expense { } } -func mapRepoGetExpensesRows(er []repo.GetExpensesRow) []Expense { - expenses := make([]Expense, len(er)) - for k, exp := range er { - expenses[k] = mapRepoGetExpenseRowMulti(exp) - } - return expenses -} - -func GetAllExpenses() ([]Expense, error) { - cfg := config.GetInstance() +func GetAllExpenses(tx *sql.Tx) ([]Expense, error) { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return []Expense{}, err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) expenses, err := queries.GetExpenses(ctx, repo.GetExpensesParams{ Startdate: nil, Enddate: nil, @@ -68,17 +53,10 @@ func GetAllExpenses() ([]Expense, error) { return mapRepoGetExpensesRows(expenses), nil } -func GetExpense(expID int64) (Expense, error) { - cfg := config.GetInstance() +func GetExpense(tx *sql.Tx, expID int64) (Expense, error) { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return Expense{}, err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) expense, err := queries.GetExpense(ctx, expID) if err != nil { return Expense{}, err @@ -87,23 +65,10 @@ func GetExpense(expID int64) (Expense, error) { return mapRepoGetExpenseRow(expense), nil } -func (exp *Expense) Insert() error { - cfg := config.GetInstance() +func (exp *Expense) Insert(tx *sql.Tx) error { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") - if err != nil { - return err - } - defer db.Close() - - // tx, err := db.Begin() - // if err != nil { - // return err - // } - // defer tx.Rollback() - - queries := repo.New(db) + queries := repo.New(tx) res, err := queries.InsertExpense(ctx, repo.InsertExpenseParams{ Description: exp.Description, Value: exp.Value, @@ -125,17 +90,14 @@ func (exp *Expense) Insert() error { exp.ExpID = expenseID - for _, share := range exp.Shares { - err := share.Insert(exp.ExpID) - if err != nil { - return err - } + err = exp.InsertShares(tx) + if err != nil { + return err } - for _, paym := range exp.Payments { - err := paym.Insert(exp.ExpID) - if err != nil { - return err - } + + err = exp.InsertPayments(tx) + if err != nil { + return err } rowsAffected, err := res.RowsAffected() @@ -145,26 +107,33 @@ 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 - // } - return nil } -func (e *Expense) Update() error { - cfg := config.GetInstance() +func (exp *Expense) InsertShares(tx *sql.Tx) error { + for _, share := range exp.Shares { + err := share.Insert(tx, exp.ExpID) + if err != nil { + return err + } + } + return nil +} + +func (exp *Expense) InsertPayments(tx *sql.Tx) error { + for _, paym := range exp.Payments { + err := paym.Insert(tx, exp.ExpID) + if err != nil { + return err + } + } + return nil +} + +func (e *Expense) Update(tx *sql.Tx) error { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) res, err := queries.UpdateExpense(ctx, repo.UpdateExpenseParams{ ExpID: e.ExpID, Description: e.Description, @@ -181,7 +150,7 @@ func (e *Expense) Update() error { for _, share := range e.Shares { if share.ExpShareID == -1 { - err := share.Insert(e.ExpID) + err := share.Insert(tx, e.ExpID) if err != nil { return err } @@ -192,7 +161,7 @@ func (e *Expense) Update() error { for _, paym := range e.Payments { if paym.ExpPaymID == -1 { - err := paym.Insert(e.ExpID) + err := paym.Insert(tx, e.ExpID) if err != nil { return err } @@ -238,17 +207,10 @@ 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() +func GetExpensesRange(tx *sql.Tx, start int64, end int64) ([]Expense, error) { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return []Expense{}, err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) expenses, err := queries.GetExpenses(ctx, repo.GetExpensesParams{ Startdate: start, Enddate: end, diff --git a/src/expenses/models/expensePayments.go b/src/expenses/models/expensePayments.go index 0ded578..daa1ec9 100644 --- a/src/expenses/models/expensePayments.go +++ b/src/expenses/models/expensePayments.go @@ -37,17 +37,10 @@ func (e *Expense) GetPayments() error { return nil } -func (p *ExpensePayment) Insert(expID int64) error { - cfg := config.GetInstance() +func (p *ExpensePayment) Insert(tx *sql.Tx, expID int64) error { 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) + queries := repo.New(tx) res, err := queries.InsertPayment(ctx, repo.InsertPaymentParams{ ExpID: expID, UserID: p.User.UserID, @@ -97,17 +90,10 @@ func (p *ExpensePayment) Update() error { return nil } -func (p *ExpensePayment) Delete() error { - cfg := config.GetInstance() +func (p *ExpensePayment) Delete(tx *sql.Tx) error { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) res, err := queries.DeletePayment(ctx, p.ExpPaymID) if err != nil { return err diff --git a/src/expenses/models/expenseRepoMap.go b/src/expenses/models/expenseRepoMap.go index 38dc54f..8aa5c23 100644 --- a/src/expenses/models/expenseRepoMap.go +++ b/src/expenses/models/expenseRepoMap.go @@ -57,3 +57,12 @@ func mapRepoGetExpenseRowMulti(e repo.GetExpensesRow) Expense { 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 +} + diff --git a/src/expenses/models/expenseShare.go b/src/expenses/models/expenseShare.go index d8e9d3c..2d2e86e 100644 --- a/src/expenses/models/expenseShare.go +++ b/src/expenses/models/expenseShare.go @@ -38,17 +38,10 @@ func (e *Expense) GetShares() error { return nil } -func (sh *ExpenseShare) Insert(expID int64) error { - cfg := config.GetInstance() +func (sh *ExpenseShare) Insert(tx *sql.Tx, expID int64) error { 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) + queries := repo.New(tx) res, err := queries.InsertShare(ctx, repo.InsertShareParams{ ExpID: expID, Share: sh.Share, diff --git a/src/expenses/models/store.go b/src/expenses/models/store.go index 5c2da85..c727903 100644 --- a/src/expenses/models/store.go +++ b/src/expenses/models/store.go @@ -2,7 +2,6 @@ package models import ( "context" - "expenses/config" repo "expenses/expenses/db/repository" experr "expenses/expenses/errors" @@ -24,17 +23,10 @@ func NewStore() Store { } } -func GetAllStores() ([]Store, error) { - cfg := config.GetInstance() +func GetAllStores(tx *sql.Tx) ([]Store, error) { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return []Store{}, err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) storeList, err := queries.GetStores(ctx) if err != nil { return []Store{}, err @@ -43,17 +35,10 @@ func GetAllStores() ([]Store, error) { return mapRepoStores(storeList), nil } -func GetStore(storeID int64) (Store, error) { - cfg := config.GetInstance() +func GetStore(tx *sql.Tx, storeID int64) (Store, error) { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return Store{}, err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) store, err := queries.GetStore(ctx, storeID) if err != nil { return Store{}, err @@ -62,17 +47,10 @@ func GetStore(storeID int64) (Store, error) { return mapRepoStore(store), nil } -func (s *Store) Insert() error { - cfg := config.GetInstance() +func (s *Store) Insert(tx *sql.Tx) error { 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) + queries := repo.New(tx) res, err := queries.InsertStore(ctx, s.StoreName) rowsAffected, err := res.RowsAffected() @@ -85,17 +63,10 @@ func (s *Store) Insert() error { return nil } -func (s *Store) Update() error { - cfg := config.GetInstance() +func (s *Store) Update(tx *sql.Tx) error { 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) + queries := repo.New(tx) res, err := queries.UpdateStore(ctx, repo.UpdateStoreParams{ StoreID: s.StoreID, StoreName: s.StoreName, @@ -111,17 +82,10 @@ func (s *Store) Update() error { return nil } -func (s *Store) Delete() error { - cfg := config.GetInstance() +func (s *Store) Delete(tx *sql.Tx) error { 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) + queries := repo.New(tx) res, err := queries.DeleteStore(ctx, s.StoreID) rowsAffected, err := res.RowsAffected() diff --git a/src/expenses/models/type.go b/src/expenses/models/type.go index 7c66f20..0e7f11a 100644 --- a/src/expenses/models/type.go +++ b/src/expenses/models/type.go @@ -2,7 +2,6 @@ package models import ( "context" - "expenses/config" repo "expenses/expenses/db/repository" experr "expenses/expenses/errors" @@ -24,17 +23,10 @@ func NewType() Type { } } -func GetAllTypes() ([]Type, error) { - cfg := config.GetInstance() +func GetAllTypes(tx *sql.Tx) ([]Type, error) { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return []Type{}, err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) typeList, err := queries.GetTypes(ctx) if err != nil { return []Type{}, err @@ -43,17 +35,10 @@ func GetAllTypes() ([]Type, error) { return mapRepoTypes(typeList), nil } -func GetType(typID int64) (Type, error) { - cfg := config.GetInstance() +func GetType(tx *sql.Tx, typID int64) (Type, error) { ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) - if err != nil { - return Type{}, err - } - defer db.Close() - - queries := repo.New(db) + queries := repo.New(tx) typ, err := queries.GetType(ctx, typID) if err != nil { return Type{}, err @@ -62,17 +47,10 @@ func GetType(typID int64) (Type, error) { return mapRepoType(typ), nil } -func (typ *Type) Insert() error { - cfg := config.GetInstance() +func (typ *Type) Insert(tx *sql.Tx) error { 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) + queries := repo.New(tx) res, err := queries.InsertType(ctx, typ.TypeName) if err != nil { return err @@ -91,17 +69,10 @@ func (typ *Type) Insert() error { return nil } -func (typ *Type) Delete() error { - cfg := config.GetInstance() +func (typ *Type) Delete(tx *sql.Tx) error { 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) + queries := repo.New(tx) res, err := queries.DeleteType(ctx, typ.TypeID) if err != nil { return err @@ -117,17 +88,10 @@ func (typ *Type) Delete() error { return nil } -func (typ *Type) Update() error { - cfg := config.GetInstance() +func (typ *Type) Update(tx *sql.Tx) error { 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) + queries := repo.New(tx) res, err := queries.UpdateType(ctx, repo.UpdateTypeParams{ TypeID: typ.TypeID, TypeName: typ.TypeName, diff --git a/src/expenses/models/user.go b/src/expenses/models/user.go index f7aa2f6..763df53 100644 --- a/src/expenses/models/user.go +++ b/src/expenses/models/user.go @@ -1,10 +1,9 @@ package models import ( - "expenses/config" - + "context" "database/sql" - "log" + repo "expenses/expenses/db/repository" _ "github.com/mattn/go-sqlite3" ) @@ -21,32 +20,14 @@ func NewUser() User { } } -func GetAllUsers() ([]User, error) { - cfg := config.GetInstance() +func GetAllUsers(tx *sql.Tx) ([]User, error) { + ctx := context.Background() - db, err := sql.Open(cfg.DBSys, cfg.DBPath) + queries := repo.New(tx) + userList, err := queries.GetUsers(ctx) if err != nil { - return nil, err - } - defer db.Close() - - query := "SELECT UserID,UserName " + - "FROM users" - - var userList []User - rows, err := db.Query(query) - if err != nil { - return nil, err + return []User{}, err } - for rows.Next() { - user := &User{} - err := rows.Scan(&user.UserID, &user.UserName) - if err != nil { - log.Fatalf("Failed to parse data from db: %v", err) - } - userList = append(userList, *user) - } - - return userList, nil + return mapRepoUsers(userList), nil } diff --git a/src/expenses/models/userRepoMap.go b/src/expenses/models/userRepoMap.go new file mode 100644 index 0000000..eb0f39d --- /dev/null +++ b/src/expenses/models/userRepoMap.go @@ -0,0 +1,18 @@ +package models + +import repo "expenses/expenses/db/repository" + +func mapRepoUser(ru repo.User) User { + return User{ + UserID: ru.UserID, + UserName: ru.UserName, + } +} + +func mapRepoUsers(ru []repo.User) []User { + users := make([]User, len(ru)) + for k, u := range ru { + users[k] = mapRepoUser(u) + } + return users +} diff --git a/src/expenses/stores.go b/src/expenses/stores.go index d5ea228..51dda7d 100644 --- a/src/expenses/stores.go +++ b/src/expenses/stores.go @@ -4,33 +4,86 @@ import ( mod "expenses/expenses/models" ) -func GetAllStores() ([]mod.Store, error) { - return mod.GetAllStores() +func (s *Service) GetAllStores() ([]mod.Store, error) { + tx, err := s.DB.Begin() + if err != nil { + return []mod.Store{}, err + } + defer tx.Rollback() + + stores, err := mod.GetAllStores(tx) + if err != nil { + return []mod.Store{}, err + } + + return stores, tx.Commit() } -func GetStore(id int64) (mod.Store, error) { - return mod.GetStore(id) +func (s *Service) GetStore(id int64) (mod.Store, error) { + tx, err := s.DB.Begin() + if err != nil { + return mod.Store{}, err + } + defer tx.Rollback() + + store, err := mod.GetStore(tx, id) + if err != nil { + return mod.Store{}, err + } + + return store, tx.Commit() } -func NewStore(name string) error { +func (s *Service) NewStore(name string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + newStore := mod.Store{ StoreName: name, } - return newStore.Insert() + + err = newStore.Insert(tx) + return tx.Commit() } -func UpdateStore(id int64, name string) error { +func (s *Service) UpdateStore(id int64, name string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + store := mod.Store{ StoreID: id, StoreName: name, } - return store.Update() + err = store.Update(tx) + if err != nil { + return err + } + + return tx.Commit() } -func DeleteStore(id int64) error { +func (s *Service) DeleteStore(id int64) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + store := mod.Store{ StoreID: id, } - return store.Delete() + + err = store.Delete(tx) + if err != nil { + return err + } + + return tx.Commit() } diff --git a/src/expenses/types.go b/src/expenses/types.go index 5bd6564..e8ab691 100644 --- a/src/expenses/types.go +++ b/src/expenses/types.go @@ -4,32 +4,90 @@ import ( mod "expenses/expenses/models" ) -func GetAllTypes() ([]mod.Type, error) { - return mod.GetAllTypes() +func (s *Service) GetAllTypes() ([]mod.Type, error) { + tx, err := s.DB.Begin() + if err != nil { + return []mod.Type{}, err + } + defer tx.Rollback() + + types, err := mod.GetAllTypes(tx) + if err != nil { + return []mod.Type{}, err + } + + return types, tx.Commit() } -func GetType(id int64) (mod.Type, error) { - return mod.GetType(id) +func (s *Service) GetType(id int64) (mod.Type, error) { + tx, err := s.DB.Begin() + if err != nil { + return mod.Type{}, err + } + defer tx.Rollback() + + typ, err := mod.GetType(tx, id) + if err != nil { + return mod.Type{}, err + } + + return typ, tx.Commit() } -func NewType(name string) error { +func (s *Service) NewType(name string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + newTyp := mod.Type{ TypeName: name, } - return newTyp.Insert() + + err = newTyp.Insert(tx) + if err != nil { + return err + } + + return tx.Commit() } -func DeleteType(id int64) error { +func (s *Service) DeleteType(id int64) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + typ := mod.Type{ TypeID: id, } - return typ.Delete() + + err = typ.Delete(tx) + if err != nil { + return err + } + + return tx.Commit() } -func UpdateType(id int64, name string) error { +func (s *Service) UpdateType(id int64, name string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + newTyp := mod.Type{ TypeID: id, TypeName: name, } - return newTyp.Update() + + err = newTyp.Update(tx) + if err != nil { + return err + } + + return tx.Commit() } diff --git a/src/expenses/users.go b/src/expenses/users.go index dc189c2..deea53e 100644 --- a/src/expenses/users.go +++ b/src/expenses/users.go @@ -4,6 +4,17 @@ import ( mod "expenses/expenses/models" ) -func GetAllUsers() ([]mod.User, error) { - return mod.GetAllUsers() +func (s *Service) GetAllUsers() ([]mod.User, error) { + tx, err := s.DB.Begin() + if err != nil { + return []mod.User{}, err + } + defer tx.Rollback() + + users, err := mod.GetAllUsers(tx) + if err != nil { + return []mod.User{}, err + } + + return users, tx.Commit() } diff --git a/src/main.go b/src/main.go index 04f42e3..09c2ab1 100644 --- a/src/main.go +++ b/src/main.go @@ -2,6 +2,7 @@ package main import ( "expenses/config" + "expenses/expenses" "expenses/pages" "fmt" @@ -26,10 +27,7 @@ var tmplFuncMap = template.FuncMap{ }, } -func main() { - config.SetConfig("./config.yaml") - cfg := config.GetInstance() - +func configGin(cfg *config.Configuration) *gin.Engine { gin.SetMode(ginMode) templates := template.Must( template.New(""). @@ -43,6 +41,10 @@ func main() { router.StaticFS("/assets", http.Dir(cfg.AssetsDir)) router.StaticFile("/favicon.ico", fp.Join(cfg.AssetsDir, "img/favicon.webp")) + return router +} + +func setRoutes(router *gin.Engine) { pages.RouteHome(router) pages.RouteExpenses(router) pages.RouteCategories(router) @@ -52,6 +54,16 @@ func main() { pages.RouteOverview(router) pages.RouteNotFound(router) pages.RouteServerError(router) +} + +func main() { + if err := expenses.StartApp(); err != nil { + log.Fatal("failed to start app:", err.Error()) + } + cfg := config.GetInstance() + + router := configGin(cfg) + setRoutes(router) err := router.Run(":" + cfg.Port) if err != nil { diff --git a/src/pages/categories.go b/src/pages/categories.go index 7e355e3..3e64ed8 100644 --- a/src/pages/categories.go +++ b/src/pages/categories.go @@ -2,7 +2,7 @@ package pages import ( "database/sql" - "expenses/expenses" + exp "expenses/expenses" experr "expenses/expenses/errors" "encoding/json" @@ -18,7 +18,7 @@ const ( ) func categoriesGlobalPage(c *gin.Context) { - categories, err := expenses.GetAllCategories() + categories, err := exp.GetAllCategories() if err != nil { ServerErrorView(c, "The server too makes mistakes") return @@ -39,7 +39,7 @@ func categoryPage(c *gin.Context) { return } - category, err := expenses.GetCategory(categoryID) + category, err := exp.GetCategory(categoryID) if err == sql.ErrNoRows { NotFoundView(c, fmt.Sprintf("Could not find category `%d`", categoryID)) return @@ -69,7 +69,7 @@ func newCategoryPage(c *gin.Context) { func createCategory(c *gin.Context) { newCatName := c.PostForm("category-name") - err := expenses.CreateCategory(newCatName) + err := exp.Serv.CreateCategory(newCatName) if err != nil { c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) @@ -79,14 +79,14 @@ func createCategory(c *gin.Context) { } func updateCategory(c *gin.Context) { - categoryID, err := expenses.ParseID(c.Param("id")) + categoryID, err := exp.ParseID(c.Param("id")) if err != nil { NotFoundView(c, "No such category") return } categoryName := c.PostForm("category-name") - err = expenses.UpdateCategory(categoryID, categoryName) + err = exp.Serv.UpdateCategory(categoryID, categoryName) if err != nil { errMsg, _ := json.Marshal(err.Error()) c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg)) @@ -97,13 +97,13 @@ func updateCategory(c *gin.Context) { } func deleteCategory(c *gin.Context) { - categoryID, err := expenses.ParseID(c.Param("id")) + categoryID, err := exp.ParseID(c.Param("id")) if err != nil { NotFoundView(c, "No such category") return } - err = expenses.DeleteCategory(categoryID) + err = exp.Serv.DeleteCategory(categoryID) if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", categoryID) c.String(http.StatusNotFound, errMsg) diff --git a/src/pages/expenses.go b/src/pages/expenses.go index bf3d1b9..fabf7b0 100644 --- a/src/pages/expenses.go +++ b/src/pages/expenses.go @@ -3,11 +3,10 @@ package pages import ( "database/sql" "encoding/json" - "expenses/expenses" + exp "expenses/expenses" experr "expenses/expenses/errors" mod "expenses/expenses/models" "fmt" - "strconv" "net/http" @@ -19,7 +18,7 @@ const ( ) func expensesPartial(c *gin.Context) { - expenses, err := expenses.GetAllExpenses() + expenses, err := exp.Serv.GetAllExpenses() if err != nil { c.Header("HX-Redirect", "/500") return @@ -31,7 +30,7 @@ func expensesPartial(c *gin.Context) { } func ExpensesGlobalPage(c *gin.Context) { - expenses, err := expenses.GetAllExpenses() + expenses, err := exp.Serv.GetAllExpenses() if err != nil { c.Header("HX-Redirect", "/500") return @@ -46,13 +45,13 @@ func ExpensesGlobalPage(c *gin.Context) { } func expensePage(c *gin.Context) { - expenseID, err := expenses.ParseID(c.Param("id")) + expenseID, err := exp.ParseID(c.Param("id")) if err != nil { ServerErrorView(c, "failed to parse requested expenses id") return } - expense, err := expenses.GetExpense(expenseID) + expense, err := exp.Serv.GetExpense(expenseID) if err == sql.ErrNoRows { NotFoundView(c, "didn't find requested expense") return @@ -70,25 +69,25 @@ func expensePage(c *gin.Context) { return } - categories, err := expenses.GetAllCategories() + categories, err := exp.GetAllCategories() if err != nil { ServerErrorView(c, "failed to fetch categories") return } - stores, err := expenses.GetAllStores() + stores, err := exp.Serv.GetAllStores() if err != nil { ServerErrorView(c, "failed to fetch stores") return } - types, err := expenses.GetAllTypes() + types, err := exp.Serv.GetAllTypes() if err != nil { ServerErrorView(c, "failed to fetch types") return } - users, err := expenses.GetAllUsers() + users, err := exp.Serv.GetAllUsers() if err != nil { ServerErrorView(c, "failed to fetch users") return @@ -115,25 +114,25 @@ func expensePage(c *gin.Context) { } func newExpensePage(c *gin.Context) { - categories, err := expenses.GetAllCategories() + categories, err := exp.GetAllCategories() if err != nil { ServerErrorView(c, "failed to fetch categories") return } - stores, err := expenses.GetAllStores() + stores, err := exp.Serv.GetAllStores() if err != nil { ServerErrorView(c, "failed to fetch stores") return } - types, err := expenses.GetAllTypes() + types, err := exp.Serv.GetAllTypes() if err != nil { ServerErrorView(c, "failed to fetch types") return } - users, err := expenses.GetAllUsers() + users, err := exp.Serv.GetAllUsers() if err != nil { ServerErrorView(c, "failed to fetch users") return @@ -160,7 +159,7 @@ func createExpense(c *gin.Context) { c.Header("HX-Redirect", "/500") } - err = newExp.Insert() + err = exp.Serv.NewExpense(*newExp) if err != nil { c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) return @@ -170,7 +169,7 @@ func createExpense(c *gin.Context) { } func updateExpense(c *gin.Context) { - expenseID, err := expenses.ParseID(c.Param("id")) + expenseID, err := exp.ParseID(c.Param("id")) if err != nil { c.Header("HX-Redirect", "/404") return @@ -185,7 +184,7 @@ func updateExpense(c *gin.Context) { } newExp.ExpID = expenseID - err = newExp.Update() + err = exp.Serv.UpdateExpense(*newExp) if err != nil { errMsg, _ := json.Marshal(err.Error()) c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg)) @@ -196,13 +195,13 @@ func updateExpense(c *gin.Context) { } func deleteExpense(c *gin.Context) { - expenseID, err := strconv.ParseInt(c.Param("id"), 10, 16) + expenseID, err := exp.ParseID(c.Param("id")) if err != nil { c.Header("HX-Redirect", "/404") return } - err = expenses.DeleteExpense(expenseID) + err = exp.Serv.DeleteExpense(expenseID) if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", expenseID) c.String(http.StatusNotFound, errMsg) diff --git a/src/pages/overview.go b/src/pages/overview.go index 15b131f..4ad30e1 100644 --- a/src/pages/overview.go +++ b/src/pages/overview.go @@ -1,7 +1,7 @@ package pages import ( - "expenses/expenses" + exp "expenses/expenses" mod "expenses/expenses/models" "log" @@ -12,7 +12,7 @@ import ( type ExpenseDebtOverview struct { Exp *mod.Expense - Debtors []expenses.Debt + Debtors []exp.Debt } type UserDebtSummary struct { @@ -36,7 +36,7 @@ func getResults(c *gin.Context) { startDate := c.PostForm("range-start") + " 00:00:00" endDate := c.PostForm("range-end") + " 23:59:59" - queriedExpenses, err := expenses.GetExpensesRanged(startDate, endDate) + queriedExpenses, err := exp.Serv.GetExpensesRanged(startDate, endDate) if err != nil { log.Printf("getting expenses: %v", err) return @@ -58,12 +58,12 @@ func getResults(c *gin.Context) { userDebtSummary := make(map[mod.User]float64) expensesWithDebts := []ExpenseDebtOverview{} - for _, exp := range queriedExpenses { - if len(exp.Shares) <= 1 { + for _, e := range queriedExpenses { + if len(e.Shares) <= 1 { continue } - expenseDebts, err := expenses.CalculateDebts(&exp) + expenseDebts, err := exp.CalculateDebts(&e) if err != nil { // whatevs yo continue @@ -73,7 +73,7 @@ func getResults(c *gin.Context) { } expensesWithDebts = append(expensesWithDebts, ExpenseDebtOverview{ - Exp: &exp, Debtors: expenseDebts, + Exp: &e, Debtors: expenseDebts, }) for _, debt := range expenseDebts { diff --git a/src/pages/payments.go b/src/pages/payments.go index 739f089..e8bdccd 100644 --- a/src/pages/payments.go +++ b/src/pages/payments.go @@ -1,23 +1,22 @@ package pages import ( - "expenses/expenses" + exp "expenses/expenses" experr "expenses/expenses/errors" "fmt" "net/http" - "strconv" "github.com/gin-gonic/gin" ) func deletePayment(c *gin.Context) { - paymentID, err := expenses.ParseID(c.Param("id")) + paymentID, err := exp.ParseID(c.Param("id")) if err != nil { NotFoundView(c, "failed to fetch payment") return } - err = expenses.DeletePayment(paymentID) + err = exp.Serv.DeletePayment(paymentID) if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", paymentID) c.String(http.StatusNotFound, errMsg) diff --git a/src/pages/stores.go b/src/pages/stores.go index 2201b55..937d5bc 100644 --- a/src/pages/stores.go +++ b/src/pages/stores.go @@ -2,7 +2,7 @@ package pages import ( "database/sql" - "expenses/expenses" + exp "expenses/expenses" experr "expenses/expenses/errors" "fmt" @@ -17,7 +17,7 @@ const ( ) func storesGlobalPage(c *gin.Context) { - stores, err := expenses.GetAllStores() + stores, err := exp.Serv.GetAllStores() if err != nil { ServerErrorView(c, "Failed to fetch stores content") return @@ -38,7 +38,7 @@ func storePage(c *gin.Context) { return } - store, err := expenses.GetStore(storeID) + store, err := exp.Serv.GetStore(storeID) if err == sql.ErrNoRows { NotFoundView(c, fmt.Sprintf("didn't find store with ID `%d`", storeID)) return @@ -69,7 +69,7 @@ func newStorePage(c *gin.Context) { func createStore(c *gin.Context) { storeName := c.PostForm("store-name") - err := expenses.NewStore(storeName) + err := exp.Serv.NewStore(storeName) if err != nil { c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) } @@ -78,13 +78,13 @@ func createStore(c *gin.Context) { } func updateStore(c *gin.Context) { - storeID, err := expenses.ParseID(c.Param("id")) + storeID, err := exp.ParseID(c.Param("id")) if err != nil { c.Redirect(404, "/404") } newName := c.PostForm("store-name") - err = expenses.UpdateStore(storeID, newName) + err = exp.Serv.UpdateStore(storeID, newName) if err != nil { c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) return @@ -94,12 +94,12 @@ func updateStore(c *gin.Context) { } func deleteStore(c *gin.Context) { - storeID, err := expenses.ParseID(c.Param("id")) + storeID, err := exp.ParseID(c.Param("id")) if err != nil { c.Redirect(404, "/404") } - err = expenses.DeleteStore(storeID) + err = exp.Serv.DeleteStore(storeID) if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", storeID) c.String(http.StatusNotFound, errMsg) diff --git a/src/pages/types.go b/src/pages/types.go index 2cbacd8..edd95b5 100644 --- a/src/pages/types.go +++ b/src/pages/types.go @@ -2,7 +2,7 @@ package pages import ( "database/sql" - "expenses/expenses" + exp "expenses/expenses" experr "expenses/expenses/errors" "fmt" @@ -17,7 +17,7 @@ const ( ) func typesGlobalPage(c *gin.Context) { - types, err := expenses.GetAllTypes() + types, err := exp.Serv.GetAllTypes() if err != nil { ServerErrorView(c, "the server failed to get the types") return @@ -38,7 +38,7 @@ func typePage(c *gin.Context) { return } - typ, err := expenses.GetType(typeID) + typ, err := exp.Serv.GetType(typeID) if err == sql.ErrNoRows { NotFoundView(c, fmt.Sprintf("Couldn't find type `%d`", typeID)) return @@ -69,7 +69,7 @@ func newTypePage(c *gin.Context) { func createType(c *gin.Context) { newTypName := c.PostForm("type-name") - err := expenses.NewType(newTypName) + err := exp.Serv.NewType(newTypName) if err != nil { c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) } @@ -78,12 +78,12 @@ func createType(c *gin.Context) { } func deleteType(c *gin.Context) { - typeID, err := expenses.ParseID(c.Param("id")) + typeID, err := exp.ParseID(c.Param("id")) if err != nil { c.Redirect(404, "/404") } - err = expenses.DeleteType(typeID) + err = exp.Serv.DeleteType(typeID) if err == experr.ErrNotFound { errMsg := fmt.Sprintf("category %d not found", typeID) c.String(http.StatusNotFound, errMsg) @@ -100,13 +100,13 @@ func deleteType(c *gin.Context) { } func updateType(c *gin.Context) { - typeID, err := expenses.ParseID(c.Param("id")) + typeID, err := exp.ParseID(c.Param("id")) if err != nil { c.Redirect(404, "/404") } newName := c.PostForm("type-name") - err = expenses.UpdateType(typeID, newName) + err = exp.Serv.UpdateType(typeID, newName) if err != nil { c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) return