Proper model layer

This commit is contained in:
2025-08-08 12:54:42 +01:00
parent f0ca0051b6
commit e76261d5d5
31 changed files with 1098 additions and 968 deletions
+36 -82
View File
@@ -1,93 +1,47 @@
package expenses
import (
"context"
"expenses/config"
"expenses/expenses/db/repository"
repo "expenses/expenses/db/repository"
"strconv"
"database/sql"
"fmt"
_ "github.com/mattn/go-sqlite3"
mod "expenses/expenses/models"
)
func (e *Expense) GetShares() error {
cfg := config.GetInstance()
ctx := context.Background()
// TODO
// Do not pass an array of strings here, have a separate function to do the
// conversion that the user calls before calling this
// Can even create a struct to then hold the data
func ParseFormShares(userIDs []string, shares []string, sharesIDs []string,
) ([]mod.ExpenseShare, error) {
shareList := []mod.ExpenseShare{}
for i := range userIDs {
userID, err := strconv.ParseInt(userIDs[i], 10, 16)
if err != nil {
return nil, err
}
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return err
}
defer db.Close()
share, err := strconv.ParseFloat(shares[i], 32)
if err != nil {
return nil, err
}
queries := repository.New(db)
shares, err := queries.GetShares(ctx, e.ExpID)
if err != nil {
return err
newShare := mod.ExpenseShare{
ExpShareID: -1,
User: mod.User{
UserID: userID,
},
Share: share,
}
if sharesIDs[i] != "" {
id, err := strconv.ParseInt(sharesIDs[i], 10, 16)
if err != nil {
return nil, err
}
newShare.ExpShareID = id
}
shareList = append(shareList, newShare)
}
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 {
return err
}
defer db.Close()
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
}
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return fmt.Errorf("no rows were created")
}
return nil
}
func (sh *ExpenseShare) Update() error {
cfg := config.GetInstance()
ctx := context.Background()
db, err := sql.Open(cfg.DBSys, cfg.DBPath)
if err != nil {
return err
}
defer db.Close()
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
}
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return fmt.Errorf("no rows were created")
}
return nil
return shareList, nil
}