From 7320b61df7a2591c725ea7f7899852cec4e704e0 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Tue, 26 Aug 2025 19:29:33 +0100 Subject: [PATCH] Working on the Calculated thing Did some work towards the lua interface, but its kinda shit tbh --- src/cmd/debts.go | 38 ------------- src/cmd/scripts.go | 29 ++++++++++ src/config.yaml | 1 + src/config/config.go | 11 ++-- src/expenses/app.go | 28 +++++++-- .../custom/0004_calculated_share.lua | 15 ++++- src/expenses/expenses.go | 27 --------- src/expenses/expensesLua.go | 46 +++++++++++++++ src/expenses/models/category.go | 4 +- src/expenses/models/expense.go | 28 ++++----- src/expenses/models/expenseShare.go | 8 +-- src/expenses/models/migrations.go | 57 ++++++++++++++++++- src/expenses/models/store.go | 4 +- src/expenses/models/type.go | 4 +- src/expenses/models/user.go | 4 +- 15 files changed, 201 insertions(+), 103 deletions(-) delete mode 100644 src/cmd/debts.go create mode 100644 src/cmd/scripts.go create mode 100644 src/expenses/expensesLua.go diff --git a/src/cmd/debts.go b/src/cmd/debts.go deleted file mode 100644 index 6341ec7..0000000 --- a/src/cmd/debts.go +++ /dev/null @@ -1,38 +0,0 @@ -package cmd - -import ( - "log" - - exp "expenses/expenses" - "expenses/luadec" - - "github.com/spf13/cobra" - lua "github.com/yuin/gopher-lua" -) - -func debts(cmd *cobra.Command, args []string) { - log.Println("Added the debts command!") - - L := lua.NewState() - defer L.Close() - - L.SetGlobal("GetAllExpenses", L.NewFunction(exp.Serv.LuaGetAllExpenses)) - L.SetGlobal("AddDecimal", L.NewFunction(luadec.AddDecimal)) - - if err := L.DoFile("./lua-scripts/test.lua"); err != nil { - log.Printf("Failed to run lua script: %+v", err) - } -} - -// shelf -var debtsCmd = &cobra.Command{ - Use: "debts", - Short: "", - Long: ``, - Args: nil, - Run: debts, -} - -func init() { - rootCmd.AddCommand(debtsCmd) -} diff --git a/src/cmd/scripts.go b/src/cmd/scripts.go new file mode 100644 index 0000000..90955a7 --- /dev/null +++ b/src/cmd/scripts.go @@ -0,0 +1,29 @@ +package cmd + +import ( + exp "expenses/expenses" + "log" + + "github.com/spf13/cobra" +) + +func scripts(cmd *cobra.Command, args []string) { + lua := exp.Serv.Lua + + if err := lua.DoFile("./lua-scripts/test.lua"); err != nil { + log.Printf("Failed to run lua script: %+v", err) + } +} + +// shelf +var scriptsCmd = &cobra.Command{ + Use: "debts", + Short: "", + Long: ``, + Args: nil, + Run: scripts, +} + +func init() { + rootCmd.AddCommand(scriptsCmd) +} diff --git a/src/config.yaml b/src/config.yaml index 37fdd6c..e62f8e9 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -3,3 +3,4 @@ port: 8081 dbpath: "./data/data.db" dbsys: "sqlite3" migrations_path: "file://expenses/db/migrations/" +mig_custom_scripts: "./expenses/db/migrations/custom/" diff --git a/src/config/config.go b/src/config/config.go index 7fed189..c9cecef 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -8,11 +8,12 @@ import ( ) type Configuration struct { - AssetsDir string `yaml:"assets"` - Port string `yaml:"port"` - DBSys string `yaml:"dbsys"` - DBPath string `yaml:"dbpath"` - MigrationsPath string `yaml:"migrations_path"` + AssetsDir string `yaml:"assets"` + Port string `yaml:"port"` + DBSys string `yaml:"dbsys"` + DBPath string `yaml:"dbpath"` + MigrationsPath string `yaml:"migrations_path"` + MigCustomScript string `yaml:"mig_custom_scripts"` } var ( diff --git a/src/expenses/app.go b/src/expenses/app.go index f58a40d..2e1039e 100644 --- a/src/expenses/app.go +++ b/src/expenses/app.go @@ -4,7 +4,10 @@ import ( "database/sql" "expenses/config" mod "expenses/expenses/models" + "expenses/luadec" "log" + + lua "github.com/yuin/gopher-lua" ) var ( @@ -12,12 +15,14 @@ var ( ) type Service struct { - DB *sql.DB + DB *sql.DB + Lua *lua.LState } -func NewExpenseService(db *sql.DB) *Service { +func NewExpenseService(db *sql.DB, luaVM *lua.LState) *Service { return &Service{ - DB: db, + DB: db, + Lua: luaVM, } } @@ -30,16 +35,29 @@ func openDB(sys string, path string, extra string) (*sql.DB, error) { return db, nil } +func StartLuaVM() (*lua.LState, error) { + L := lua.NewState() + + L.SetGlobal("GetAllExpenses", L.NewFunction(Serv.LuaGetAllExpenses)) + L.SetGlobal("AddDecimal", L.NewFunction(luadec.AddDecimal)) + + 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) + err = mod.RunMigrations(migDB, luaVM) if err != nil { log.Fatalf("Failed to apply migrations: %v", err) } @@ -49,7 +67,7 @@ func StartApp() error { if err != nil { log.Fatalf("Failed to open DB: %v", err) } - Serv = NewExpenseService(db) + Serv = NewExpenseService(db, luaVM) return nil } diff --git a/src/expenses/db/migrations/custom/0004_calculated_share.lua b/src/expenses/db/migrations/custom/0004_calculated_share.lua index 1b6f68f..42274af 100644 --- a/src/expenses/db/migrations/custom/0004_calculated_share.lua +++ b/src/expenses/db/migrations/custom/0004_calculated_share.lua @@ -1 +1,14 @@ -print "hello, world!" +local cjson = require("cjson") + +---@diagnostic disable-next-line: undefined-global +local expenses, err = GetAllExpenses() +if not expenses then + print("Error:", err) +end + +for i = 1, #expenses do + local eJson = expenses[i].expense + local e = cjson.decode(eJson) + + print(e) +end diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index 138dd7f..fcbbbfb 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -6,7 +6,6 @@ import ( "time" "github.com/shopspring/decimal" - lua "github.com/yuin/gopher-lua" ) func (s *Service) GetAllExpenses() ([]mod.Expense, error) { @@ -21,32 +20,6 @@ func (s *Service) GetAllExpenses() ([]mod.Expense, error) { return expenses, tx.Commit() } -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 { - et := L.NewTable() - - et.RawSetString("id", lua.LNumber(e.ExpID)) - et.RawSetString("description", lua.LString(e.Description)) - et.RawSetString("amount", lua.LString(e.Value.StringFixed(2))) - - tbl.Append(et) - } - - L.Push(tbl) - return 1 -} - 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 { diff --git a/src/expenses/expensesLua.go b/src/expenses/expensesLua.go new file mode 100644 index 0000000..5a64730 --- /dev/null +++ b/src/expenses/expensesLua.go @@ -0,0 +1,46 @@ +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 +} diff --git a/src/expenses/models/category.go b/src/expenses/models/category.go index 62963d9..de3ba7a 100644 --- a/src/expenses/models/category.go +++ b/src/expenses/models/category.go @@ -11,8 +11,8 @@ import ( ) type Category struct { - CategoryID int64 - CategoryName string + CategoryID int64 `json:"CategoryID"` + CategoryName string `json:"CategoryName"` } func NewCategory() Category { diff --git a/src/expenses/models/expense.go b/src/expenses/models/expense.go index 25429b8..9300770 100644 --- a/src/expenses/models/expense.go +++ b/src/expenses/models/expense.go @@ -12,20 +12,20 @@ import ( ) type Expense struct { - ExpID int64 - Description string - Value decimal.Decimal - Store Store - Type Type - Category Category - Owner User - Date int64 - Payments []ExpensePayment - Shares []Share - Debts Debts - PaidOff bool - SharesEven bool - CreationDate int64 + ExpID int64 `json:"ExpID"` + Description string `json:"Description"` + Value decimal.Decimal `json:"Value"` + Store Store `json:"Store"` + Type Type `json:"Type"` + Category Category `json:"Category"` + Owner User `json:"User"` + Date int64 `json:"Date"` + Payments []ExpensePayment `json:"Payments"` + Shares []Share `json:"Shares"` + Debts Debts `json:"Debts"` + PaidOff bool `json:"PaidOff"` + SharesEven bool `json:"SharesEven"` + CreationDate int64 `json:"CreationDate"` } func NewExpense() Expense { diff --git a/src/expenses/models/expenseShare.go b/src/expenses/models/expenseShare.go index 0bad70f..5dc2520 100644 --- a/src/expenses/models/expenseShare.go +++ b/src/expenses/models/expenseShare.go @@ -13,10 +13,10 @@ import ( ) type Share struct { - ExpShareID int64 - User User - Share dec.Decimal - Calculated dec.Decimal // Normalized user share because of fracd cents + ExpShareID int64 `json:"ExpShareID"` + User User `json:"User"` + Share dec.Decimal `json:"Share"` + Calculated dec.Decimal `json:"Calculated"` } type Shares []Share diff --git a/src/expenses/models/migrations.go b/src/expenses/models/migrations.go index 892f551..7e32e00 100644 --- a/src/expenses/models/migrations.go +++ b/src/expenses/models/migrations.go @@ -4,10 +4,15 @@ 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) { @@ -34,7 +39,51 @@ func Goto(db *sql.DB, id uint) error { return nil } -func RunMigrations(db *sql.DB) error { +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 @@ -62,5 +111,11 @@ func RunMigrations(db *sql.DB) error { 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 } diff --git a/src/expenses/models/store.go b/src/expenses/models/store.go index c727903..b0d1768 100644 --- a/src/expenses/models/store.go +++ b/src/expenses/models/store.go @@ -12,8 +12,8 @@ import ( ) type Store struct { - StoreID int64 - StoreName string + StoreID int64 `json:"StoreID"` + StoreName string `json:"StoreName"` } func NewStore() Store { diff --git a/src/expenses/models/type.go b/src/expenses/models/type.go index 0e7f11a..d6b1ad7 100644 --- a/src/expenses/models/type.go +++ b/src/expenses/models/type.go @@ -12,8 +12,8 @@ import ( ) type Type struct { - TypeID int64 - TypeName string + TypeID int64 `json:"TypeID"` + TypeName string `json:"TypeName"` } func NewType() Type { diff --git a/src/expenses/models/user.go b/src/expenses/models/user.go index 763df53..014ed04 100644 --- a/src/expenses/models/user.go +++ b/src/expenses/models/user.go @@ -9,8 +9,8 @@ import ( ) type User struct { - UserID int64 - UserName string + UserID int64 `json:"UserID"` + UserName string `json:"UserName"` } func NewUser() User {