clean up

Reviewed-on: #77

.gitignore

@@ -4,3 +4,5 @@ go.work*
 **/*/*.bin
 **/*/.state/
 cmd/.state/
+id_*
+*.gdbm

cmd/africastalking/main.go

@@ -12,27 +12,23 @@ import (
 	"strings"
 	"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/logging"
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
+	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
-	logg = logging.NewVanilla()
+	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
 )
 
-type atRequestParser struct {}
+type atRequestParser struct{}
 
-func(arp *atRequestParser) GetSessionId(rq any) (string, error) {
+func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
 		return "", handlers.ErrInvalidRequest
@@ -49,7 +45,7 @@ func(arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	return phoneNumber, nil
 }
 
-func(arp *atRequestParser) GetInput(rq any) ([]byte, error) {
+func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
 		return nil, handlers.ErrInvalidRequest
@@ -68,148 +64,50 @@ func(arp *atRequestParser) GetInput(rq any) ([]byte, error) {
 	return []byte(parts[len(parts)-1]), nil
 }
 
-
-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("set_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)
-	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
-	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
-	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
-
-	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(&engineDebug, "d", 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)
+	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)
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = ensureDbDir(dbDir)
+	err = menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore := getUserdataDb(dbDir, ctx)
+	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -221,13 +119,21 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := getHandler(flagParser, dbResource, userdataStore)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs.SetDataStore(&userdataStore)
+
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	stateStore, err := getStateStore(dbDir, ctx)
+	hl, err := lhs.GetHandler()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	stateStore, err := menuStorageService.GetStateStore(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -238,7 +144,7 @@ func main() {
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	sh := httpserver.NewATSessionHandler(bsh)
 	s := &http.Server{
-		Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
+		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,
 	}
 	s.RegisterOnShutdown(sh.Shutdown)

cmd/async/main.go

@@ -9,179 +9,78 @@ import (
 	"path"
 	"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.defalsify.org/vise.git/resource"
 
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
-	logg = logging.NewVanilla()
+	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
 )
 
 type asyncRequestParser struct {
 	sessionId string
-	input []byte
+	input     []byte
 }
 
-func(p *asyncRequestParser) GetSessionId(r any) (string, error) {
+func (p *asyncRequestParser) GetSessionId(r any) (string, error) {
 	return p.sessionId, nil
 }
 
-func(p *asyncRequestParser) GetInput(r any) ([]byte, error) {
+func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
 	return p.input, nil
 }
 
-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("set_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)
-	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
-	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
-	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
-
-	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 sessionId string
 	var dbDir string
 	var resourceDir string
 	var size uint
 	var engineDebug bool
-	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	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(&engineDebug, "d", 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, "sessionId", sessionId)
+	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
 
 	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)
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = ensureDbDir(dbDir)
+	err = menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore := getUserdataDb(dbDir, ctx)
+	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -193,13 +92,16 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := getHandler(flagParser, dbResource, userdataStore)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs.SetDataStore(&userdataStore)
+
+	hl, err := lhs.GetHandler()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	stateStore, err := getStateStore(dbDir, ctx)
+	stateStore, err := menuStorageService.GetStateStore(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -212,7 +114,7 @@ func main() {
 	sh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	cfg.SessionId = sessionId
 	rqs := handlers.RequestSession{
-		Ctx: ctx,
+		Ctx:    ctx,
 		Writer: os.Stdout,
 		Config: cfg,
 	}
@@ -232,23 +134,27 @@ func main() {
 	for true {
 		rqs, err = sh.Process(rqs)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "error in process: %v", "err", err)
 			fmt.Errorf("error in process: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Output(rqs)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "error in output: %v", "err", err)
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Reset(rqs)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)
 			os.Exit(1)
 		}
 		fmt.Println("")
 		_, err = fmt.Scanln(&rqs.Input)
 		if err != nil {
-		fmt.Errorf("error in input: %v", err)
+			logg.ErrorCtxf(ctx, "error in input", "err", err)
+			fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}
 	}

cmd/http/main.go

@@ -11,165 +11,64 @@ import (
 	"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.defalsify.org/vise.git/resource"
 
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
+	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
-	logg = logging.NewVanilla()
+	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("set_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)
-	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
-	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
-	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
-
-	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(&engineDebug, "d", 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)
+	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)
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = ensureDbDir(dbDir)
+	err = menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore := getUserdataDb(dbDir, ctx)
+	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -181,13 +80,21 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := getHandler(flagParser, dbResource, userdataStore)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs.SetDataStore(&userdataStore)
+
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	stateStore, err := getStateStore(dbDir, ctx)
+	hl, err := lhs.GetHandler()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	stateStore, err := menuStorageService.GetStateStore(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -198,7 +105,7 @@ func main() {
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	sh := httpserver.ToSessionHandler(bsh)
 	s := &http.Server{
-		Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
+		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,
 	}
 	s.RegisterOnShutdown(sh.Shutdown)

cmd/main.go

@@ -7,15 +7,11 @@ import (
 	"os"
 	"path"
 
-	"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/logging"
-	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
+	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
@@ -23,114 +19,14 @@ var (
 	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("set_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)
-	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
-	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
-	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
-
-	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 size uint
 	var sessionId string
-	var debug bool
+	var engineDebug bool
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.BoolVar(&debug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.Parse()
 
@@ -139,11 +35,6 @@ func main() {
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 	pfp := path.Join(scriptDir, "pp.csv")
-	flagParser, err := getParser(pfp, true)
-
-	if err != nil {
-		os.Exit(1)
-	}
 
 	cfg := engine.Config{
 		Root:       "root",
@@ -152,19 +43,28 @@ func main() {
 		FlagCount:  uint32(16),
 	}
 
-	rs, err := getResource(scriptDir, ctx)
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+
+	err := menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	pe, err := getPersister(dbDir, ctx)
+	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	store := getUserdataDb(dbDir, ctx)
+	pe, err := menuStorageService.GetPersister(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	userdatastore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -176,25 +76,28 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := getHandler(flagParser, dbResource, pe, store)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs.SetDataStore(&userdatastore)
+	lhs.SetPersister(pe)
+
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	en := getEngine(cfg, rs, pe)
+	hl, err := lhs.GetHandler()
-	en = en.WithFirst(hl.Init)
-	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)
+		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = engine.Loop(ctx, en, os.Stdin, os.Stdout)
+	en := lhs.GetEngine()
+	en = en.WithFirst(hl.Init)
+	if engineDebug {
+		en = en.WithDebug(nil)
+	}
+
+	err = engine.Loop(ctx, en, os.Stdin, os.Stdout, nil)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)
 		os.Exit(1)

go.mod

@@ -3,7 +3,7 @@ module git.grassecon.net/urdt/ussd
 go 1.22.6
 
 require (
-	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f
+	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/peteole/testdata-loader v0.3.0
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1

go.sum

@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f h1:CuJvG3NyMoRtHUim4aZdrfjjJBg2AId7z0yp7Q97bRM=
+git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb h1:6P4kxihcwMjDKzvUFC6t2zGNb7MDW+l/ACGlSAN1N8Y=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
+git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb/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=

internal/handlers/base.go

@@ -46,7 +46,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	var err error
 	var ok bool
 	
-	logg.InfoCtxf(rqs.Ctx, "new request",  rqs)
+	logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
 
 	rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
 	if err != nil {
@@ -71,19 +71,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	}
 	rqs.Engine = en
 
-	r, err = rqs.Engine.Init(rqs.Ctx)
+	r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
-	if err != nil {
-		perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
-		rqs.Storage = nil
-		if perr != nil {
-			logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
-		}
-		return rqs, err
-	}
-
-	if r && len(rqs.Input) > 0 {
-		r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
-	}
 	if err != nil {
 		perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
 		rqs.Storage = nil
@@ -99,7 +87,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 
 func(f *BaseSessionHandler) Output(rqs RequestSession) (RequestSession,  error) {
 	var err error
-	_, err = rqs.Engine.WriteResult(rqs.Ctx, rqs.Writer)
+	_, err = rqs.Engine.Flush(rqs.Ctx, rqs.Writer)
 	return rqs, err
 }
 

internal/handlers/handlerservice.go

@@ -0,0 +1,105 @@
+package handlers
+
+import (
+	"git.defalsify.org/vise.git/asm"
+	"git.defalsify.org/vise.git/db"
+	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/persist"
+	"git.defalsify.org/vise.git/resource"
+	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
+)
+
+type HandlerService interface {
+	GetHandler() (*ussd.Handlers, error)
+}
+
+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
+}
+
+type LocalHandlerService struct {
+	Parser        *asm.FlagParser
+	DbRs          *resource.DbResource
+	Pe            *persist.Persister
+	UserdataStore *db.Db
+	Cfg           engine.Config
+	Rs            resource.Resource
+}
+
+func NewLocalHandlerService(fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
+	parser, err := getParser(fp, debug)
+	if err != nil {
+		return nil, err
+	}
+	return &LocalHandlerService{
+		Parser: parser,
+		DbRs:   dbResource,
+		Cfg:    cfg,
+		Rs:     rs,
+	}, nil
+}
+
+func (ls *LocalHandlerService) SetPersister(Pe *persist.Persister) {
+	ls.Pe = Pe
+}
+
+func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
+	ls.UserdataStore = db
+}
+
+func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore)
+	if err != nil {
+		return nil, err
+	}
+	ussdHandlers = ussdHandlers.WithPersister(ls.Pe)
+	ls.DbRs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
+	ls.DbRs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
+	ls.DbRs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	ls.DbRs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
+	ls.DbRs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
+	ls.DbRs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
+	ls.DbRs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
+	ls.DbRs.AddLocalFunc("quit", ussdHandlers.Quit)
+	ls.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
+	ls.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
+	ls.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
+	ls.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
+	ls.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
+	ls.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
+	ls.DbRs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
+	ls.DbRs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
+	ls.DbRs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
+	ls.DbRs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
+	ls.DbRs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
+	ls.DbRs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
+	ls.DbRs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
+	ls.DbRs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
+	ls.DbRs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
+	ls.DbRs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
+	ls.DbRs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
+	ls.DbRs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
+	ls.DbRs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
+	ls.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
+	ls.DbRs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
+	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
+	ls.DbRs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	ls.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	ls.DbRs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	ls.DbRs.AddLocalFunc("quit_with_help", ussdHandlers.QuitWithHelp)
+
+	return ussdHandlers, nil
+}
+
+// TODO: enable setting of sessionId on engine init time
+func (ls *LocalHandlerService) GetEngine() *engine.DefaultEngine {
+	en := engine.NewEngine(ls.Cfg, ls.Rs)
+	en = en.WithPersister(ls.Pe)
+	return en
+}

internal/handlers/single.go

@@ -37,8 +37,6 @@ type RequestSession struct {
 	Continue bool
 }
 
-type engineMaker func(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine
-
 // TODO: seems like can remove this.
 type RequestParser interface {
 	GetSessionId(rq any) (string, error)

internal/handlers/ussd/menuhandler.go

@@ -117,17 +117,14 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
 func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 
-	sym, _ = h.st.Where()
+	symbol, _ := h.st.Where()
+	code := strings.Split(symbol, "_")[1]
 
-	switch sym {
+	if !utils.IsValidISO639(code) {
-	case "set_default":
+		return res, nil
-		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
-		res.Content = "eng"
-	case "set_swa":
-		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
-		res.Content = "swa"
-	default:
 	}
+	res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
+	res.Content = code
 
 	languageSetFlag, err := h.flagManager.GetFlag("flag_language_set")
 	if err != nil {
@@ -279,32 +276,6 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	return res, nil
 }
 
-// SetResetSingleEdit sets and resets  flags to allow gradual editing of profile information.
-func (h *Handlers) SetResetSingleEdit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-
-	menuOption := string(input)
-
-	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
-	flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
-
-	switch menuOption {
-	case "2":
-		res.FlagReset = append(res.FlagReset, flag_allow_update)
-		res.FlagSet = append(res.FlagSet, flag_single_edit)
-	case "3":
-		res.FlagReset = append(res.FlagReset, flag_allow_update)
-		res.FlagSet = append(res.FlagSet, flag_single_edit)
-	case "4":
-		res.FlagReset = append(res.FlagReset, flag_allow_update)
-		res.FlagSet = append(res.FlagSet, flag_single_edit)
-	default:
-		res.FlagReset = append(res.FlagReset, flag_single_edit)
-	}
-
-	return res, nil
-}
-
 // VerifyPin checks whether the confirmation PIN is similar to the account PIN
 // If similar, it sets the USERFLAG_PIN_SET flag allowing the user
 // to access the main menu
@@ -356,7 +327,6 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) > 0 {
 		firstName := string(input)
 		store := h.userdataStore
@@ -436,6 +406,7 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 
 // SaveGender updates the gender in the gdbm with the provided input.
 func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	symbol, _ := h.st.Where()
 	var res resource.Result
 	var err error
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -443,21 +414,11 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 		return res, fmt.Errorf("missing session")
 	}
 
-	if len(input) > 0 {
+	gender := strings.Split(symbol, "_")[1]
-		gender := string(input)
+	store := h.userdataStore
-		switch gender {
+	err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
-		case "1":
+	if err != nil {
-			gender = "Male"
+		return res, nil
-		case "2":
-			gender = "Female"
-		case "3":
-			gender = "Unspecified"
-		}
-		store := h.userdataStore
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
-		if err != nil {
-			return res, nil
-		}
 	}
 
 	return res, nil
@@ -640,7 +601,6 @@ func (h *Handlers) QuitWithHelp(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }
 
-
 // VerifyYob verifies the length of the given input
 func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result

internal/handlers/ussd/menuhandler_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"git.defalsify.org/vise.git/db"
+	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
 	"git.grassecon.net/urdt/ussd/internal/mocks"
@@ -16,6 +17,7 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/utils"
 	"github.com/alecthomas/assert/v2"
 	testdataloader "github.com/peteole/testdata-loader"
+	"github.com/stretchr/testify/require"
 )
 
 var (
@@ -94,6 +96,25 @@ func TestCreateAccount(t *testing.T) {
 	mockDataStore.AssertExpectations(t)
 }
 
+func TestWithPersister(t *testing.T) {
+	// Test case: Setting a persister
+	h := &Handlers{}
+	p := &persist.Persister{}
+
+	result := h.WithPersister(p)
+
+	assert.Equal(t, p, h.pe, "The persister should be set correctly.")
+	assert.Equal(t, h, result, "The returned handler should be the same instance.")
+}
+
+func TestWithPersister_PanicWhenAlreadySet(t *testing.T) {
+	// Test case: Panic on multiple calls
+	h := &Handlers{pe: &persist.Persister{}}
+	require.Panics(t, func() {
+		h.WithPersister(&persist.Persister{})
+	}, "Should panic when trying to set a persister again.")
+}
+
 func TestSaveFirstname(t *testing.T) {
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)
@@ -295,6 +316,7 @@ func TestSaveOfferings(t *testing.T) {
 func TestSaveGender(t *testing.T) {
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)
+	mockState := state.NewState(16)
 
 	// Define the session ID and context
 	sessionId := "session123"
@@ -302,34 +324,32 @@ func TestSaveGender(t *testing.T) {
 
 	// Define test cases
 	tests := []struct {
-		name           string
+		name            string
-		input          []byte
+		input           []byte
-		expectedGender string
+		expectedGender  string
-		expectCall     bool
+		expectCall      bool
+		executingSymbol string
 	}{
 		{
-			name:           "Valid Male Input",
+			name:            "Valid Male Input",
-			input:          []byte("1"),
+			input:           []byte("1"),
-			expectedGender: "Male",
+			expectedGender:  "male",
-			expectCall:     true,
+			executingSymbol: "set_male",
+			expectCall:      true,
 		},
 		{
-			name:           "Valid Female Input",
+			name:            "Valid Female Input",
-			input:          []byte("2"),
+			input:           []byte("2"),
-			expectedGender: "Female",
+			expectedGender:  "female",
-			expectCall:     true,
+			executingSymbol: "set_female",
+			expectCall:      true,
 		},
 		{
-			name:           "Valid Unspecified Input",
+			name:            "Valid Unspecified Input",
-			input:          []byte("3"),
+			input:           []byte("3"),
-			expectedGender: "Unspecified",
+			executingSymbol: "set_unspecified",
-			expectCall:     true,
+			expectedGender:  "unspecified",
-		},
+			expectCall:      true,
-		{
-			name:           "Empty Input",
-			input:          []byte(""),
-			expectedGender: "",
-			expectCall:     false,
 		},
 	}
 
@@ -342,14 +362,15 @@ func TestSaveGender(t *testing.T) {
 			} else {
 				mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_GENDER, []byte(tt.expectedGender)).Return(nil)
 			}
-
+			mockState.ExecPath = append(mockState.ExecPath, tt.executingSymbol)
 			// Create the Handlers instance with the mock store
 			h := &Handlers{
 				userdataStore: mockStore,
+				st:            mockState,
 			}
 
 			// Call the method
-			_, err := h.SaveGender(ctx, "someSym", tt.input)
+			_, err := h.SaveGender(ctx, "save_gender", tt.input)
 
 			// Assert no error
 			assert.NoError(t, err)
@@ -538,13 +559,13 @@ func TestSetLanguage(t *testing.T) {
 	}
 	// Define test cases
 	tests := []struct {
-		name                string
+		name           string
-		execPath            []string
+		execPath       []string
-		expectedResult      resource.Result
+		expectedResult resource.Result
 	}{
 		{
 			name:     "Set Default Language (English)",
-			execPath: []string{"set_default"},
+			execPath: []string{"set_eng"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "eng",
@@ -558,13 +579,6 @@ func TestSetLanguage(t *testing.T) {
 				Content: "swa",
 			},
 		},
-		{
-			name:     "Unhandled path",
-			execPath: []string{""},
-			expectedResult: resource.Result{
-				FlagSet: []uint32{8},
-			},
-		},
 	}
 
 	for _, tt := range tests {
@@ -592,76 +606,6 @@ func TestSetLanguage(t *testing.T) {
 		})
 	}
 }
-
-func TestSetResetSingleEdit(t *testing.T) {
-	fm, err := NewFlagManager(flagsPath)
-
-	flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
-	flag_single_edit, _ := fm.parser.GetFlag("flag_single_edit")
-
-	if err != nil {
-		log.Fatal(err)
-	}
-	// Define test cases
-	tests := []struct {
-		name           string
-		input          []byte
-		expectedResult resource.Result
-	}{
-		{
-			name:  "Set single Edit",
-			input: []byte("2"),
-			expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_single_edit},
-				FlagReset: []uint32{flag_allow_update},
-			},
-		},
-		{
-			name:  "Set single Edit",
-			input: []byte("3"),
-			expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_single_edit},
-				FlagReset: []uint32{flag_allow_update},
-			},
-		},
-		{
-			name:  "Set single edit",
-			input: []byte("4"),
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_allow_update},
-				FlagSet:   []uint32{flag_single_edit},
-			},
-		},
-		{
-			name:  "No single edit set",
-			input: []byte("1"),
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_single_edit},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-
-			// Create the Handlers instance with the mock flag manager
-			h := &Handlers{
-				flagManager: fm.parser,
-			}
-
-			// Call the method
-			res, err := h.SetResetSingleEdit(context.Background(), "set_reset_single_edit", tt.input)
-
-			if err != nil {
-				t.Error(err)
-			}
-			// Assert that the Result FlagSet has the required flags after language switch
-			assert.Equal(t, res, tt.expectedResult, "Flags should match reset edit")
-
-		})
-	}
-}
-
 func TestResetAllowUpdate(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
 
@@ -1480,7 +1424,7 @@ func TestValidateAmount(t *testing.T) {
 	if err != nil {
 		t.Logf(err.Error())
 	}
-	//flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
+	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)
 
@@ -1509,26 +1453,26 @@ func TestValidateAmount(t *testing.T) {
 				Content: "0.001",
 			},
 		},
-		// {
+		{
-		// 	name:      "Test with amount larger than balance",
+			name:      "Test with amount larger than balance",
-		// 	input:     []byte("0.02"),
+			input:     []byte("0.02"),
-		// 	balance:   "0.003 CELO",
+			balance:   "0.003 CELO",
-		// 	publicKey: []byte("0xrqeqrequuq"),
+			publicKey: []byte("0xrqeqrequuq"),
-		// 	expectedResult: resource.Result{
+			expectedResult: resource.Result{
-		// 		FlagSet: []uint32{flag_invalid_amount},
+				FlagSet: []uint32{flag_invalid_amount},
-		// 		Content: "0.02",
+				Content: "0.02",
-		// 	},
+			},
-		// },
+		},
-		// {
+		{
-		// 	name:      "Test with invalid amount",
+			name:      "Test with invalid amount",
-		// 	input:     []byte("0.02ms"),
+			input:     []byte("0.02ms"),
-		// 	balance:   "0.003 CELO",
+			balance:   "0.003 CELO",
-		// 	publicKey: []byte("0xrqeqrequuq"),
+			publicKey: []byte("0xrqeqrequuq"),
-		// 	expectedResult: resource.Result{
+			expectedResult: resource.Result{
-		// 		FlagSet: []uint32{flag_invalid_amount},
+				FlagSet: []uint32{flag_invalid_amount},
-		// 		Content: "0.02ms",
+				Content: "0.02ms",
-		// 	},
+			},
-		// },
+		},
 	}
 
 	for _, tt := range tests {
@@ -1536,7 +1480,7 @@ func TestValidateAmount(t *testing.T) {
 
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.publicKey, nil)
 			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balance, nil)
-			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_AMOUNT, tt.input).Return(nil)
+			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_AMOUNT, tt.input).Return(nil).Maybe()
 
 			// Call the method under test
 			res, _ := h.ValidateAmount(ctx, "test_validate_amount", tt.input)
@@ -1648,6 +1592,7 @@ func TestGetProfile(t *testing.T) {
 
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)
+
 	h := &Handlers{
 		userdataStore:  mockDataStore,
 		accountService: mockCreateAccountService,

internal/http/at_session_handler.go

@@ -87,6 +87,6 @@ func (ash *ATSessionHandler) Output(rqs handlers.RequestSession) (handlers.Reque
 		return rqs, err
 	}
 
-	_, err = rqs.Engine.WriteResult(rqs.Ctx, rqs.Writer)
+	_, err = rqs.Engine.Flush(rqs.Ctx, rqs.Writer)
 	return rqs, err
 }

internal/http/http_test.go

@@ -69,7 +69,7 @@ func TestATSessionHandler_ServeHTTP(t *testing.T) {
 				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
 				mh.OutputFunc = func(rs handlers.RequestSession) (handlers.RequestSession, error) { return rs, nil }
 				mh.ResetFunc = func(rs handlers.RequestSession) (handlers.RequestSession, error) { return rs, nil }
-				me.WriteResultFunc = func(context.Context, io.Writer) (int, error) { return 0, nil }
+				me.FlushFunc = func(context.Context, io.Writer) (int, error) { return 0, nil }
 			},
 			formData: url.Values{
 				"phoneNumber": []string{"+1234567890"},
@@ -178,7 +178,7 @@ func TestATSessionHandler_Output(t *testing.T) {
 			input: handlers.RequestSession{
 				Continue: true,
 				Engine: &httpmocks.MockEngine{
-					WriteResultFunc: func(context.Context, io.Writer) (int, error) {
+					FlushFunc: func(context.Context, io.Writer) (int, error) {
 						return 0, nil
 					},
 				},
@@ -192,7 +192,7 @@ func TestATSessionHandler_Output(t *testing.T) {
 			input: handlers.RequestSession{
 				Continue: false,
 				Engine: &httpmocks.MockEngine{
-					WriteResultFunc: func(context.Context, io.Writer) (int, error) {
+					FlushFunc: func(context.Context, io.Writer) (int, error) {
 						return 0, nil
 					},
 				},
@@ -202,11 +202,11 @@ func TestATSessionHandler_Output(t *testing.T) {
 			expectedError:  false,
 		},
 		{
-			name: "WriteResult error",
+			name: "Flush error",
 			input: handlers.RequestSession{
 				Continue: true,
 				Engine: &httpmocks.MockEngine{
-					WriteResultFunc: func(context.Context, io.Writer) (int, error) {
+					FlushFunc: func(context.Context, io.Writer) (int, error) {
 						return 0, errors.New("write error")
 					},
 				},

internal/mocks/httpmocks/enginemock.go

@@ -7,10 +7,10 @@ import (
 
 // MockEngine implements the engine.Engine interface for testing
 type MockEngine struct {
-	InitFunc        func(context.Context) (bool, error)
+	InitFunc   func(context.Context) (bool, error)
-	ExecFunc        func(context.Context, []byte) (bool, error)
+	ExecFunc   func(context.Context, []byte) (bool, error)
-	WriteResultFunc func(context.Context, io.Writer) (int, error)
+	FlushFunc  func(context.Context, io.Writer) (int, error)
-	FinishFunc      func() error
+	FinishFunc func() error
 }
 
 func (m *MockEngine) Init(ctx context.Context) (bool, error) {
@@ -21,8 +21,8 @@ func (m *MockEngine) Exec(ctx context.Context, input []byte) (bool, error) {
 	return m.ExecFunc(ctx, input)
 }
 
-func (m *MockEngine) WriteResult(ctx context.Context, w io.Writer) (int, error) {
+func (m *MockEngine) Flush(ctx context.Context, w io.Writer) (int, error) {
-	return m.WriteResultFunc(ctx, w)
+	return m.FlushFunc(ctx, w)
 }
 
 func (m *MockEngine) Finish() error {

internal/storage/gdbm.go

@@ -0,0 +1,115 @@
+package storage
+
+import (
+	"context"
+
+	"git.defalsify.org/vise.git/db"
+	"git.defalsify.org/vise.git/lang"
+	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
+)
+
+var (
+	dbC map[string]chan db.Db
+)
+
+type ThreadGdbmDb struct {
+	db db.Db
+	connStr string
+}
+
+func NewThreadGdbmDb() *ThreadGdbmDb {
+	if dbC == nil {
+		dbC = make(map[string]chan db.Db)
+	}
+	return &ThreadGdbmDb{}
+}
+
+func(tdb *ThreadGdbmDb) Connect(ctx context.Context, connStr string) error {
+	var ok bool
+	_, ok = dbC[connStr]
+	if ok {
+		logg.WarnCtxf(ctx, "already registered thread gdbm, skipping", "connStr", connStr)
+		return nil
+	}
+	gdb := gdbmdb.NewGdbmDb()
+	err := gdb.Connect(ctx, connStr)
+	if err != nil {
+		return err
+	}
+	dbC[connStr] = make(chan db.Db, 1)
+	dbC[connStr]<- gdb
+	tdb.connStr = connStr
+	return nil
+}
+
+func(tdb *ThreadGdbmDb) reserve() {
+	if tdb.db == nil {
+		tdb.db = <-dbC[tdb.connStr]
+	}
+}
+
+func(tdb *ThreadGdbmDb) release() {
+	if tdb.db == nil {
+		return
+	}
+	dbC[tdb.connStr] <- tdb.db
+	tdb.db = nil
+}
+
+func(tdb *ThreadGdbmDb) SetPrefix(pfx uint8) {
+	tdb.reserve()
+	tdb.db.SetPrefix(pfx)
+}
+
+func(tdb *ThreadGdbmDb) SetSession(sessionId string) {
+	tdb.reserve()
+	tdb.db.SetSession(sessionId)
+}
+
+func(tdb *ThreadGdbmDb) SetLanguage(lng *lang.Language) {
+	tdb.reserve()
+	tdb.db.SetLanguage(lng)
+}
+
+func(tdb *ThreadGdbmDb) Safe() bool {
+	tdb.reserve()
+	v := tdb.db.Safe()
+	tdb.release()
+	return v
+}
+
+func(tdb *ThreadGdbmDb) Prefix() uint8 {
+	tdb.reserve()
+	v := tdb.db.Prefix()
+	tdb.release()
+	return v
+}
+
+func(tdb *ThreadGdbmDb) SetLock(typ uint8, locked bool) error {
+	tdb.reserve()
+	err := tdb.db.SetLock(typ, locked)
+	tdb.release()
+	return err
+}
+
+func(tdb *ThreadGdbmDb) Put(ctx context.Context, key []byte, val []byte) error {
+	tdb.reserve()
+	err := tdb.db.Put(ctx, key, val)
+	tdb.release()
+	return err
+}
+
+func(tdb *ThreadGdbmDb) Get(ctx context.Context, key []byte) ([]byte, error) {
+	tdb.reserve()
+	v, err := tdb.db.Get(ctx, key)
+	tdb.release()
+	return v, err
+}
+
+func(tdb *ThreadGdbmDb) Close() error {
+	tdb.reserve()
+	close(dbC[tdb.connStr])
+	err := tdb.db.Close()
+	tdb.db = nil
+	return err
+}

internal/storage/storage.go

@@ -5,6 +5,10 @@ import (
 	"git.defalsify.org/vise.git/persist"
 )
 
+const (
+	DATATYPE_CUSTOM = 128 
+)
+
 type Storage struct {
 	Persister *persist.Persister
 	UserdataDb db.Db	

internal/storage/storageservice.go

@@ -0,0 +1,103 @@
+package storage
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path"
+
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/persist"
+	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/logging"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("storage")
+)	
+
+type StorageService interface {
+	GetPersister(ctx context.Context) (*persist.Persister, error)
+	GetUserdataDb(ctx context.Context) db.Db
+	GetResource(ctx context.Context) (resource.Resource, error)
+	EnsureDbDir() error
+}
+
+type MenuStorageService struct{
+	dbDir string
+	resourceDir string
+	resourceStore db.Db
+	stateStore db.Db
+	userDataStore db.Db
+}
+
+func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {
+	return &MenuStorageService{
+		dbDir: dbDir,
+		resourceDir: resourceDir,
+	}
+}
+
+func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
+	ms.stateStore = NewThreadGdbmDb()
+	storeFile := path.Join(ms.dbDir, "state.gdbm")
+	err := ms.stateStore.Connect(ctx, storeFile)
+	if err != nil {
+		return nil, err
+	}
+	pr := persist.NewPersister(ms.stateStore)
+	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", ms.stateStore)
+	return pr, nil
+}
+
+func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
+	ms.userDataStore = NewThreadGdbmDb()
+	storeFile := path.Join(ms.dbDir, "userdata.gdbm")
+	err := ms.userDataStore.Connect(ctx, storeFile)
+	if err != nil {
+		return nil, err
+	}
+	return ms.userDataStore, nil
+}
+
+func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resource, error) {
+	ms.resourceStore = fsdb.NewFsDb()
+	err := ms.resourceStore.Connect(ctx, ms.resourceDir)
+	if err != nil {
+		return nil, err
+	}
+	rfs := resource.NewDbResource(ms.resourceStore)
+	return rfs, nil
+}
+
+func (ms *MenuStorageService) GetStateStore(ctx context.Context) (db.Db, error) {
+	if ms.stateStore != nil {
+		panic("set up store when already exists")
+	}
+	ms.stateStore = NewThreadGdbmDb()
+	storeFile := path.Join(ms.dbDir, "state.gdbm")
+	err := ms.stateStore.Connect(ctx, storeFile)
+	if err != nil {
+		return nil, err
+	}
+	return ms.stateStore, nil
+}
+
+func (ms *MenuStorageService) EnsureDbDir() error {
+	err := os.MkdirAll(ms.dbDir, 0700)
+	if err != nil {
+		return fmt.Errorf("state dir create exited with error: %v\n", err)
+	}
+	return nil
+}
+
+func (ms *MenuStorageService) Close() error {
+	errA := ms.stateStore.Close()
+	errB := ms.userDataStore.Close()
+	errC := ms.resourceStore.Close()
+	if errA != nil || errB != nil || errC != nil {
+		return fmt.Errorf("%v %v %v", errA, errB, errC)
+	}
+	return nil
+}

internal/utils/isocode.go

@@ -0,0 +1,11 @@
+package utils
+
+var isoCodes = map[string]bool{
+	"eng": true, // English
+	"swa": true, // Swahili
+
+}
+
+func IsValidISO639(code string) bool {
+	return isoCodes[code]
+}

services/registration/_catch

@@ -0,0 +1 @@
+Something went wrong.Please try again

services/registration/_catch.vis

@@ -0,0 +1 @@
+HALT

services/registration/amount.vis

@@ -9,4 +9,5 @@ CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64
+LOAD get_amount 12
 INCMP transaction_pin *

services/registration/edit_familyname_menu

@@ -0,0 +1 @@
+Edit family name

services/registration/edit_familyname_menu_swa

@@ -0,0 +1 @@
+Weka jina la familia

services/registration/edit_profile.vis

@@ -2,19 +2,19 @@ LOAD reset_account_authorized 16
 LOAD reset_allow_update 0
 RELOAD reset_allow_update
 MOUT edit_name 1
-MOUT edit_gender 2
+MOUT edit_familyname 2
-MOUT edit_yob 3
+MOUT edit_gender 3
-MOUT edit_location 4
+MOUT edit_yob 4
-MOUT edit_offerings 5
+MOUT edit_location 5
-MOUT view 6
+MOUT edit_offerings 6
+MOUT view 7
 MOUT back 0
 HALT
-INCMP _ 0
+INCMP my_account 0
-LOAD set_reset_single_edit 0
-RELOAD set_reset_single_edit
 INCMP enter_name 1
-INCMP select_gender 2
+INCMP enter_familyname 2
-INCMP enter_yob 3
+INCMP select_gender 3
-INCMP enter_location 4
+INCMP enter_yob 4
-INCMP enter_offerings 5
+INCMP enter_location 5
-INCMP view_profile 6
+INCMP enter_offerings 6
+INCMP view_profile 7

services/registration/enter_familyname.vis

@@ -1,5 +1,9 @@
-LOAD save_firstname 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+LOAD save_familyname 0
+RELOAD save_familyname
 MOUT back 0
 HALT
+RELOAD save_familyname
 INCMP _ 0
-INCMP select_gender *
+INCMP pin_entry *

services/registration/enter_familyname_swa

@@ -0,0 +1 @@
+Weka jina la familia

services/registration/enter_location.vis

@@ -1,9 +1,8 @@
-CATCH incorrect_date_format flag_incorrect_date_format 1
+CATCH incorrect_pin flag_incorrect_pin 1
-LOAD save_yob 0
+CATCH profile_update_success flag_allow_update 1
-CATCH update_success flag_allow_update 1
+LOAD save_location 0
 MOUT back 0
 HALT
+RELOAD save_location
 INCMP _ 0
-LOAD save_location 0
+INCMP pin_entry *
-CATCH pin_entry flag_single_edit 1
-INCMP enter_offerings *

services/registration/enter_name.vis

@@ -1,4 +1,12 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+LOAD save_firstname 0
+RELOAD save_firstname 
 MOUT back 0
 HALT
+RELOAD save_firstname
 INCMP _ 0
-INCMP enter_familyname *
+INCMP pin_entry *
+
+
+

services/registration/enter_offerings.vis

@@ -1,8 +1,8 @@
-LOAD save_location 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_success flag_allow_update 1
+CATCH profile_update_success flag_allow_update 1
+LOAD save_offerings 0
 MOUT back 0
 HALT
-LOAD save_offerings 0
+RELOAD save_offerings
 INCMP _ 0
 INCMP pin_entry *

services/registration/enter_yob.vis

@@ -1,9 +1,10 @@
-LOAD save_gender 0
+CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_success flag_allow_update 1
+CATCH profile_update_success flag_allow_update 1
+LOAD save_yob 0
 MOUT back 0
 HALT
+LOAD verify_yob 0
+CATCH incorrect_date_format flag_incorrect_date_format 1
+RELOAD save_yob
 INCMP _ 0
-LOAD verify_yob 8
+INCMP pin_entry *
-LOAD save_yob 0
-CATCH pin_entry flag_single_edit 1
-INCMP enter_location *

services/registration/my_account.vis

@@ -7,7 +7,7 @@ MOUT pin_options 5
 MOUT my_address 6
 MOUT back 0
 HALT
-INCMP _ 0
+INCMP main 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3

services/registration/profile_update_success

@@ -0,0 +1 @@
+Profile updated successfully

services/registration/profile_update_success.vis

@@ -0,0 +1,5 @@
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP edit_profile 0
+INCMP quit 9

services/registration/profile_update_success_swa

@@ -0,0 +1 @@
+Ombi la Kuweka wasifu limefanikiwa

services/registration/select_gender.vis

@@ -1,13 +1,15 @@
-LOAD save_familyname 0
+CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_success flag_allow_update 1
+CATCH profile_update_success flag_allow_update 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
 INCMP _ 0
-INCMP enter_yob 1
+INCMP set_male 1
-INCMP enter_yob 2
+INCMP set_female 2
-INCMP enter_yob 3
+INCMP set_unspecified 3
+
+
+
+

services/registration/select_language.vis

@@ -1,6 +1,6 @@
 MOUT english 0
 MOUT kiswahili 1
 HALT
-INCMP set_default 0
+INCMP set_eng 0
 INCMP set_swa 1
 INCMP . *

services/registration/set_female.vis

@@ -0,0 +1,4 @@
+LOAD save_gender 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+MOVE pin_entry

services/registration/set_male.vis

@@ -0,0 +1,4 @@
+LOAD save_gender 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+MOVE pin_entry

services/registration/set_unspecified.vis

@@ -0,0 +1,4 @@
+LOAD save_gender 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+MOVE pin_entry

services/registration/transaction_initiated.vis

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

services/registration/transaction_pin

@@ -1,2 +1,2 @@
-{{.get_recipient}} will receive {{.validate_amount}} from {{.get_sender}}
+{{.get_recipient}} will receive {{.get_amount}} from {{.get_sender}}
 Please enter your PIN to confirm:

services/registration/transaction_pin.vis

@@ -1,12 +1,13 @@
-MAP validate_amount
+RELOAD get_amount
+MAP get_amount
 RELOAD get_recipient
 MAP get_recipient
 RELOAD get_sender
 MAP get_sender
 MOUT back 0
 MOUT quit 9
-HALT
 LOAD authorize_account 6
+HALT
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0

services/registration/transaction_pin_swa

@@ -1,2 +1,2 @@
-{{.get_recipient}} atapokea {{.validate_amount}} kutoka kwa {{.get_sender}}
+{{.get_recipient}} atapokea {{.get_amount}} kutoka kwa {{.get_sender}}
 Tafadhali weka PIN yako kudhibitisha: