Merge pull request 'wip-code-check' (#44) from wip-code-check into master
Reviewed-on: #44 Reviewed-by: lash <accounts-grassrootseconomics@holbrook.no>
This commit is contained in:
commit
63cee42261
246
cmd/main.go
246
cmd/main.go
@ -2,170 +2,184 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/csv"
|
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"log"
|
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"git.defalsify.org/vise.git/cache"
|
"git.defalsify.org/vise.git/asm"
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
fsdb "git.defalsify.org/vise.git/db/fs"
|
||||||
|
gdbmdb "git.defalsify.org/vise.git/db/gdbm"
|
||||||
"git.defalsify.org/vise.git/engine"
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/logging"
|
||||||
"git.defalsify.org/vise.git/persist"
|
"git.defalsify.org/vise.git/persist"
|
||||||
"git.defalsify.org/vise.git/resource"
|
"git.defalsify.org/vise.git/resource"
|
||||||
"git.defalsify.org/vise.git/state"
|
|
||||||
"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
|
"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
logg = logging.NewVanilla()
|
||||||
scriptDir = path.Join("services", "registration")
|
scriptDir = path.Join("services", "registration")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func getParser(fp string, debug bool) (*asm.FlagParser, error) {
|
||||||
|
flagParser := asm.NewFlagParser().WithDebug()
|
||||||
|
_, err := flagParser.Load(fp)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return flagParser, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.Persister, userdataStore db.Db) (*ussd.Handlers, error) {
|
||||||
|
|
||||||
|
ussdHandlers, err := ussd.NewHandlers(appFlags, pe, userdataStore)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
|
||||||
|
rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
|
||||||
|
rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
|
||||||
|
rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
|
||||||
|
rs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
|
||||||
|
rs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
|
||||||
|
rs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
|
||||||
|
rs.AddLocalFunc("quit", ussdHandlers.Quit)
|
||||||
|
rs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
|
||||||
|
rs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
|
||||||
|
rs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
|
||||||
|
rs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
|
||||||
|
rs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
|
||||||
|
rs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
|
||||||
|
rs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
|
||||||
|
rs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
|
||||||
|
rs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
|
||||||
|
rs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
|
||||||
|
rs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
|
||||||
|
rs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
|
||||||
|
rs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
|
||||||
|
rs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
|
||||||
|
rs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
|
||||||
|
rs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
|
||||||
|
rs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
|
||||||
|
rs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
|
||||||
|
rs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
|
||||||
|
rs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
|
||||||
|
rs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
|
||||||
|
rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
|
||||||
|
rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
|
||||||
|
rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
|
||||||
|
|
||||||
|
return ussdHandlers, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getPersister(dbDir string, ctx context.Context) (*persist.Persister, error) {
|
||||||
|
err := os.MkdirAll(dbDir, 0700)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("state dir create exited with error: %v\n", err)
|
||||||
|
}
|
||||||
|
store := gdbmdb.NewGdbmDb()
|
||||||
|
storeFile := path.Join(dbDir, "state.gdbm")
|
||||||
|
store.Connect(ctx, storeFile)
|
||||||
|
pr := persist.NewPersister(store)
|
||||||
|
return pr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getUserdataDb(dbDir string, ctx context.Context) db.Db {
|
||||||
|
store := gdbmdb.NewGdbmDb()
|
||||||
|
storeFile := path.Join(dbDir, "userdata.gdbm")
|
||||||
|
store.Connect(ctx, storeFile)
|
||||||
|
|
||||||
|
return store
|
||||||
|
}
|
||||||
|
|
||||||
|
func getResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
|
||||||
|
store := fsdb.NewFsDb()
|
||||||
|
err := store.Connect(ctx, resourceDir)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
rfs := resource.NewDbResource(store)
|
||||||
|
return rfs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) *engine.DefaultEngine {
|
||||||
|
en := engine.NewEngine(cfg, rs)
|
||||||
|
en = en.WithPersister(pr)
|
||||||
|
return en
|
||||||
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
var dir string
|
var dbDir string
|
||||||
var root string
|
|
||||||
var size uint
|
var size uint
|
||||||
var sessionId string
|
var sessionId string
|
||||||
flag.StringVar(&dir, "d", ".", "resource dir to read from")
|
var debug bool
|
||||||
flag.UintVar(&size, "s", 0, "max size of output")
|
flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
|
||||||
flag.StringVar(&root, "root", "root", "entry point symbol")
|
flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
|
||||||
flag.StringVar(&sessionId, "session-id", "default", "session id")
|
flag.BoolVar(&debug, "d", false, "use engine debug output")
|
||||||
|
flag.UintVar(&size, "s", 160, "max size of output")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir)
|
|
||||||
|
logg.Infof("start command", "dbdir", dbDir, "outputsize", size)
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
st := state.NewState(16)
|
ctx = context.WithValue(ctx, "SessionId", sessionId)
|
||||||
st.UseDebug()
|
|
||||||
|
|
||||||
pfp := path.Join(scriptDir, "pp.csv")
|
pfp := path.Join(scriptDir, "pp.csv")
|
||||||
file, err := os.Open(pfp)
|
flagParser, err := getParser(pfp, true)
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "Failed to open CSV file: %v\n", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
reader := csv.NewReader(file)
|
|
||||||
|
|
||||||
// Iterate through the CSV records and register the flags
|
|
||||||
for {
|
|
||||||
record, err := reader.Read()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err == io.EOF {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
fmt.Fprintf(os.Stderr, "Error reading CSV file: %v\n", err)
|
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the record starts with "flag" and has at least 3 columns
|
|
||||||
if len(record) < 3 || record[0] != "flag" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
flagName := record[1]
|
|
||||||
flagValue, err := strconv.Atoi(record[2])
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "Failed to convert flag value %s to integer: %v\n", record[2], err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Register the flag
|
|
||||||
log.Printf("Registering flagName:%s; flagValue:%v", flagName, flagValue)
|
|
||||||
state.FlagDebugger.Register(uint32(flagValue), flagName)
|
|
||||||
}
|
|
||||||
|
|
||||||
rfs := resource.NewFsResource(scriptDir)
|
|
||||||
ca := cache.NewCache()
|
|
||||||
cfg := engine.Config{
|
cfg := engine.Config{
|
||||||
Root: "root",
|
Root: "root",
|
||||||
SessionId: sessionId,
|
SessionId: sessionId,
|
||||||
|
OutputSize: uint32(size),
|
||||||
|
FlagCount: uint32(16),
|
||||||
}
|
}
|
||||||
|
|
||||||
dp := path.Join(scriptDir, ".state")
|
rs, err := getResource(scriptDir, ctx)
|
||||||
err = os.MkdirAll(dp, 0700)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "state dir create exited with error: %v\n", err)
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
pr := persist.NewFsPersister(dp)
|
|
||||||
en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs)
|
|
||||||
|
|
||||||
|
pr, err := getPersister(dbDir, ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
pr = pr.WithContent(&st, ca)
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
err = pr.Save(cfg.SessionId)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "Failed to save state with error: %v\n", err)
|
|
||||||
}
|
|
||||||
en, err = engine.NewPersistedEngine(ctx, cfg, pr, rfs)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "engine create exited with error: %v\n", err)
|
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fp := path.Join(dp, sessionId)
|
|
||||||
|
|
||||||
ussdHandlers, err := ussd.NewHandlers(fp, &st, sessionId)
|
|
||||||
|
|
||||||
|
store := getUserdataDb(dbDir, ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "handler setup failed with error: %v\n", err)
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
rfs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
|
dbResource, ok := rs.(*resource.DbResource)
|
||||||
rfs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
|
if !ok {
|
||||||
rfs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
|
os.Exit(1)
|
||||||
rfs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
|
}
|
||||||
rfs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
|
|
||||||
rfs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
|
|
||||||
rfs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
|
|
||||||
rfs.AddLocalFunc("quit", ussdHandlers.Quit)
|
|
||||||
rfs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
|
|
||||||
rfs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
|
|
||||||
rfs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
|
|
||||||
rfs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
|
|
||||||
rfs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
|
|
||||||
rfs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
|
|
||||||
rfs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
|
|
||||||
rfs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
|
|
||||||
rfs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
|
|
||||||
rfs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
|
|
||||||
rfs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
|
|
||||||
rfs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
|
|
||||||
rfs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
|
|
||||||
rfs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
|
|
||||||
rfs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
|
|
||||||
rfs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
|
|
||||||
rfs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
|
|
||||||
rfs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
|
|
||||||
rfs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
|
|
||||||
rfs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
|
|
||||||
rfs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
|
|
||||||
rfs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
|
|
||||||
rfs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
|
|
||||||
rfs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
|
|
||||||
|
|
||||||
cont, err := en.Init(ctx)
|
hl, err := getHandler(flagParser, dbResource, pr, store)
|
||||||
en.SetDebugger(engine.NewSimpleDebug(nil))
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
en := getEngine(cfg, rs, pr)
|
||||||
|
en = en.WithFirst(hl.Init)
|
||||||
|
if debug {
|
||||||
|
en = en.WithDebug(nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = en.Init(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
|
fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
if !cont {
|
|
||||||
_, err = en.WriteResult(ctx, os.Stdout)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "dead init write error: %v\n", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
err = en.Finish()
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "engine finish error: %v\n", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
os.Stdout.Write([]byte{0x0a})
|
|
||||||
os.Exit(0)
|
|
||||||
}
|
|
||||||
err = engine.Loop(ctx, en, os.Stdin, os.Stdout)
|
err = engine.Loop(ctx, en, os.Stdin, os.Stdout)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)
|
fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)
|
||||||
|
1
go-vise
1
go-vise
@ -1 +0,0 @@
|
|||||||
Subproject commit 1f47a674d95380be8c387f410f0342eb72357df5
|
|
22
go.mod
22
go.mod
@ -2,4 +2,24 @@ module git.grassecon.net/urdt/ussd
|
|||||||
|
|
||||||
go 1.22.6
|
go 1.22.6
|
||||||
|
|
||||||
require github.com/stretchr/testify v1.9.0 // indirect
|
require (
|
||||||
|
github.com/alecthomas/participle/v2 v2.0.0 // indirect
|
||||||
|
github.com/alecthomas/repr v0.2.0 // indirect
|
||||||
|
github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
|
||||||
|
github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
|
||||||
|
github.com/hexops/gotextdiff v1.0.3 // indirect
|
||||||
|
github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
github.com/stretchr/objx v0.5.2 // indirect
|
||||||
|
github.com/stretchr/testify v1.9.0
|
||||||
|
github.com/x448/float16 v0.8.4 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
git.defalsify.org/vise.git v0.1.0-rc.1.0.20240906020635-400f69d01a89
|
||||||
|
github.com/alecthomas/assert/v2 v2.2.2
|
||||||
|
gopkg.in/leonelquinteros/gotext.v1 v1.3.1
|
||||||
|
)
|
||||||
|
34
go.sum
34
go.sum
@ -1,2 +1,36 @@
|
|||||||
|
git.defalsify.org/vise.git v0.1.0-rc.1.0.20240906020635-400f69d01a89 h1:YyQODhMwSM5YD9yKHM5jCF0HC0RQtE3MkVXcTnOhXJo=
|
||||||
|
git.defalsify.org/vise.git v0.1.0-rc.1.0.20240906020635-400f69d01a89/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
|
||||||
|
github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
|
||||||
|
github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
|
||||||
|
github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
|
||||||
|
github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y=
|
||||||
|
github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
|
||||||
|
github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
|
||||||
|
github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
|
||||||
|
github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
|
||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
|
||||||
|
github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
|
||||||
|
github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
|
||||||
|
github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
|
||||||
|
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
|
||||||
|
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
|
||||||
|
github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
|
||||||
|
github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
|
||||||
|
github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
|
||||||
|
github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
|
||||||
|
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
|
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
||||||
|
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
|
||||||
|
gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
59
internal/handlers/ussd/mocks/dbmock.go
Normal file
59
internal/handlers/ussd/mocks/dbmock.go
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
package mocks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/lang"
|
||||||
|
"github.com/stretchr/testify/mock"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MockDb struct {
|
||||||
|
mock.Mock
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) SetPrefix(prefix uint8) {
|
||||||
|
m.Called(prefix)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) Prefix() uint8 {
|
||||||
|
args := m.Called()
|
||||||
|
return args.Get(0).(uint8)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) Safe() bool {
|
||||||
|
args := m.Called()
|
||||||
|
return args.Get(0).(bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) SetLanguage(language *lang.Language) {
|
||||||
|
m.Called(language)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) SetLock(uint8, bool) error {
|
||||||
|
args := m.Called()
|
||||||
|
return args.Error(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) Connect(ctx context.Context, connectionStr string) error {
|
||||||
|
args := m.Called(ctx, connectionStr)
|
||||||
|
return args.Error(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) SetSession(sessionId string) {
|
||||||
|
m.Called(sessionId)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) Put(ctx context.Context, key, value []byte) error {
|
||||||
|
args := m.Called(ctx, key, value)
|
||||||
|
return args.Error(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) Get(ctx context.Context, key []byte) ([]byte, error) {
|
||||||
|
args := m.Called(ctx, key)
|
||||||
|
return nil, args.Error(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockDb) Close() error {
|
||||||
|
args := m.Called(nil)
|
||||||
|
return args.Error(0)
|
||||||
|
}
|
@ -1,44 +0,0 @@
|
|||||||
package mocks
|
|
||||||
|
|
||||||
import (
|
|
||||||
"git.grassecon.net/urdt/ussd/internal/models"
|
|
||||||
"github.com/stretchr/testify/mock"
|
|
||||||
)
|
|
||||||
|
|
||||||
type MockAccountFileHandler struct {
|
|
||||||
mock.Mock
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockAccountFileHandler) EnsureFileExists() error {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Error(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockAccountFileHandler) ReadAccountData() (map[string]string, error) {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Get(0).(map[string]string), args.Error(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockAccountFileHandler) WriteAccountData(data map[string]string) error {
|
|
||||||
args := m.Called(data)
|
|
||||||
return args.Error(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
type MockAccountService struct {
|
|
||||||
mock.Mock
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Get(0).(*models.AccountResponse), args.Error(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockAccountService) CheckAccountStatus(TrackingId string) (string, error) {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Get(0).(string), args.Error(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockAccountService) CheckBalance(PublicKey string) (string, error) {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Get(0).(string), args.Error(1)
|
|
||||||
}
|
|
26
internal/handlers/ussd/mocks/servicemock.go
Normal file
26
internal/handlers/ussd/mocks/servicemock.go
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
package mocks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/models"
|
||||||
|
"github.com/stretchr/testify/mock"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MockAccountService implements AccountServiceInterface for testing
|
||||||
|
type MockAccountService struct {
|
||||||
|
mock.Mock
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
|
||||||
|
args := m.Called()
|
||||||
|
return args.Get(0).(*models.AccountResponse), args.Error(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
|
||||||
|
args := m.Called(publicKey)
|
||||||
|
return args.String(0), args.Error(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
|
||||||
|
args := m.Called(trackingId)
|
||||||
|
return args.String(0), args.Error(1)
|
||||||
|
}
|
24
internal/handlers/ussd/mocks/userdbmock.go
Normal file
24
internal/handlers/ussd/mocks/userdbmock.go
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
package mocks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/utils"
|
||||||
|
"github.com/stretchr/testify/mock"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MockUserDataStore struct {
|
||||||
|
db.Db
|
||||||
|
mock.Mock
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockUserDataStore) ReadEntry(ctx context.Context, sessionId string, typ utils.DataTyp) ([]byte, error) {
|
||||||
|
args := m.Called(ctx, sessionId, typ)
|
||||||
|
return args.Get(0).([]byte), args.Error(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockUserDataStore) WriteEntry(ctx context.Context, sessionId string, typ utils.DataTyp, value []byte) error {
|
||||||
|
args := m.Called(ctx, sessionId, typ, value)
|
||||||
|
return args.Error(0)
|
||||||
|
}
|
@ -1,46 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"os"
|
|
||||||
)
|
|
||||||
|
|
||||||
type AccountFileHandler struct {
|
|
||||||
FilePath string
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewAccountFileHandler(path string) *AccountFileHandler {
|
|
||||||
return &AccountFileHandler{FilePath: path}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (afh *AccountFileHandler) ReadAccountData() (map[string]string, error) {
|
|
||||||
jsonData, err := os.ReadFile(afh.FilePath)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var accountData map[string]string
|
|
||||||
err = json.Unmarshal(jsonData, &accountData)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return accountData, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (afh *AccountFileHandler) WriteAccountData(accountData map[string]string) error {
|
|
||||||
jsonData, err := json.Marshal(accountData)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return os.WriteFile(afh.FilePath, jsonData, 0644)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (afh *AccountFileHandler) EnsureFileExists() error {
|
|
||||||
f, err := os.OpenFile(afh.FilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return f.Close()
|
|
||||||
}
|
|
58
internal/utils/db.go
Normal file
58
internal/utils/db.go
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
package utils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/binary"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DataTyp uint16
|
||||||
|
|
||||||
|
const (
|
||||||
|
DATA_ACCOUNT DataTyp = iota
|
||||||
|
DATA_ACCOUNT_CREATED
|
||||||
|
DATA_TRACKING_ID
|
||||||
|
DATA_PUBLIC_KEY
|
||||||
|
DATA_CUSTODIAL_ID
|
||||||
|
DATA_ACCOUNT_PIN
|
||||||
|
DATA_ACCOUNT_STATUS
|
||||||
|
DATA_FIRST_NAME
|
||||||
|
DATA_FAMILY_NAME
|
||||||
|
DATA_YOB
|
||||||
|
DATA_LOCATION
|
||||||
|
DATA_GENDER
|
||||||
|
DATA_OFFERINGS
|
||||||
|
DATA_RECIPIENT
|
||||||
|
DATA_AMOUNT
|
||||||
|
)
|
||||||
|
|
||||||
|
func typToBytes(typ DataTyp) []byte {
|
||||||
|
var b [2]byte
|
||||||
|
binary.BigEndian.PutUint16(b[:], uint16(typ))
|
||||||
|
return b[:]
|
||||||
|
}
|
||||||
|
|
||||||
|
func PackKey(typ DataTyp, data []byte) []byte {
|
||||||
|
v := typToBytes(typ)
|
||||||
|
return append(v, data...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func ReadEntry(ctx context.Context, store db.Db, sessionId string, typ DataTyp) ([]byte, error) {
|
||||||
|
|
||||||
|
store.SetPrefix(db.DATATYPE_USERDATA)
|
||||||
|
store.SetSession(sessionId)
|
||||||
|
k := PackKey(typ, []byte(sessionId))
|
||||||
|
b, err := store.Get(ctx, k)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return b, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func WriteEntry(ctx context.Context, store db.Db, sessionId string, typ DataTyp, value []byte) error {
|
||||||
|
store.SetPrefix(db.DATATYPE_USERDATA)
|
||||||
|
store.SetSession(sessionId)
|
||||||
|
k := PackKey(typ, []byte(sessionId))
|
||||||
|
return store.Put(ctx, k, value)
|
||||||
|
}
|
@ -1,13 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
type AccountFileHandlerInterface interface {
|
|
||||||
EnsureFileExists() error
|
|
||||||
ReadAccountData() (map[string]string, error)
|
|
||||||
WriteAccountData(data map[string]string) error
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
32
internal/utils/userStore.go
Normal file
32
internal/utils/userStore.go
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
package utils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DataStore interface {
|
||||||
|
db.Db
|
||||||
|
ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error)
|
||||||
|
WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error
|
||||||
|
}
|
||||||
|
|
||||||
|
type UserDataStore struct {
|
||||||
|
db.Db
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadEntry retrieves an entry from the store based on the provided parameters.
|
||||||
|
func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error) {
|
||||||
|
store.SetPrefix(db.DATATYPE_USERDATA)
|
||||||
|
store.SetSession(sessionId)
|
||||||
|
k := PackKey(typ, []byte(sessionId))
|
||||||
|
return store.Get(ctx, k)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error {
|
||||||
|
store.SetPrefix(db.DATATYPE_USERDATA)
|
||||||
|
store.SetSession(sessionId)
|
||||||
|
k := PackKey(typ, []byte(sessionId))
|
||||||
|
return store.Put(ctx, k, value)
|
||||||
|
}
|
@ -4,7 +4,7 @@ TXTS = $(wildcard ./*.txt.orig)
|
|||||||
|
|
||||||
# Rule to build .bin files from .vis files
|
# Rule to build .bin files from .vis files
|
||||||
%.vis:
|
%.vis:
|
||||||
go run ../../go-vise/dev/asm -f pp.csv $(basename $@).vis > $(basename $@).bin
|
go run ../../go-vise/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
|
||||||
@echo "Built $(basename $@).bin from $(basename $@).vis"
|
@echo "Built $(basename $@).bin from $(basename $@).vis"
|
||||||
|
|
||||||
# Rule to copy .orig files to .txt
|
# Rule to copy .orig files to .txt
|
||||||
|
Loading…
Reference in New Issue
Block a user