setup a test for get profile info

cmd/http/main.go

@@ -1,215 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"net/http"
-	"os"
-	"os/signal"
-	"path"
-	"strconv"
-	"syscall"
-
-	"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/resource"
-	"git.defalsify.org/vise.git/logging"
-
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
-	httpserver "git.grassecon.net/urdt/ussd/internal/http"
-)
-
-var (
-	logg = logging.NewVanilla()
-	scriptDir = path.Join("services", "registration")
-)
-
-func getFlags(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, userdataStore db.Db) (*ussd.Handlers, error) {
-
-	ussdHandlers, err := ussd.NewHandlers(appFlags, 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 ensureDbDir(dbDir string) error {
-	err := os.MkdirAll(dbDir, 0700)
-	if err != nil {
-		return fmt.Errorf("state dir create exited with error: %v\n", err)
-	}
-	return nil
-}
-
-func getStateStore(dbDir string, ctx context.Context) (db.Db, error) {
-	store := gdbmdb.NewGdbmDb()
-	storeFile := path.Join(dbDir, "state.gdbm")
-	store.Connect(ctx, storeFile)
-	return store, 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 main() {
-	var dbDir string
-	var resourceDir string
-	var size uint
-	var engineDebug bool
-	var stateDebug bool
-	var host string
-	var port uint
-	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
-	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
-	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", "127.0.0.1", "http host")
-	flag.UintVar(&port, "p", 7123, "http port")
-	flag.Parse()
-
-	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir,  "outputsize", size)
-
-	ctx := context.Background()
-	pfp := path.Join(scriptDir, "pp.csv")
-	flagParser, err := getFlags(pfp, true)
-
-	if err != nil {
-		os.Exit(1)
-	}
-
-	cfg := engine.Config{
-		Root:       "root",
-		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
-	}
-	if stateDebug {
-		cfg.StateDebug = true
-	}
-	if engineDebug {
-		cfg.EngineDebug = true
-	}
-
-	rs, err := getResource(resourceDir, ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	err = ensureDbDir(dbDir)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	userdataStore := getUserdataDb(dbDir, ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	defer userdataStore.Close()
-
-	dbResource, ok := rs.(*resource.DbResource)
-	if !ok {
-		os.Exit(1)
-	}
-
-	hl, err := getHandler(flagParser, dbResource, userdataStore)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	stateStore, err := getStateStore(dbDir, ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	defer stateStore.Close()
-
-	rp := &httpserver.DefaultRequestParser{}
-	//sh := httpserver.NewSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl.Init)
-	sh := httpserver.NewSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	s := &http.Server{
-		Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
-		Handler: sh,
-	}
-	s.RegisterOnShutdown(sh.Shutdown)
-
-	cint := make(chan os.Signal)
-	cterm := make(chan os.Signal)
-	signal.Notify(cint, os.Interrupt, syscall.SIGINT)
-	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
-	go func() {
-		select {
-		case _ = <-cint:
-		case _ = <-cterm:
-		}
-		s.Shutdown(ctx)
-	}()
-	err = s.ListenAndServe()
-	if err != nil {
-		logg.Infof("Server closed with error", "err", err)
-	}
-}

cmd/main.go

@@ -7,189 +7,137 @@ import (
 	"os"
 	"path"
 
-	"git.defalsify.org/vise.git/asm"
+	"git.defalsify.org/vise.git/cache"
-	"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/logging"
 	"git.defalsify.org/vise.git/persist"
 	"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/models"
 )
 
 var (
-	logg      = logging.NewVanilla()
 	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, userdataStore)
-	if err != nil {
-		return nil, err
-	}
-	ussdHandlers = ussdHandlers.WithPersister(pe)
-	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 ensureDbDir(dbDir string) error {
-	err := os.MkdirAll(dbDir, 0700)
-	if err != nil {
-		return fmt.Errorf("state dir create exited with error: %v\n", err)
-	}
-	return nil
-}
-
-func getPersister(dbDir string, ctx context.Context) (*persist.Persister, error) {
-	err := ensureDbDir(dbDir)
-	if err != nil {
-		return nil, 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() {
-	var dbDir string
+	var dir string
+	var root string
 	var size uint
 	var sessionId string
-	var debug bool
+	flag.StringVar(&dir, "d", ".", "resource dir to read from")
-	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
+	flag.UintVar(&size, "s", 0, "max size of output")
-	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
+	flag.StringVar(&root, "root", "root", "entry point symbol")
-	flag.BoolVar(&debug, "d", false, "use engine debug output")
+	flag.StringVar(&sessionId, "session-id", "default", "session id")
-	flag.UintVar(&size, "s", 160, "max size of output")
 	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.WithValue(ctx, "SessionId", sessionId)
+	st := state.NewState(16)
-	pfp := path.Join(scriptDir, "pp.csv")
+	st.UseDebug()
-	flagParser, err := getParser(pfp, true)
+	state.FlagDebugger.Register(models.USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE")
-
+	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED")
-	if err != nil {
+	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_SUCCESS, "ACCOUNT_SUCCESS")
-		os.Exit(1)
+	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_PENDING, "ACCOUNT_PENDING")
-	}
+	state.FlagDebugger.Register(models.USERFLAG_INCORRECTPIN, "INCORRECTPIN")
+	state.FlagDebugger.Register(models.USERFLAG_INCORRECTDATEFORMAT, "INVALIDDATEFORMAT")
+	state.FlagDebugger.Register(models.USERFLAG_INVALID_RECIPIENT, "INVALIDRECIPIENT")
+	state.FlagDebugger.Register(models.USERFLAG_PINMISMATCH, "PINMISMATCH")
+	state.FlagDebugger.Register(models.USERFLAG_PIN_SET, "PIN_SET")
+	state.FlagDebugger.Register(models.USERFLAG_INVALID_RECIPIENT_WITH_INVITE, "INVALIDRECIPIENT_WITH_INVITE")
+	state.FlagDebugger.Register(models.USERFLAG_INVALID_AMOUNT, "INVALIDAMOUNT")
+	state.FlagDebugger.Register(models.USERFLAG_ALLOW_UPDATE, "UNLOCKFORUPDATE")
+	state.FlagDebugger.Register(models.USERFLAG_VALIDPIN, "VALIDPIN")
+	state.FlagDebugger.Register(models.USERFLAG_VALIDPIN, "ACCOUNTUNLOCKED")
+	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_CREATION_FAILED, "ACCOUNT_CREATION_FAILED")
+	state.FlagDebugger.Register(models.USERFLAG_SINGLE_EDIT, "SINGLEEDIT")
 
+	rfs := resource.NewFsResource(scriptDir)
+	ca := cache.NewCache()
 	cfg := engine.Config{
-		Root:       "root",
+		Root:      "root",
-		SessionId:  sessionId,
+		SessionId: sessionId,
-		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
 	}
 
-	rs, err := getResource(scriptDir, ctx)
+	dp := path.Join(scriptDir, ".state")
+	err := os.MkdirAll(dp, 0700)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
+		fmt.Fprintf(os.Stderr, "state dir create exited with error: %v\n", err)
 		os.Exit(1)
 	}
+	pr := persist.NewFsPersister(dp)
+	en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs)
 
-	pe, err := getPersister(dbDir, ctx)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
+		pr = pr.WithContent(&st, ca)
-		os.Exit(1)
+		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)
+		}
 	}
 
-	store := getUserdataDb(dbDir, ctx)
+	fp := path.Join(dp, sessionId)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
 
-	dbResource, ok := rs.(*resource.DbResource)
+	ussdHandlers := ussd.NewHandlers(fp, &st)
-	if !ok {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
 
-	hl, err := getHandler(flagParser, dbResource, pe, store)
+	rfs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
-	if err != nil {
+	rfs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
-		fmt.Fprintf(os.Stderr, err.Error())
+	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)
 
-	en := getEngine(cfg, rs, pe)
+	cont, err := en.Init(ctx)
-	en = en.WithFirst(hl.Init)
+	en.SetDebugger(engine.NewSimpleDebug(nil))
-	if debug {
-		en = en.WithDebug(nil)
-	}
-
-	_, err = en.Init(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
 		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)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)

go.mod

@@ -2,27 +2,4 @@ module git.grassecon.net/urdt/ussd
 
 go 1.22.6
 
-require (
+require github.com/stretchr/testify v1.9.0 // indirect
-	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911162138-1f2af8672dc7
-	github.com/alecthomas/assert/v2 v2.2.2
-	github.com/peteole/testdata-loader v0.3.0
-	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
-)
-
-require gopkg.in/dnaeon/go-vcr.v4 v4.0.1 // 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
-)

