Some decisions regarding the lua env

it will be in the app environment because it serves the app, will think
about it later
This commit is contained in:
2025-08-28 01:46:39 +01:00
parent 7320b61df7
commit 404b41ae75
29 changed files with 420 additions and 289 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ func migrate(cmd *cobra.Command, args []string) {
log.Fatalf("%s is an invalid migration ID", args[1])
}
err = expenses.Serv.MigGoto(uint(migID))
err = expenses.App.Goto(uint(migID))
if err != nil {
log.Fatalf("Failed to apply migration: %v", err)
}
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func scripts(cmd *cobra.Command, args []string) {
lua := exp.Serv.Lua
lua := exp.App.Lua
if err := lua.DoFile("./lua-scripts/test.lua"); err != nil {
log.Printf("Failed to run lua script: %+v", err)
+25 -20
View File
@@ -3,29 +3,32 @@ package expenses
import (
"database/sql"
"expenses/config"
mod "expenses/expenses/models"
"expenses/luadec"
"log"
lua "github.com/yuin/gopher-lua"
)
var (
Serv *Service
)
type Service struct {
type ExpensesApp struct {
DB *sql.DB
Lua *lua.LState
}
func NewExpenseService(db *sql.DB, luaVM *lua.LState) *Service {
return &Service{
var (
App *ExpensesApp
)
func NewExpenseApp(db *sql.DB, luaVM *lua.LState) *ExpensesApp {
return &ExpensesApp{
DB: db,
Lua: luaVM,
}
}
func (a *ExpensesApp) Close() {
a.DB.Close()
a.Lua.Close()
}
func openDB(sys string, path string, extra string) (*sql.DB, error) {
db, err := sql.Open(sys, "file:"+path+extra)
if err != nil {
@@ -37,37 +40,39 @@ func openDB(sys string, path string, extra string) (*sql.DB, error) {
func StartLuaVM() (*lua.LState, error) {
L := lua.NewState()
L.SetGlobal("GetAllExpenses", L.NewFunction(Serv.LuaGetAllExpenses))
L.SetGlobal("AddDecimal", L.NewFunction(luadec.AddDecimal))
App.registerLuaBinds(L)
return L, nil
}
func StartApp() error {
config.SetConfig("./config.yaml")
cfg := config.GetInstance()
luaVM, err := StartLuaVM()
if err != nil {
return err
}
migDB, err := openDB(cfg.DBSys, cfg.DBPath, "")
if err != nil {
log.Fatalf("Failed to open migration DB: %v", err)
}
err = mod.RunMigrations(migDB, luaVM)
App = NewExpenseApp(migDB, nil)
luaVM, err := StartLuaVM()
if err != nil {
return err
}
// api := luapi.New(App)
App.Lua = luaVM
err = RunMigrations(migDB, luaVM)
if err != nil {
log.Fatalf("Failed to apply migrations: %v", err)
}
migDB.Close()
App.Close()
db, err := openDB(cfg.DBSys, cfg.DBPath, "?_foreign_keys=on")
if err != nil {
log.Fatalf("Failed to open DB: %v", err)
}
Serv = NewExpenseService(db, luaVM)
App = NewExpenseApp(db, luaVM)
return nil
}
+6 -6
View File
@@ -12,8 +12,8 @@ func GetCategory(id int64) (mod.Category, error) {
return mod.GetCategory(id)
}
func (s *Service) CreateCategory(name string) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) CreateCategory(name string) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -31,8 +31,8 @@ func (s *Service) CreateCategory(name string) error {
return tx.Commit()
}
func (s *Service) UpdateCategory(id int64, name string) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) UpdateCategory(id int64, name string) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -50,8 +50,8 @@ func (s *Service) UpdateCategory(id int64, name string) error {
return tx.Commit()
}
func (s *Service) DeleteCategory(id int64) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) DeleteCategory(id int64) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -1,4 +1,39 @@
local cjson = require("cjson")
-- This scripts needs to do 2 things:
-- Update the expenses where the owner doesn't have shares or payments to have
-- some of his
-- Normalize the shares
local json = require("json")
local function printTable(t)
for key, value in pairs(t) do
if type(value) == "table" then
printTable(value)
else
print(key, value)
end
end
end
local function isOwnerInShares(exp)
for _, share in pairs(exp.Shares) do
if share.User.UserID == exp.Owner.UserID then
return true
end
end
return false
end
local function isOwnerInPayments(exp)
for _, paym in pairs(exp.Payments) do
if paym.User.UserID == exp.Owner.UserID then
return true
end
end
return false
end
---@diagnostic disable-next-line: undefined-global
local expenses, err = GetAllExpenses()
@@ -8,7 +43,18 @@ end
for i = 1, #expenses do
local eJson = expenses[i].expense
local e = cjson.decode(eJson)
local e = json.decode(eJson)
print(e)
if not isOwnerInShares(e) then
-- Insert a share in the owner user into shares as 0.0
end
if not isOwnerInPayments(e) then
-- Insert a share in the owner user into shares as 0.0
end
normalizedExpense = NormalizeShare(eJson)
if eJson == normalizedExpense then
print "This one needs to be updated"
end
end
+2 -2
View File
@@ -46,8 +46,8 @@ func ParseFormPayments(userIDs []string, paymentsIDs []string,
return payments, nil
}
func (s *Service) DeletePayment(id int64) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) DeletePayment(id int64) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
+6 -4
View File
@@ -47,9 +47,9 @@ func ParseFormShares(userIDs []string, shares []string, sharesIDs []string,
return shareList, nil
}
// normalizeShares will take the total of an expense and the proposed shares
// NormalizeShares will take the total of an expense and the proposed shares
// and calculate how much each user actually has to pay - avoids fracd cents
func normalizeShares(e *mod.Expense) error {
func (a *ExpensesApp) NormalizeShares(e *mod.Expense) error {
excess := dec.NewFromFloat(0.0)
ownerShIdx := -1
for k := range e.Shares {
@@ -63,13 +63,15 @@ func normalizeShares(e *mod.Expense) error {
e.Shares[k].Calculated = owed.Truncate(2)
}
// It fails here for some reason
log.Println(e)
e.Shares[ownerShIdx].Calculated = e.Shares[ownerShIdx].Calculated.Add(excess)
return nil
}
func (s *Service) DeleteShare(id int64) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) DeleteShare(id int64) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
+16
View File
@@ -0,0 +1,16 @@
package expenses
import (
lua "github.com/yuin/gopher-lua"
)
func (a *ExpensesApp) luaInsertShare(L *lua.LState) int {
// shareJson := L.CheckString(1)
// share, err := mod.ShareFromJSON([]byte(shareJson))
// if err != nil {
// return ReturnWithError(L, err.Error())
// }
return 1
}
+4 -1
View File
@@ -40,9 +40,12 @@ func TestNormalizeShares(t *testing.T) {
},
}
// dummy service to call it
app := ExpensesApp{}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
err := normalizeShares(tc.exp)
err := app.NormalizeShares(tc.exp)
if err != nil {
t.Errorf("Failed to normalize shares: %+v", err)
}
+21 -21
View File
@@ -8,8 +8,8 @@ import (
"github.com/shopspring/decimal"
)
func (s *Service) GetAllExpenses() ([]mod.Expense, error) {
tx, err := s.DB.Begin()
func (a *ExpensesApp) GetAllExpenses() ([]mod.Expense, error) {
tx, err := a.DB.Begin()
if err != nil {
return []mod.Expense{}, err
}
@@ -20,7 +20,7 @@ func (s *Service) GetAllExpenses() ([]mod.Expense, error) {
return expenses, tx.Commit()
}
func (s *Service) GetExpensesRanged(startDate string, endDate string) ([]mod.Expense, error) {
func (a *ExpensesApp) 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)
@@ -35,7 +35,7 @@ func (s *Service) GetExpensesRanged(startDate string, endDate string) ([]mod.Exp
}
end := endDateTime.Unix()
tx, err := s.DB.Begin()
tx, err := a.DB.Begin()
if err != nil {
return []mod.Expense{}, err
}
@@ -46,8 +46,8 @@ func (s *Service) GetExpensesRanged(startDate string, endDate string) ([]mod.Exp
return expenses, tx.Commit()
}
func (s *Service) GetExpense(id int64) (mod.Expense, error) {
tx, err := s.DB.Begin()
func (a *ExpensesApp) GetExpense(id int64) (mod.Expense, error) {
tx, err := a.DB.Begin()
if err != nil {
return mod.Expense{}, err
}
@@ -61,8 +61,8 @@ func (s *Service) GetExpense(id int64) (mod.Expense, error) {
return expense, tx.Commit()
}
func (s *Service) LoadExpenseShares(e *mod.Expense) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) LoadExpenseShares(e *mod.Expense) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -76,8 +76,8 @@ func (s *Service) LoadExpenseShares(e *mod.Expense) error {
return tx.Commit()
}
func (s *Service) LoadExpensePayments(e *mod.Expense) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) LoadExpensePayments(e *mod.Expense) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -91,15 +91,15 @@ func (s *Service) LoadExpensePayments(e *mod.Expense) error {
return tx.Commit()
}
func (s *Service) LoadExpenseDebts(e *mod.Expense) error {
func (a *ExpensesApp) LoadExpenseDebts(e *mod.Expense) error {
debts, _ := CalculateDebts(e)
e.Debts = debts
return nil
}
func (s *Service) DeleteExpense(id int64) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) DeleteExpense(id int64) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -170,7 +170,7 @@ func ExpenseIsEvenlyShared(exp *mod.Expense) bool {
return true
}
func analyzeExpense(e *mod.Expense) {
func (a *ExpensesApp) analyzeExpense(e *mod.Expense) {
// Figure out if its paid off or not by adding the existing payments
e.PaidOff = e.Value.Equal(ExpenseTotalPayed(e))
@@ -178,17 +178,17 @@ func analyzeExpense(e *mod.Expense) {
e.SharesEven = ExpenseIsEvenlyShared(e)
// Update the calculated fields on the shares
normalizeShares(e)
a.NormalizeShares(e)
}
func (s *Service) NewExpense(exp mod.Expense) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) NewExpense(exp mod.Expense) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
defer tx.Rollback()
analyzeExpense(&exp)
a.analyzeExpense(&exp)
err = exp.Insert(tx)
if err != nil {
@@ -198,14 +198,14 @@ func (s *Service) NewExpense(exp mod.Expense) error {
return tx.Commit()
}
func (s *Service) UpdateExpense(exp mod.Expense) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) UpdateExpense(exp mod.Expense) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
defer tx.Rollback()
analyzeExpense(&exp)
a.analyzeExpense(&exp)
err = exp.Update(tx)
if err != nil {
-46
View File
@@ -1,46 +0,0 @@
package expenses
import (
"encoding/json"
mod "expenses/expenses/models"
lua "github.com/yuin/gopher-lua"
)
func (s *Service) LuaGetAllExpenses(L *lua.LState) int {
tx, err := s.DB.Begin()
if err != nil {
L.Push(lua.LNil)
L.Push(lua.LString(err.Error()))
return 2
}
defer tx.Rollback()
expenses, err := mod.GetAllExpenses(tx)
tbl := L.NewTable()
for _, e := range expenses {
err := s.LoadExpensePayments(&e)
if err != nil {
L.Push(lua.LNil)
L.Push(lua.LString(err.Error()))
continue
}
err = s.LoadExpenseShares(&e)
if err != nil {
L.Push(lua.LNil)
L.Push(lua.LString(err.Error()))
continue
}
jsonData, err := json.Marshal(e)
et := L.NewTable()
et.RawSetString("expense", lua.LString(jsonData))
tbl.Append(et)
}
L.Push(tbl)
return 1
}
+62
View File
@@ -0,0 +1,62 @@
package expenses
import (
"encoding/json"
mod "expenses/expenses/models"
lua "github.com/yuin/gopher-lua"
)
func (a *ExpensesApp) luaGetAllExpenses(L *lua.LState) int {
tx, err := a.DB.Begin()
if err != nil {
return returnWithError(L, err.Error())
}
defer tx.Rollback()
expenses, err := mod.GetAllExpenses(tx)
tbl := L.NewTable()
for _, e := range expenses {
err := a.LoadExpensePayments(&e)
if err != nil {
return returnWithError(L, err.Error())
}
err = a.LoadExpenseShares(&e)
if err != nil {
return returnWithError(L, err.Error())
}
jsonData, err := json.Marshal(e)
et := L.NewTable()
et.RawSetString("expense", lua.LString(jsonData))
tbl.Append(et)
}
L.Push(tbl)
return 1
}
func (a *ExpensesApp) luaNormalizeShares(L *lua.LState) int {
expenseJson := L.CheckString(1)
expense, err := mod.ExpenseFromJSON([]byte(expenseJson))
if err != nil {
return returnWithError(L, err.Error())
}
err = a.NormalizeShares(expense)
jsonData, err := json.Marshal(expense)
if err != nil {
return returnWithError(L, err.Error())
}
resultExpense := L.NewTable()
resultExpense.RawSetString("expense", lua.LString(jsonData))
L.Push(resultExpense)
return 1
}
+21
View File
@@ -0,0 +1,21 @@
package expenses
import (
"expenses/luadec"
ljson "github.com/layeh/gopher-json"
lua "github.com/yuin/gopher-lua"
)
func (a *ExpensesApp) registerLuaBinds(L *lua.LState) {
ljson.Preload(L)
L.SetGlobal("GetAllExpenses", L.NewFunction(a.luaGetAllExpenses))
L.SetGlobal("AddDecimal", L.NewFunction(luadec.AddDecimal))
L.SetGlobal("NormalizeShare", L.NewFunction(a.luaNormalizeShares))
}
func returnWithError(L *lua.LState, strErr string) int {
L.Push(lua.LNil)
L.Push(lua.LString(strErr))
return 2
}
+128 -3
View File
@@ -1,9 +1,134 @@
package expenses
import (
mod "expenses/expenses/models"
"database/sql"
"expenses/config"
"log"
"os"
"path/filepath"
"strconv"
"strings"
mig "github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/sqlite3"
_ "github.com/golang-migrate/migrate/v4/source/file"
lua "github.com/yuin/gopher-lua"
)
func (s *Service) MigGoto(id uint) error {
return mod.Goto(s.DB, id)
const LAST_GO_MIGRATION = 3
func prepareMigrator(db *sql.DB) (*mig.Migrate, error) {
cfg := config.GetInstance()
driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
m, err := mig.NewWithDatabaseInstance(cfg.MigrationsPath, "sqlite3", driver)
return m, err
}
func (a *ExpensesApp) Goto(id uint) error {
m, err := prepareMigrator(a.DB)
if err != nil {
return err
}
err = m.Migrate(id)
// err = m.Force(int(id))
if err != nil && err != mig.ErrNoChange {
return err
}
return nil
}
func listCustomScripts() (map[uint]string, error) {
// List the available scripts
cfg := config.GetInstance()
dir, err := os.Open(cfg.MigCustomScript)
if err != nil {
return make(map[uint]string), err
}
files, err := dir.Readdir(-1)
if err != nil {
log.Fatal(err)
}
customScripts := make(map[uint]string)
for _, f := range files {
parts := strings.SplitN(f.Name(), "_", 2)
numStr := parts[0]
num, err := strconv.ParseUint(numStr, 10, 16)
if err != nil {
return customScripts, err
}
customScripts[uint(num)] = filepath.Join(cfg.MigCustomScript, f.Name())
}
return customScripts, nil
}
func runCustomScript(ver uint, lua *lua.LState) error {
customScripts, err := listCustomScripts()
if err != nil {
return err
}
if val, ok := customScripts[ver]; ok {
if err := lua.DoFile(val); err != nil {
log.Printf("Failed to run lua script: %+v", err)
}
}
return nil
}
func runCustomMigrationLogic(ver uint) {
switch ver {
case 4:
// Get all expenses, normalize the shares, update them
}
}
func RunMigrations(db *sql.DB, lua *lua.LState) error {
m, err := prepareMigrator(db)
if err != nil {
return err
}
err = m.Up()
if err != nil {
if err == mig.ErrNoChange {
return nil
}
if dirty, ok := err.(mig.ErrDirty); ok {
log.Printf("migration %d is dirty:", err)
forceErr := m.Force(int(dirty.Version - 1))
if forceErr != nil {
log.Fatalln("force reset failed: %w", forceErr)
}
migErr := m.Migrate(uint(dirty.Version))
log.Fatalln(migErr)
}
}
ver, _, _ := m.Version()
log.Printf("Successfuly jumped to migration %d", ver)
// One day we will have custom stuff being ran in Lua instead of here
if ver > LAST_GO_MIGRATION {
err = runCustomScript(ver, lua)
if err != nil {
return err
}
} else {
runCustomMigrationLogic(ver)
}
return nil
}
+10
View File
@@ -2,6 +2,7 @@ package models
import (
"context"
"encoding/json"
"expenses/config"
repo "expenses/expenses/db/repository"
@@ -45,6 +46,15 @@ func NewExpense() Expense {
}
}
// ExpenseFromJSON takes []byte and returns an *Expense
func ExpenseFromJSON(data []byte) (*Expense, error) {
var expense Expense
err := json.Unmarshal(data, &expense)
return &expense, err
}
func GetAllExpenses(tx *sql.Tx) ([]Expense, error) {
ctx := context.Background()
+10 -2
View File
@@ -4,10 +4,9 @@ import (
"context"
"expenses/expenses/db/repository"
repo "expenses/expenses/db/repository"
"database/sql"
"fmt"
"encoding/json"
_ "github.com/mattn/go-sqlite3"
dec "github.com/shopspring/decimal"
)
@@ -20,6 +19,15 @@ type Share struct {
}
type Shares []Share
// ShareFromJSON takes []byte and returns an *Share
func ShareFromJSON(data []byte) (*Share, error) {
var share Share
err := json.Unmarshal(data, &share)
return &share, err
}
func (sh Shares) Equal(other Shares) bool {
if len(sh) != len(other) {
return false
-121
View File
@@ -1,121 +0,0 @@
package models
import (
"database/sql"
"expenses/config"
"log"
"os"
"path/filepath"
"strconv"
"strings"
mig "github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/sqlite3"
_ "github.com/golang-migrate/migrate/v4/source/file"
lua "github.com/yuin/gopher-lua"
)
func prepareMigrator(db *sql.DB) (*mig.Migrate, error) {
cfg := config.GetInstance()
driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
m, err := mig.NewWithDatabaseInstance(cfg.MigrationsPath, "sqlite3", driver)
return m, err
}
func Goto(db *sql.DB, id uint) error {
m, err := prepareMigrator(db)
if err != nil {
return err
}
err = m.Migrate(id)
// err = m.Force(int(id))
if err != nil && err != mig.ErrNoChange {
return err
}
return nil
}
func listCustomScripts() (map[uint]string, error) {
// List the available scripts
cfg := config.GetInstance()
dir, err := os.Open(cfg.MigCustomScript)
if err != nil {
return make(map[uint]string), err
}
files, err := dir.Readdir(-1)
if err != nil {
log.Fatal(err)
}
customScripts := make(map[uint]string)
for _, f := range files {
parts := strings.SplitN(f.Name(), "_", 2)
numStr := parts[0]
num, err := strconv.ParseUint(numStr, 10, 16)
if err != nil {
return customScripts, err
}
customScripts[uint(num)] = filepath.Join(cfg.MigCustomScript, f.Name())
}
return customScripts, nil
}
func runCustomScript(ver uint, lua *lua.LState) error {
customScripts, err := listCustomScripts()
if err != nil {
return err
}
if val, ok := customScripts[ver]; ok {
if err := lua.DoFile(val); err != nil {
log.Printf("Failed to run lua script: %+v", err)
}
}
return nil
}
func RunMigrations(db *sql.DB, lua *lua.LState) error {
m, err := prepareMigrator(db)
if err != nil {
return err
}
err = m.Up()
if err != nil {
if err == mig.ErrNoChange {
return nil
}
if dirty, ok := err.(mig.ErrDirty); ok {
log.Printf("migration %d is dirty:", err)
forceErr := m.Force(int(dirty.Version - 1))
if forceErr != nil {
log.Fatalln("force reset failed: %w", forceErr)
}
migErr := m.Migrate(uint(dirty.Version))
log.Fatalln(migErr)
}
}
ver, _, _ := m.Version()
log.Printf("Successfuly jumped to migration %d", ver)
// Sigh, it still needs plenty of work
// err = runCustomScript(ver, lua)
// if err != nil {
// return err
// }
return nil
}
+10 -10
View File
@@ -4,8 +4,8 @@ import (
mod "expenses/expenses/models"
)
func (s *Service) GetAllStores() ([]mod.Store, error) {
tx, err := s.DB.Begin()
func (a *ExpensesApp) GetAllStores() ([]mod.Store, error) {
tx, err := a.DB.Begin()
if err != nil {
return []mod.Store{}, err
}
@@ -19,8 +19,8 @@ func (s *Service) GetAllStores() ([]mod.Store, error) {
return stores, tx.Commit()
}
func (s *Service) GetStore(id int64) (mod.Store, error) {
tx, err := s.DB.Begin()
func (a *ExpensesApp) GetStore(id int64) (mod.Store, error) {
tx, err := a.DB.Begin()
if err != nil {
return mod.Store{}, err
}
@@ -34,8 +34,8 @@ func (s *Service) GetStore(id int64) (mod.Store, error) {
return store, tx.Commit()
}
func (s *Service) NewStore(name string) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) NewStore(name string) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -49,8 +49,8 @@ func (s *Service) NewStore(name string) error {
return tx.Commit()
}
func (s *Service) UpdateStore(id int64, name string) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) UpdateStore(id int64, name string) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -69,8 +69,8 @@ func (s *Service) UpdateStore(id int64, name string) error {
return tx.Commit()
}
func (s *Service) DeleteStore(id int64) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) DeleteStore(id int64) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
+10 -10
View File
@@ -4,8 +4,8 @@ import (
mod "expenses/expenses/models"
)
func (s *Service) GetAllTypes() ([]mod.Type, error) {
tx, err := s.DB.Begin()
func (a *ExpensesApp) GetAllTypes() ([]mod.Type, error) {
tx, err := a.DB.Begin()
if err != nil {
return []mod.Type{}, err
}
@@ -19,8 +19,8 @@ func (s *Service) GetAllTypes() ([]mod.Type, error) {
return types, tx.Commit()
}
func (s *Service) GetType(id int64) (mod.Type, error) {
tx, err := s.DB.Begin()
func (a *ExpensesApp) GetType(id int64) (mod.Type, error) {
tx, err := a.DB.Begin()
if err != nil {
return mod.Type{}, err
}
@@ -34,8 +34,8 @@ func (s *Service) GetType(id int64) (mod.Type, error) {
return typ, tx.Commit()
}
func (s *Service) NewType(name string) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) NewType(name string) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -53,8 +53,8 @@ func (s *Service) NewType(name string) error {
return tx.Commit()
}
func (s *Service) DeleteType(id int64) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) DeleteType(id int64) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
@@ -72,8 +72,8 @@ func (s *Service) DeleteType(id int64) error {
return tx.Commit()
}
func (s *Service) UpdateType(id int64, name string) error {
tx, err := s.DB.Begin()
func (a *ExpensesApp) UpdateType(id int64, name string) error {
tx, err := a.DB.Begin()
if err != nil {
return err
}
+2 -2
View File
@@ -4,8 +4,8 @@ import (
mod "expenses/expenses/models"
)
func (s *Service) GetAllUsers() ([]mod.User, error) {
tx, err := s.DB.Begin()
func (a *ExpensesApp) GetAllUsers() ([]mod.User, error) {
tx, err := a.DB.Begin()
if err != nil {
return []mod.User{}, err
}
+1 -1
View File
@@ -3,9 +3,9 @@ module expenses
go 1.24.4
require (
github.com/Shopify/go-lua v0.0.0-20250718183320-1e37f32ad7d0
github.com/gin-gonic/gin v1.10.1
github.com/golang-migrate/migrate/v4 v4.18.3
github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf
github.com/mattn/go-sqlite3 v1.14.28
github.com/shopspring/decimal v1.2.0
github.com/spf13/cobra v1.9.1
+2 -2
View File
@@ -1,5 +1,3 @@
github.com/Shopify/go-lua v0.0.0-20250718183320-1e37f32ad7d0 h1:oGlw/+ndlFMn8KWLjEX5nULcDwOC4tJy3Kk1Pm84Cys=
github.com/Shopify/go-lua v0.0.0-20250718183320-1e37f32ad7d0/go.mod h1:M4CxjVc/1Nwka5atBv7G/sb7Ac2BDe3+FxbiT9iVNIQ=
github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
@@ -46,6 +44,8 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf h1:bg6J/5S/AeTz7K9i/luJRj31BJ8f+LgYwKQBSOZxSEM=
github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf/go.mod h1:E/q28EyUVBgBQnONAVPIdwvEsv4Ve0vaCA9JWim4+3I=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+3 -3
View File
@@ -69,7 +69,7 @@ func newCategoryPage(c *gin.Context) {
func createCategory(c *gin.Context) {
newCatName := c.PostForm("category-name")
err := exp.Serv.CreateCategory(newCatName)
err := exp.App.CreateCategory(newCatName)
if err != nil {
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
@@ -86,7 +86,7 @@ func updateCategory(c *gin.Context) {
}
categoryName := c.PostForm("category-name")
err = exp.Serv.UpdateCategory(categoryID, categoryName)
err = exp.App.UpdateCategory(categoryID, categoryName)
if err != nil {
errMsg, _ := json.Marshal(err.Error())
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg))
@@ -103,7 +103,7 @@ func deleteCategory(c *gin.Context) {
return
}
err = exp.Serv.DeleteCategory(categoryID)
err = exp.App.DeleteCategory(categoryID)
if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", categoryID)
c.String(http.StatusNotFound, errMsg)
+15 -15
View File
@@ -18,7 +18,7 @@ const (
)
func expensesPartial(c *gin.Context) {
expenses, err := exp.Serv.GetAllExpenses()
expenses, err := exp.App.GetAllExpenses()
if err != nil {
c.Header("HX-Redirect", "/500")
return
@@ -30,7 +30,7 @@ func expensesPartial(c *gin.Context) {
}
func ExpensesGlobalPage(c *gin.Context) {
expenses, err := exp.Serv.GetAllExpenses()
expenses, err := exp.App.GetAllExpenses()
if err != nil {
c.Header("HX-Redirect", "/500")
return
@@ -51,25 +51,25 @@ func expensePage(c *gin.Context) {
return
}
expense, err := exp.Serv.GetExpense(expenseID)
expense, err := exp.App.GetExpense(expenseID)
if err == sql.ErrNoRows {
NotFoundView(c, "didn't find requested expense")
return
}
err = exp.Serv.LoadExpenseShares(&expense)
err = exp.App.LoadExpenseShares(&expense)
if err != nil {
ServerErrorView(c, "failed to fetch shares")
return
}
err = exp.Serv.LoadExpensePayments(&expense)
err = exp.App.LoadExpensePayments(&expense)
if err != nil {
ServerErrorView(c, "failed to fetch payments")
return
}
err = exp.Serv.LoadExpenseDebts(&expense)
err = exp.App.LoadExpenseDebts(&expense)
if err != nil {
ServerErrorView(c, "failed to fetch debts")
return
@@ -81,19 +81,19 @@ func expensePage(c *gin.Context) {
return
}
stores, err := exp.Serv.GetAllStores()
stores, err := exp.App.GetAllStores()
if err != nil {
ServerErrorView(c, "failed to fetch stores")
return
}
types, err := exp.Serv.GetAllTypes()
types, err := exp.App.GetAllTypes()
if err != nil {
ServerErrorView(c, "failed to fetch types")
return
}
users, err := exp.Serv.GetAllUsers()
users, err := exp.App.GetAllUsers()
if err != nil {
ServerErrorView(c, "failed to fetch users")
return
@@ -126,19 +126,19 @@ func newExpensePage(c *gin.Context) {
return
}
stores, err := exp.Serv.GetAllStores()
stores, err := exp.App.GetAllStores()
if err != nil {
ServerErrorView(c, "failed to fetch stores")
return
}
types, err := exp.Serv.GetAllTypes()
types, err := exp.App.GetAllTypes()
if err != nil {
ServerErrorView(c, "failed to fetch types")
return
}
users, err := exp.Serv.GetAllUsers()
users, err := exp.App.GetAllUsers()
if err != nil {
ServerErrorView(c, "failed to fetch users")
return
@@ -165,7 +165,7 @@ func createExpense(c *gin.Context) {
c.Header("HX-Redirect", "/500")
}
err = exp.Serv.NewExpense(*newExp)
err = exp.App.NewExpense(*newExp)
if err != nil {
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
return
@@ -190,7 +190,7 @@ func updateExpense(c *gin.Context) {
}
newExp.ExpID = expenseID
err = exp.Serv.UpdateExpense(*newExp)
err = exp.App.UpdateExpense(*newExp)
if err != nil {
errMsg, _ := json.Marshal(err.Error())
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg))
@@ -207,7 +207,7 @@ func deleteExpense(c *gin.Context) {
return
}
err = exp.Serv.DeleteExpense(expenseID)
err = exp.App.DeleteExpense(expenseID)
if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", expenseID)
c.String(http.StatusNotFound, errMsg)
+3 -3
View File
@@ -37,7 +37,7 @@ func getResults(c *gin.Context) {
startDate := c.PostForm("range-start") + " 00:00:00"
endDate := c.PostForm("range-end") + " 23:59:59"
queriedExpenses, err := exp.Serv.GetExpensesRanged(startDate, endDate)
queriedExpenses, err := exp.App.GetExpensesRanged(startDate, endDate)
if err != nil {
log.Printf("getting expenses: %v", err)
return
@@ -45,12 +45,12 @@ func getResults(c *gin.Context) {
// Get the expenses and shares for each expense
for k := range queriedExpenses {
err = exp.Serv.LoadExpenseShares(&queriedExpenses[k])
err = exp.App.LoadExpenseShares(&queriedExpenses[k])
if err != nil {
log.Printf("failed to get shares: %v", err)
return
}
err = exp.Serv.LoadExpensePayments(&queriedExpenses[k])
err = exp.App.LoadExpensePayments(&queriedExpenses[k])
if err != nil {
log.Printf("failed to get payments: %v", err)
return
+1 -1
View File
@@ -16,7 +16,7 @@ func deletePayment(c *gin.Context) {
return
}
err = exp.Serv.DeletePayment(paymentID)
err = exp.App.DeletePayment(paymentID)
if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", paymentID)
c.String(http.StatusNotFound, errMsg)
+1 -1
View File
@@ -16,7 +16,7 @@ func deleteShare(c *gin.Context) {
return
}
err = exp.Serv.DeleteShare(shareID)
err = exp.App.DeleteShare(shareID)
if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("share %d not found", shareID)
c.String(http.StatusNotFound, errMsg)
+5 -5
View File
@@ -17,7 +17,7 @@ const (
)
func storesGlobalPage(c *gin.Context) {
stores, err := exp.Serv.GetAllStores()
stores, err := exp.App.GetAllStores()
if err != nil {
ServerErrorView(c, "Failed to fetch stores content")
return
@@ -38,7 +38,7 @@ func storePage(c *gin.Context) {
return
}
store, err := exp.Serv.GetStore(storeID)
store, err := exp.App.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 := exp.Serv.NewStore(storeName)
err := exp.App.NewStore(storeName)
if err != nil {
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
}
@@ -84,7 +84,7 @@ func updateStore(c *gin.Context) {
}
newName := c.PostForm("store-name")
err = exp.Serv.UpdateStore(storeID, newName)
err = exp.App.UpdateStore(storeID, newName)
if err != nil {
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
return
@@ -99,7 +99,7 @@ func deleteStore(c *gin.Context) {
c.Redirect(404, "/404")
}
err = exp.Serv.DeleteStore(storeID)
err = exp.App.DeleteStore(storeID)
if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", storeID)
c.String(http.StatusNotFound, errMsg)
+5 -5
View File
@@ -17,7 +17,7 @@ const (
)
func typesGlobalPage(c *gin.Context) {
types, err := exp.Serv.GetAllTypes()
types, err := exp.App.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 := exp.Serv.GetType(typeID)
typ, err := exp.App.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 := exp.Serv.NewType(newTypName)
err := exp.App.NewType(newTypName)
if err != nil {
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
}
@@ -83,7 +83,7 @@ func deleteType(c *gin.Context) {
c.Redirect(404, "/404")
}
err = exp.Serv.DeleteType(typeID)
err = exp.App.DeleteType(typeID)
if err == experr.ErrNotFound {
errMsg := fmt.Sprintf("category %d not found", typeID)
c.String(http.StatusNotFound, errMsg)
@@ -106,7 +106,7 @@ func updateType(c *gin.Context) {
}
newName := c.PostForm("type-name")
err = exp.Serv.UpdateType(typeID, newName)
err = exp.App.UpdateType(typeID, newName)
if err != nil {
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
return