x/spend-sparrow
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat(account): #49 refactor error handling

Browse Source
This commit is contained in:
Tim Wundenberg
2025-05-08 21:45:53 +02:00
parent 4744da0bee
commit 5cfea4e2d3
14 changed files with 142 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
db/account.go
View File

@@ -1,6 +1,7 @@
package db
import (
"database/sql"
"spend-sparrow/log"
"spend-sparrow/types"
@@ -31,7 +32,7 @@ func (db AccountSqlite) Insert(userId uuid.UUID, account *types.Account) error {
INSERT INTO account (id, user_id, name, current_balance, oink_balance, created_at, created_by)
VALUES (?,?,?,?,?,?,?)`, account.Id, userId, account.Name, 0, 0, account.CreatedAt, account.CreatedBy)
if err != nil {
log.Error("Error inserting account: %v", err)
log.Error("account Insert: %v", err)
return types.ErrInternal
}
@@ -40,7 +41,6 @@ func (db AccountSqlite) Insert(userId uuid.UUID, account *types.Account) error {
func (db AccountSqlite) Update(userId uuid.UUID, account *types.Account) error {
log.Info("Updating account: %v", account)
r, err := db.db.Exec(`
UPDATE account
SET
@@ -53,17 +53,17 @@ func (db AccountSqlite) Update(userId uuid.UUID, account *types.Account) error {
WHERE id = ?
AND user_id = ?`, account.Name, account.CurrentBalance, account.LastTransaction, account.OinkBalance, account.UpdatedAt, account.UpdatedBy, account.Id, userId)
if err != nil {
log.Error("Error updating account: %v", err)
log.Error("account Update: %v", err)
return types.ErrInternal
}
rows, err := r.RowsAffected()
if err != nil {
log.Error("Error deleting account, getting rows affected: %v", err)
log.Error("account Update: %v", err)
return types.ErrInternal
}
if rows == 0 {
log.Error("Error deleting account, rows affected: %v", rows)
log.Info("account Update: not found")
return ErrNotFound
}
@@ -82,7 +82,7 @@ func (db AccountSqlite) GetAll(userId uuid.UUID) ([]*types.Account, error) {
WHERE user_id = ?
ORDER BY name`, userId)
if err != nil {
log.Error("Could not getAll accounts: %v", err)
log.Error("account GetAll: %v", err)
return nil, types.ErrInternal
}
@@ -101,7 +101,10 @@ func (db AccountSqlite) Get(userId uuid.UUID, id uuid.UUID) (*types.Account, err
WHERE user_id = ?
AND id = ?`, userId, id)
if err != nil {
log.Error("Could not get accounts: %v", err)
if err == sql.ErrNoRows {
return nil, ErrNotFound
}
log.Error("account Get: %v", err)
return nil, types.ErrInternal
}
@@ -112,18 +115,18 @@ func (db AccountSqlite) Delete(userId uuid.UUID, id uuid.UUID) error {
res, err := db.db.Exec("DELETE FROM account WHERE id = ? and user_id = ?", id, userId)
if err != nil {
log.Error("Error deleting account: %v", err)
log.Error("account Delete: %v", err)
return types.ErrInternal
}
rows, err := res.RowsAffected()
if err != nil {
log.Error("Error deleting account, getting rows affected: %v", err)
log.Error("account Delete: %v", err)
return types.ErrInternal
}
if rows == 0 {
log.Error("Error deleting account, rows affected: %v", rows)
log.Info("account Delete: not found")
return ErrNotFound
}

10
db/error.go Normal file
View File

@@ -0,0 +1,10 @@
package db
import (
"errors"
)
var (
ErrNotFound = errors.New("the value does not exist")
ErrAlreadyExists = errors.New("row already exists")
)

5
db/default.go → db/migration.go
View File

@@ -12,11 +12,6 @@ import (
"github.com/jmoiron/sqlx"
)
var (
ErrNotFound = errors.New("the value does not exist")
ErrAlreadyExists = errors.New("row already exists")
)
func RunMigrations(db *sqlx.DB, pathPrefix string) error {
driver, err := sqlite3.WithInstance(db.DB, &sqlite3.Config{})
if err != nil {

22
handler/account.go
View File

@@ -1,15 +1,14 @@
package handler
import (
"fmt"
"net/http"
"spend-sparrow/handler/middleware"
"spend-sparrow/log"
"spend-sparrow/service"
t "spend-sparrow/template/account"
"spend-sparrow/types"
"spend-sparrow/utils"
"net/http"
"github.com/a-h/templ"
"github.com/google/uuid"
)
@@ -49,7 +48,7 @@ func (h AccountImpl) handleAccountPage() http.HandlerFunc {
accounts, err := h.s.GetAll(user)
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", "Internal Server Error", http.StatusInternalServerError)
handleError(w, r, err)
return
}
@@ -69,20 +68,19 @@ func (h AccountImpl) handleAccountItemComp() http.HandlerFunc {
idStr := r.PathValue("id")
if idStr == "new" {
comp := t.EditAccount(nil)
log.Info("Component: %v", comp)
h.r.Render(r, w, comp)
return
}
id, err := uuid.Parse(idStr)
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", "Could not parse Id", http.StatusBadRequest)
handleError(w, r, fmt.Errorf("could not parse Id: %w", service.ErrBadRequest))
return
}
account, err := h.s.Get(user, id)
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", "Internal Server Error", http.StatusInternalServerError)
handleError(w, r, err)
return
}
@@ -113,18 +111,18 @@ func (h AccountImpl) handleUpdateAccount() http.HandlerFunc {
if idStr == "new" {
account, err = h.s.Add(user, name)
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", err.Error(), http.StatusInternalServerError)
handleError(w, r, err)
return
}
} else {
id, err := uuid.Parse(idStr)
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", "Could not parse Id", http.StatusBadRequest)
handleError(w, r, fmt.Errorf("could not parse Id: %w", service.ErrBadRequest))
return
}
account, err = h.s.Update(user, id, name)
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", err.Error(), http.StatusInternalServerError)
handleError(w, r, err)
return
}
}
@@ -144,13 +142,13 @@ func (h AccountImpl) handleDeleteAccount() http.HandlerFunc {
id, err := uuid.Parse(r.PathValue("id"))
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", "Could not parse Id", http.StatusBadRequest)
handleError(w, r, fmt.Errorf("could not parse Id: %w", service.ErrBadRequest))
return
}
err = h.s.Delete(user, id)
if err != nil {
utils.TriggerToastWithStatus(w, r, "error", err.Error(), http.StatusInternalServerError)
handleError(w, r, err)
return
}
}

30
handler/error.go Normal file
View File

@@ -0,0 +1,30 @@
package handler
import (
"errors"
"net/http"
"spend-sparrow/service"
"spend-sparrow/utils"
"strings"
)
func handleError(w http.ResponseWriter, r *http.Request, err error) {
if errors.Is(err, service.ErrUnauthorized) {
utils.TriggerToastWithStatus(w, r, "error", "You are not autorized to perform this operation.", http.StatusUnauthorized)
return
} else if errors.Is(err, service.ErrBadRequest) {
utils.TriggerToastWithStatus(w, r, "error", extractErrorMessage(err), http.StatusBadRequest)
return
}
utils.TriggerToastWithStatus(w, r, "error", "Internal Server Error", http.StatusInternalServerError)
}
func extractErrorMessage(err error) string {
errMsg := err.Error()
if errMsg == "" {
return ""
}
return strings.SplitN(errMsg, ":", 2)[0]
}

4
handler/middleware/cross_site_request_forgery.go
View File

@@ -37,10 +37,6 @@ func (rr *csrfResponseWriter) Write(data []byte) (int, error) {
return rr.ResponseWriter.Write([]byte(dataStr))
}
func (rr *csrfResponseWriter) WriteHeader(statusCode int) {
rr.ResponseWriter.WriteHeader(statusCode)
}
func CrossSiteRequestForgery(auth service.Auth) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

8
handler/middleware/gzip.go
View File

@@ -27,11 +27,13 @@ func Gzip(next http.Handler) http.Handler {
w.Header().Set("Content-Encoding", "gzip")
gz := gzip.NewWriter(w)
gzr := gzipResponseWriter{Writer: gz, ResponseWriter: w}
next.ServeHTTP(gzr, r)
wrapper := gzipResponseWriter{Writer: gz, ResponseWriter: w}
next.ServeHTTP(wrapper, r)
err := gz.Close()
if err != nil {
if err != nil && err != http.ErrBodyNotAllowed {
// if err != nil {
log.Error("Gzip: could not close Writer: %v", err)
}
})

2
handler/middleware/logger.go
View File

@@ -27,8 +27,8 @@ type WrappedWriter struct {
}
func (w *WrappedWriter) WriteHeader(code int) {
w.ResponseWriter.WriteHeader(code)
w.StatusCode = code
w.ResponseWriter.WriteHeader(code)
}
func Log(next http.Handler) http.Handler {

3
handler/root_and_404.go
View File

@@ -1,12 +1,11 @@
package handler
import (
"net/http"
"spend-sparrow/handler/middleware"
"spend-sparrow/service"
"spend-sparrow/template"
"net/http"
"github.com/a-h/templ"
)

3
main.go
View File

@@ -134,8 +134,7 @@ func createHandler(d *sqlx.DB, serverSettings *types.Settings) http.Handler {
middleware.CacheControl,
middleware.CrossSiteRequestForgery(authService),
middleware.Authenticate(authService),
middleware.Log,
// Gzip last, as it compresses the body
middleware.Gzip,
middleware.Log,
)
}

105
service/account.go
View File

@@ -1,7 +1,7 @@
package service
import (
"errors"
"fmt"
"regexp"
"spend-sparrow/db"
@@ -39,17 +39,17 @@ func NewAccountImpl(db db.Account, random Random, clock Clock, settings *types.S
}
}
func (service AccountImpl) Add(user *types.User, name string) (*types.Account, error) {
func (s AccountImpl) Add(user *types.User, name string) (*types.Account, error) {
if user == nil {
return nil, types.ErrInternal
return nil, ErrUnauthorized
}
newId, err := service.random.UUID()
newId, err := s.random.UUID()
if err != nil {
return nil, types.ErrInternal
}
err = service.validateAccount(name)
err = s.validateAccount(name)
if err != nil {
return nil, err
}
@@ -64,61 +64,48 @@ func (service AccountImpl) Add(user *types.User, name string) (*types.Account, e
LastTransaction: nil,
OinkBalance: 0,
CreatedAt: service.clock.Now(),
CreatedAt: s.clock.Now(),
CreatedBy: user.Id,
UpdatedAt: nil,
UpdatedBy: nil,
}
err = service.db.Insert(user.Id, account)
err = s.db.Insert(user.Id, account)
if err != nil {
return nil, err
return nil, types.ErrInternal
}
savedAccount, err := service.db.Get(user.Id, newId)
savedAccount, err := s.db.Get(user.Id, newId)
if err != nil {
if errors.Is(err, db.ErrNotFound) {
log.Error("Account not found after insert: %v", err)
}
log.Error("account %v not found after insert: %v", newId, err)
return nil, types.ErrInternal
}
return savedAccount, nil
}
func (service AccountImpl) Update(user *types.User, id uuid.UUID, name string) (*types.Account, error) {
func (s AccountImpl) Update(user *types.User, id uuid.UUID, name string) (*types.Account, error) {
if user == nil {
return nil, ErrUnauthorized
}
err := s.validateAccount(name)
if err != nil {
return nil, err
}
account, err := s.db.Get(user.Id, id)
if err != nil {
if err == db.ErrNotFound {
return nil, fmt.Errorf("account %v not found: %w", id, ErrBadRequest)
}
return nil, types.ErrInternal
}
err := service.validateAccount(name)
if err != nil {
return nil, err
}
account, err := service.db.Get(user.Id, id)
if err != nil {
return nil, err
}
timestamp := service.clock.Now()
timestamp := s.clock.Now()
account.Name = name
account.UpdatedAt = &timestamp
account.UpdatedBy = &user.Id
err = service.db.Update(user.Id, account)
if err != nil {
return nil, err
}
return account, nil
}
func (service AccountImpl) Get(user *types.User, id uuid.UUID) (*types.Account, error) {
if user == nil {
return nil, types.ErrInternal
}
account, err := service.db.Get(user.Id, id)
err = s.db.Update(user.Id, account)
if err != nil {
return nil, types.ErrInternal
}
@@ -126,13 +113,30 @@ func (service AccountImpl) Get(user *types.User, id uuid.UUID) (*types.Account,
return account, nil
}
func (service AccountImpl) GetAll(user *types.User) ([]*types.Account, error) {
func (s AccountImpl) Get(user *types.User, id uuid.UUID) (*types.Account, error) {
if user == nil {
return nil, ErrUnauthorized
}
account, err := s.db.Get(user.Id, id)
if err != nil {
if err == db.ErrNotFound {
return nil, fmt.Errorf("account %v not found: %w", id, ErrBadRequest)
}
return nil, types.ErrInternal
}
accounts, err := service.db.GetAll(user.Id)
return account, nil
}
func (s AccountImpl) GetAll(user *types.User) ([]*types.Account, error) {
if user == nil {
return nil, ErrUnauthorized
}
accounts, err := s.db.GetAll(user.Id)
if err != nil {
return nil, types.ErrInternal
}
@@ -140,33 +144,36 @@ func (service AccountImpl) GetAll(user *types.User) ([]*types.Account, error) {
return accounts, nil
}
func (service AccountImpl) Delete(user *types.User, id uuid.UUID) error {
func (s AccountImpl) Delete(user *types.User, id uuid.UUID) error {
if user == nil {
return types.ErrInternal
return ErrUnauthorized
}
account, err := service.db.Get(user.Id, id)
account, err := s.db.Get(user.Id, id)
if err != nil {
return err
if err == db.ErrNotFound {
return fmt.Errorf("account %v not found: %w", id, ErrBadRequest)
}
return types.ErrInternal
}
if account.UserId != user.Id {
return types.ErrUnauthorized
}
err = service.db.Delete(user.Id, account.Id)
err = s.db.Delete(user.Id, account.Id)
if err != nil {
return err
return types.ErrInternal
}
return nil
}
func (service AccountImpl) validateAccount(name string) error {
func (s AccountImpl) validateAccount(name string) error {
if name == "" {
return errors.New("please enter a value for the \"name\" field")
return fmt.Errorf("field \"name\" needs to be set: %w", ErrBadRequest)
} else if !safeInputRegex.MatchString(name) {
return errors.New("please use only letters, dashes or numbers for \"name\"")
return fmt.Errorf("use only letters, dashes and spaces for \"name\": %w", ErrBadRequest)
} else {
return nil
}

8
service/error.go Normal file
View File

@@ -0,0 +1,8 @@
package service
import "errors"
var (
ErrBadRequest = errors.New("bad request")
ErrUnauthorized = errors.New("unauthorized")
)

8
service/random_generator.go
View File

@@ -45,5 +45,11 @@ func (r *RandomImpl) String(size int) (string, error) {
}
func (r *RandomImpl) UUID() (uuid.UUID, error) {
return uuid.NewRandom()
id, err := uuid.NewRandom()
if err != nil {
log.Error("Error generating random UUID: %v", err)
return uuid.Nil, types.ErrInternal
}
return id, nil
}

30
template/account/account.templ
View File

@@ -18,36 +18,6 @@ templ Account(accounts []*types.Account) {
<div id="account-items" class="my-6 flex flex-col items-center">
for _, account := range accounts {
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
@AccountItem(account)
}
</div>
</div>