go.sum

@@ -1,38 +1,2 @@
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911162138-1f2af8672dc7 h1:embPZDx0Sgpq6jp9vcZ1GVI0eum3PsPCmAfxAa/1KLI=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911162138-1f2af8672dc7/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/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/dnaeon/go-vcr.v4 v4.0.1 h1:dIFuOqqDZIJ9BTcK+DXmElzypQ6PV9fBQZSIwY+J1yM=
-gopkg.in/dnaeon/go-vcr.v4 v4.0.1/go.mod h1:65yxh9goQVrudqofKtHA4JNFWd6XZRkWfKN4YpMx7KI=
-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=

internal/handlers/server/account_service_offline_test.go

@@ -1,129 +0,0 @@
-//go:build !online
-// +build !online
-
-package server
-
-import (
-	"testing"
-
-	"github.com/alecthomas/assert/v2"
-	"gopkg.in/dnaeon/go-vcr.v4/pkg/recorder"
-)
-
-func TestCheckBalanceOffline(t *testing.T) {
-	r, err := recorder.New("custodial/balance")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name      string
-		balance   string
-		publicKey string
-	}{
-		{
-			name:      "Test check balance with correct public key",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF002",
-			balance:   "3.06000000003 CELO",
-		},
-		{
-			name:      "Test check balance with public key that doesn't exist in the custodial system",
-			balance:   "",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF00",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			balance, err := as.CheckBalance(tt.publicKey)
-			if err != nil {
-				t.Fatalf("Failed to get balance with error %s", err)
-			}
-			if err != nil {
-
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, balance, tt.balance, "Expected balance and actual balance should be equal")
-
-		})
-	}
-
-}
-
-func TestCheckAccountStatusOffline(t *testing.T) {
-	r, err := recorder.New("custodial/status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name       string
-		status     string
-		trackingId string
-	}{
-		{
-			name:       "Test check status with tracking id that exists in the custodial system",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e18",
-			status:     "SUCCESS",
-		},
-		{
-			name:       "Test check status with tracking id that doesn't exist in the custodial system",
-			status:     "",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e1",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			status, err := as.CheckAccountStatus(tt.trackingId)
-			if err != nil {
-				t.Fatalf("Failed to account status with error %s", err)
-			}
-			if err != nil {
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, status, tt.status, "Expected status and actual status should be equal")
-
-		})
-	}
-
-}
-
-func TestCreateAccountOffline(t *testing.T) {
-	r, err := recorder.New("custodial/create")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	accountRes, err := as.CreateAccount()
-
-	if err != nil {
-		t.Fatalf("Failed to create an account with error %s", err)
-	}
-	if err != nil {
-		return
-	}
-	assert.NoError(t, err)
-	assert.Equal(t, accountRes.Ok, true, "account response status is true")
-
-}

internal/handlers/server/account_service_online_test.go

@@ -1,130 +0,0 @@
-//go:build online
-// +build online
-
-package server
-
-import (
-	"net/http"
-	"testing"
-
-	"github.com/alecthomas/assert/v2"
-	"gopkg.in/dnaeon/go-vcr.v4/pkg/recorder"
-)
-
-func TestCheckBalance(t *testing.T) {
-	r, err := recorder.New("custodial/balance")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := &http.Client{}
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name      string
-		balance   string
-		publicKey string
-	}{
-		{
-			name:      "Test check balance with correct public key",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF002",
-			balance:   "3.06000000003 CELO",
-		},
-		{
-			name:      "Test check balance with public key that doesn't exist in the custodial system",
-			balance:   "",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF00",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			balance, err := as.CheckBalance(tt.publicKey)
-			if err != nil {
-				t.Fatalf("Failed to get balance with error %s", err)
-			}
-			if err != nil {
-
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, balance, tt.balance, "Expected balance and actual balance should be equal")
-
-		})
-	}
-
-}
-
-func TestCheckAccountStatus(t *testing.T) {
-	r, err := recorder.New("custodial/status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := &http.Client{}
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name       string
-		status     string
-		trackingId string
-	}{
-		{
-			name:       "Test check status with tracking id that exists in the custodial system",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e18",
-			status:     "SUCCESS",
-		},
-		{
-			name:       "Test check status with tracking id that doesn't exist in the custodial system",
-			status:     "",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e1",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			status, err := as.CheckAccountStatus(tt.trackingId)
-			if err != nil {
-				t.Fatalf("Failed to account status with error %s", err)
-			}
-			if err != nil {
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, status, tt.status, "Expected status and actual status should be equal")
-
-		})
-	}
-
-}
-
-func TestCreateAccount(t *testing.T) {
-	r, err := recorder.New("custodial/create")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := &http.Client{}
-
-	as := AccountService{
-		Client: client,
-	}
-	accountRes, err := as.CreateAccount()
-
-	if err != nil {
-		t.Fatalf("Failed to create an account with error %s", err)
-	}
-	if err != nil {
-		return
-	}
-	assert.NoError(t, err)
-	assert.Equal(t, accountRes.Ok, true, "account response status is true")
-
-}

internal/handlers/server/accountservice.go

@@ -16,7 +16,6 @@ type AccountServiceInterface interface {
 }
 
 type AccountService struct {
-	Client *http.Client
 }
 
 
@@ -35,8 +34,7 @@ type AccountService struct {
 //     If no error occurs, this will be nil.
 //
 func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
-	resp,err := as.Client.Get(config.TrackStatusURL + trackingId)
+	resp, err := http.Get(config.TrackStatusURL + trackingId)
-	// resp, err := http.Get(config.TrackStatusURL + trackingId)
 	if err != nil {
 		return "", err
 	}
@@ -64,8 +62,7 @@ func (as *AccountService) CheckAccountStatus(trackingId string) (string, error)
 //   - publicKey: The public key associated with the account whose balance needs to be checked.
 func (as *AccountService) CheckBalance(publicKey string) (string, error) {
 
-	//resp, err := http.Get(config.BalanceURL + publicKey)
+	resp, err := http.Get(config.BalanceURL + publicKey)
-	resp, err := as.Client.Get(config.BalanceURL + publicKey)
 	if err != nil {
 		return "0.0", err
 	}
@@ -94,8 +91,7 @@ func (as *AccountService) CheckBalance(publicKey string) (string, error) {
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
 func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
-	//resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
+	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
-	resp, err := as.Client.Post(config.CreateAccountURL, "application/json", nil)
 	if err != nil {
 		return nil, err
 	}

internal/handlers/server/accountservice_test.go

@@ -1,126 +0,0 @@
-package server
-
-import (
-	"testing"
-
-	"github.com/alecthomas/assert/v2"
-	"gopkg.in/dnaeon/go-vcr.v4/pkg/recorder"
-)
-
-func TestCheckBalance(t *testing.T) {
-	r, err := recorder.New("custodial/balance")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name      string
-		balance   string
-		publicKey string
-	}{
-		{
-			name:      "Test check balance with correct public key",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF002",
-			balance:   "3.06000000003 CELO",
-		},
-		{
-			name:      "Test check balance with public key that doesn't exist in the custodial system",
-			balance:   "",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF00",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			balance, err := as.CheckBalance(tt.publicKey)
-			if err != nil {
-				t.Fatalf("Failed to get balance with error %s", err)
-			}
-			if err != nil {
-
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, balance, tt.balance, "Expected balance and actual balance should be equal")
-
-		})
-	}
-
-}
-
-func TestCheckAccountStatus(t *testing.T) {
-	r, err := recorder.New("custodial/status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name       string
-		status     string
-		trackingId string
-	}{
-		{
-			name:       "Test check status with tracking id that exists in the custodial system",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e18",
-			status:     "SUCCESS",
-		},
-		{
-			name:       "Test check status with tracking id that doesn't exist in the custodial system",
-			status:     "",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e1",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			status, err := as.CheckAccountStatus(tt.trackingId)
-			if err != nil {
-				t.Fatalf("Failed to account status with error %s", err)
-			}
-			if err != nil {
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, status, tt.status, "Expected status and actual status should be equal")
-
-		})
-	}
-
-}
-
-func TestCreateAccount(t *testing.T) {
-	r, err := recorder.New("custodial/create")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	accountRes, err := as.CreateAccount()
-
-	if err != nil {
-		t.Fatalf("Failed to create an account with error %s", err)
-	}
-	if err != nil {
-		return
-	}
-	assert.NoError(t, err)
-	assert.Equal(t, accountRes.Ok, true, "account response status is true")
-
-}

internal/handlers/ussd/mocks/dbmock.go

@@ -1,59 +0,0 @@
-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)
-}

internal/handlers/ussd/mocks/mocks.go

@@ -0,0 +1,44 @@
+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)
+}

internal/handlers/ussd/mocks/servicemock.go

@@ -1,26 +0,0 @@
-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)
-}

internal/handlers/ussd/mocks/userdbmock.go

@@ -1,24 +0,0 @@
-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)
-}

internal/http/server.go

@@ -1,150 +0,0 @@
-package http
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
-
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("httpserver")
-)
-
-type RequestParser interface {
-	GetSessionId(rq *http.Request) (string, error)
-	GetInput(rq *http.Request) ([]byte, error)
-}
-
-type DefaultRequestParser struct {
-}
-
-func(rp *DefaultRequestParser) GetSessionId(rq *http.Request) (string, error) {
-	v := rq.Header.Get("X-Vise-Session")
-	if v == "" {
-		return "", fmt.Errorf("no session found")
-	}
-	return v, nil
-}
-
-func(rp *DefaultRequestParser) GetInput(rq *http.Request) ([]byte, error) {
-	defer rq.Body.Close()
-	v, err := ioutil.ReadAll(rq.Body)
-	if err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-type SessionHandler struct {
-	cfgTemplate engine.Config
-	rp RequestParser
-	rs resource.Resource
-	//first resource.EntryFunc
-	hn *ussd.Handlers
-	provider StorageProvider
-}
-
-//func NewSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, first resource.EntryFunc) *SessionHandler {
-func NewSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn *ussd.Handlers) *SessionHandler {
-	return &SessionHandler{
-		cfgTemplate: cfg,
-		rs: rs,
-		//first: first,
-		hn: hn,
-		rp: rp,
-		provider: NewSimpleStorageProvider(stateDb, userdataDb),
-	}
-}
-
-func(f *SessionHandler) writeError(w http.ResponseWriter, code int, msg string, err error) {
-	w.Header().Set("X-Vise", msg + ": " + err.Error())
-	w.Header().Set("Content-Length", "0")
-	w.WriteHeader(code)
-	_, err = w.Write([]byte{})
-	if err != nil {
-		w.WriteHeader(500)
-		w.Header().Set("X-Vise", err.Error())
-	}
-	return 
-}
-
-func(f* SessionHandler) Shutdown() {
-	err := f.provider.Close()
-	if err != nil {
-		logg.Errorf("handler shutdown error", "err", err)
-	}
-}
-
-func(f *SessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	var r bool
-	sessionId, err := f.rp.GetSessionId(req)
-	if err != nil {
-		f.writeError(w, 400, "Session missing", err)
-		return
-	}
-	input, err := f.rp.GetInput(req)
-	if err != nil {
-		f.writeError(w, 400, "Input read fail", err)
-		return
-	}
-	ctx := req.Context()
-	cfg := f.cfgTemplate
-	cfg.SessionId = sessionId
-
-	logg.InfoCtxf(ctx, "new request",  "session", cfg.SessionId, "input", input)
-
-	storage, err := f.provider.Get(cfg.SessionId)
-	if err != nil {
-		f.writeError(w, 500, "Storage retrieval fail", err)
-		return
-	}
-	f.hn = f.hn.WithPersister(storage.Persister)
-	defer f.provider.Put(cfg.SessionId, storage)
-	en := getEngine(cfg, f.rs, storage.Persister)
-	en = en.WithFirst(f.hn.Init)
-	if cfg.EngineDebug {
-		en = en.WithDebug(nil)
-	}
-
-	r, err = en.Init(ctx)
-	if err != nil {
-		f.writeError(w, 500, "Engine init fail", err)
-		return
-	}
-	if r && len(input) > 0 {
-		r, err = en.Exec(ctx, input)
-	}
-	if err != nil {
-		f.writeError(w, 500, "Engine exec fail", err)
-		return
-	}
-
-	w.WriteHeader(200)
-	w.Header().Set("Content-Type", "text/plain")
-	_, err = en.WriteResult(ctx, w)
-	if err != nil {
-		f.writeError(w, 500, "Write result fail", err)
-		return
-	}
-	err = en.Finish()
-	if err != nil {
-		f.writeError(w, 500, "Engine finish fail", err)
-		return
-	}
-
-	_ = r
-}
-
-func getEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) *engine.DefaultEngine {
-	en := engine.NewEngine(cfg, rs)
-	en = en.WithPersister(pr)
-	return en
-}

internal/http/storage.go

@@ -1,44 +0,0 @@
-package http
-
-import (
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/persist"
-)
-
-type Storage struct {
-	Persister *persist.Persister
-	UserdataDb db.Db	
-}
-
-type StorageProvider interface {
-	Get(sessionId string) (Storage, error)
-	Put(sessionId string, storage Storage) error
-	Close() error
-}
-
-type SimpleStorageProvider struct {
-	Storage
-}
-
-func NewSimpleStorageProvider(stateStore db.Db, userdataStore db.Db) StorageProvider {
-	pe := persist.NewPersister(stateStore)
-	pe = pe.WithFlush()
-	return &SimpleStorageProvider{
-		Storage: Storage{
-			Persister: pe,
-			UserdataDb: userdataStore,
-		},
-	}
-}
-
-func (p *SimpleStorageProvider) Get(sessionId string) (Storage, error) {
-	return p.Storage, nil
-}
-
-func (p *SimpleStorageProvider) Put(sessionId string, storage Storage) error {
-	return nil
-}
-
-func (p *SimpleStorageProvider) Close() error {
-	return p.Storage.UserdataDb.Close()
-}

internal/models/flags.go

@@ -0,0 +1,22 @@
+package models
+
+import "git.defalsify.org/vise.git/state"
+
+const (
+	USERFLAG_LANGUAGE_SET = iota + state.FLAG_USERSTART
+	USERFLAG_ACCOUNT_CREATED
+	USERFLAG_ACCOUNT_PENDING
+	USERFLAG_ACCOUNT_SUCCESS
+	USERFLAG_ACCOUNT_AUTHORIZED
+	USERFLAG_INVALID_RECIPIENT
+	USERFLAG_INVALID_RECIPIENT_WITH_INVITE
+	USERFLAG_INCORRECTPIN
+	USERFLAG_ALLOW_UPDATE
+	USERFLAG_INVALID_AMOUNT
+	USERFLAG_PIN_SET
+	USERFLAG_VALIDPIN
+	USERFLAG_PINMISMATCH
+	USERFLAG_INCORRECTDATEFORMAT
+	USERFLAG_ACCOUNT_CREATION_FAILED
+	USERFLAG_SINGLE_EDIT
+)

internal/utils/account_utils.go

@@ -0,0 +1,46 @@
+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()
+}

internal/utils/db.go

@@ -1,36 +0,0 @@
-package utils
-
-import (
-	"encoding/binary"
-)
-
-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...)
-}

internal/utils/filehandler.go

@@ -0,0 +1,13 @@
+package utils
+
+
+
+
+type AccountFileHandlerInterface interface {
+    EnsureFileExists() error
+    ReadAccountData() (map[string]string, error)
+    WriteAccountData(data map[string]string) error
+}
+
+
+

internal/utils/userStore.go

@@ -1,32 +0,0 @@
-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)
-}

services/registration/Makefile

@@ -4,7 +4,7 @@ TXTS = $(wildcard ./*.txt.orig)
 
 # Rule to build .bin files from .vis files
 %.vis:
-	go run  ../../go-vise/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
+	go run ../../go-vise/dev/asm $(basename $@).vis > $(basename $@).bin
 	@echo "Built $(basename $@).bin from $(basename $@).vis"
 
 # Rule to copy .orig files to .txt

services/registration/account_creation.vis

@@ -1,4 +1,4 @@
 RELOAD verify_pin
-CATCH create_pin_mismatch flag_pin_mismatch 1
+CATCH create_pin_mismatch 20 1
 LOAD quit 0
 HALT

services/registration/account_pending.vis

@@ -1,3 +1,3 @@
 RELOAD check_account_status
-CATCH main flag_account_success 1
+CATCH main 11 1
 HALT

services/registration/amount.vis

@@ -5,7 +5,7 @@ MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH invalid_amount flag_invalid_amount 1
+CATCH invalid_amount 17 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64

services/registration/balances.vis

@@ -1,4 +1,4 @@
-LOAD reset_account_authorized 0
+LOAD reset_unlocked 0
 MOUT my_balance 1
 MOUT community_balance 2
 MOUT back 0

services/registration/community_balance.vis

@@ -1,5 +1,5 @@
 LOAD reset_incorrect 0
-CATCH incorrect_pin flag_incorrect_pin 1
+CATCH incorrect_pin 15 1
-CATCH pin_entry flag_account_authorized 0
+CATCH pin_entry 12 0
 LOAD quit_with_balance 0
 HALT

services/registration/create_pin.vis

@@ -1,9 +1,9 @@
 LOAD create_account 0
-CATCH account_creation_failed flag_account_creation_failed 1
+CATCH account_creation_failed 22 1
 MOUT exit 0
 HALT
 LOAD save_pin 0
 RELOAD save_pin
-CATCH . flag_incorrect_pin 1
+CATCH . 15 1
 INCMP quit 0
 INCMP confirm_create_pin *

services/registration/enter_location.vis

@@ -1,9 +1,12 @@
-CATCH incorrect_date_format flag_incorrect_date_format 1
+CATCH incorrect_date_format 21 1
 LOAD save_yob 0
-CATCH update_success flag_allow_update 1
+CATCH update_success 16 1
 MOUT back 0
 HALT
 INCMP _ 0
 LOAD save_location 0
-CATCH pin_entry flag_single_edit 1
+CATCH pin_entry 23 1
 INCMP enter_offerings *
+
+
+

services/registration/enter_offerings.vis

@@ -1,6 +1,6 @@
 LOAD save_location 0
-CATCH incorrect_pin flag_incorrect_pin 1
+CATCH incorrect_pin 15 1
-CATCH update_success flag_allow_update 1
+CATCH update_success 16 1
 MOUT back 0
 HALT
 LOAD save_offerings 0

services/registration/enter_yob.vis

@@ -1,9 +1,9 @@
 LOAD save_gender 0
-CATCH update_success flag_allow_update 1
+CATCH update_success 16 1
 MOUT back 0
 HALT
 INCMP _ 0
 LOAD verify_yob 8
 LOAD save_yob 0
-CATCH pin_entry flag_single_edit 1
+CATCH pin_entry 23 1
 INCMP enter_location *

services/registration/my_balance.vis

@@ -1,5 +1,5 @@
 LOAD reset_incorrect 0
-CATCH incorrect_pin flag_incorrect_pin 1
+CATCH incorrect_pin 15 1
-CATCH pin_entry flag_account_authorized 0
+CATCH pin_entry 12 0
 LOAD quit_with_balance 0
 HALT

services/registration/pp.csv

@@ -1,16 +0,0 @@
-flag,flag_language_set,8,checks whether the user has set their prefered language
-flag,flag_account_created,9,this is set when an account has been created on the API
-flag,flag_account_creation_failed,10,this is set when there's an error from the API during account creation
-flag,flag_account_pending,11,this is set when an account does not have a status of SUCCESS
-flag,flag_account_success,12,this is set when an account has a status of SUCCESS
-flag,flag_pin_mismatch,13,this is set when the confirmation PIN matches the initial PIN during registration
-flag,flag_pin_set,14,this is set when a newly registered user sets a PIN. This must be present for an account to access the main menu
-flag,flag_account_authorized,15,this is set to allow a user access guarded nodes after providing a correct PIN
-flag,flag_invalid_recipient,16,this is set when the transaction recipient is invalid
-flag,flag_invalid_recipient_with_invite,17,this is set when the transaction recipient is valid but not on the platform
-flag,flag_invalid_amount,18,this is set when the given transaction amount is invalid
-flag,flag_incorrect_pin,19,this is set when the provided PIN is invalid or does not match the current account's PIN
-flag,flag_valid_pin,20,this is set when the given PIN is valid
-flag,flag_allow_update,21,this is set to allow a user to update their profile data
-flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
-flag,flag_incorrect_date_format,23,this is set when the given year of birth is invalid

services/registration/root.vis

@@ -1,7 +1,7 @@
-CATCH select_language flag_language_set 0
+CATCH select_language 8 0
-CATCH terms flag_account_created 0
+CATCH terms 9 0
 LOAD check_account_status 0
-CATCH account_pending flag_account_pending 1
+CATCH account_pending 10 1
-CATCH create_pin flag_pin_set 0
+CATCH create_pin 18 0
-CATCH main flag_account_success 1
+CATCH main 11 1
 HALT

services/registration/select_gender.vis

@@ -1,12 +1,12 @@
 LOAD save_familyname 0
-CATCH update_success flag_allow_update 1
+CATCH update_success 16 1
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
 MOUT back 0
 HALT
 LOAD save_gender 0
-CATCH pin_entry flag_single_edit 1
+CATCH pin_entry 23 1
 INCMP _ 0
 INCMP enter_yob 1
 INCMP enter_yob 2

services/registration/send.vis

@@ -3,6 +3,6 @@ MOUT back 0
 HALT
 LOAD validate_recipient 20
 RELOAD validate_recipient
-CATCH invalid_recipient flag_invalid_recipient 1
+CATCH invalid_recipient 13 1
 INCMP _ 0
 INCMP amount *

services/registration/transaction_initiated.vis

@@ -1,6 +1,4 @@
-LOAD reset_incorrect 6
+LOAD reset_incorrect 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH _ flag_account_authorized 0
 LOAD get_amount 10
 MAP get_amount
 RELOAD get_recipient

services/registration/transaction_pin.vis

@@ -1,4 +1,3 @@
-LOAD authorize_account 6
 MAP validate_amount
 RELOAD get_recipient
 MAP get_recipient
@@ -7,9 +6,10 @@ MAP get_sender
 MOUT back 0
 MOUT quit 9
 HALT
+LOAD authorize_account 1
 RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
+CATCH incorrect_pin 15 1
-CATCH transaction_initiated flag_account_authorized 1
 INCMP _ 0
 INCMP quit 9
+MOVE transaction_initiated
 

services/registration/view_profile.vis

@@ -1,8 +1,8 @@
 LOAD get_profile_info 0
 MAP get_profile_info 
-LOAD reset_incorrect 6
+LOAD reset_incorrect 0
-CATCH incorrect_pin flag_incorrect_pin 1
+CATCH incorrect_pin 15 1
-CATCH pin_entry flag_account_authorized 0
+CATCH pin_entry 12 0
 MOUT back 0
 HALT
 INCMP _ 0