Merge remote-tracking branch 'remotes/origin/lash/thread-gdbm' into wip-menu-select-fix

Reviewed-on: urdt/ussd#71

cmd/africastalking/main.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 	"syscall"
 
-	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
@@ -65,15 +64,6 @@ 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 main() {
 	var dbDir string
 	var resourceDir string
@@ -95,11 +85,6 @@ func main() {
 
 	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",
@@ -113,21 +98,20 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.MenuStorageService{}
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-
+	rs, err := menuStorageService.GetResource(ctx)
-	rs, err := menuStorageService.GetResource(scriptDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = menuStorageService.EnsureDbDir(dbDir)
+	err = menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore := menuStorageService.GetUserdataDb(dbDir, ctx)
+	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -138,13 +122,9 @@ func main() {
 	if !ok {
 		os.Exit(1)
 	}
-	lhs := handlers.LocalHandlerService{
+
-		Parser:        flagParser,
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-		DbRs:          dbResource,
+	lhs.SetDataStore(&userdataStore)
-		UserdataStore: userdataStore,
-		Cfg:           cfg,
-		Rs:            rs,
-	}
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -157,7 +137,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	stateStore, err := menuStorageService.GetStateStore(dbDir, ctx)
+	stateStore, err := menuStorageService.GetStateStore(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)

cmd/async/main.go

@@ -9,7 +9,6 @@ import (
 	"path"
 	"syscall"
 
-	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
@@ -36,15 +35,6 @@ 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 main() {
 	var sessionId string
 	var dbDir string
@@ -68,11 +58,6 @@ func main() {
 
 	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",
@@ -86,20 +71,20 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.MenuStorageService{}
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-	rs, err := menuStorageService.GetResource(scriptDir, ctx)
+	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = menuStorageService.EnsureDbDir(dbDir)
+	err = menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore := menuStorageService.GetUserdataDb(dbDir, ctx)
+	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -111,13 +96,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs := handlers.LocalHandlerService{
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-		Parser:        flagParser,
+	lhs.SetDataStore(&userdataStore)
-		DbRs:          dbResource,
-		UserdataStore: userdataStore,
-		Cfg:           cfg,
-		Rs:            rs,
-	}
 
 	hl, err := lhs.GetHandler()
 	if err != nil {
@@ -125,7 +105,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	stateStore, err := menuStorageService.GetStateStore(dbDir, ctx)
+	stateStore, err := menuStorageService.GetStateStore(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)

cmd/http/main.go

@@ -11,7 +11,6 @@ import (
 	"strconv"
 	"syscall"
 
-	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
@@ -26,23 +25,6 @@ var (
 	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 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 main() {
 	var dbDir string
 	var resourceDir string
@@ -64,11 +46,6 @@ func main() {
 
 	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",
@@ -82,20 +59,20 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.MenuStorageService{}
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-	rs, err := menuStorageService.GetResource(scriptDir, ctx)
+	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = menuStorageService.EnsureDbDir(dbDir)
+	err = menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore := menuStorageService.GetUserdataDb(dbDir, ctx)
+	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -107,12 +84,12 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs := handlers.LocalHandlerService{
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-		Parser:        flagParser,
+	lhs.SetDataStore(&userdataStore)
-		DbRs:          dbResource,
+
-		UserdataStore: userdataStore,
+	if err != nil {
-		Cfg:           cfg,
+		fmt.Fprintf(os.Stderr, err.Error())
-		Rs:            rs,
+		os.Exit(1)
 	}
 
 	hl, err := lhs.GetHandler()
@@ -121,7 +98,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	stateStore, err := menuStorageService.GetStateStore(dbDir, ctx)
+	stateStore, err := menuStorageService.GetStateStore(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)

cmd/main.go

@@ -43,27 +43,28 @@ func main() {
 		FlagCount:  uint32(16),
 	}
 
-	menuStorageService := storage.MenuStorageService{}
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
 
-	err := menuStorageService.EnsureDbDir(dbDir)
+	err := menuStorageService.EnsureDbDir()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	rs, err := menuStorageService.GetResource(scriptDir, ctx)
+	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	pe, err := menuStorageService.GetPersister(dbDir, ctx)
+	pe, err := menuStorageService.GetPersister(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdatastore := menuStorageService.GetUserdataDb(dbDir, ctx)
+	userdatastore, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -75,7 +76,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, pe, userdatastore, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs.SetDataStore(&userdatastore)
+	lhs.SetPersister(pe)
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -94,13 +97,7 @@ func main() {
 		en = en.WithDebug(nil)
 	}
 
-	_, err = en.Init(ctx)
+	err = engine.Loop(ctx, en, os.Stdin, os.Stdout, nil)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
-		os.Exit(1)
-	}
-
-	err = engine.Loop(ctx, en, os.Stdin, os.Stdout)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)
 		os.Exit(1)

go.mod

@@ -3,12 +3,15 @@ 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.20240922152136-7ea16f9137b4
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/peteole/testdata-loader v0.3.0
+	golang.org/x/crypto v0.17.0
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
 )
 
+require golang.org/x/sys v0.15.0 // indirect
+
 require (
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/repr v0.2.0 // indirect

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.20240922152136-7ea16f9137b4 h1:IMVUK9OkZ/QtYZPHgTZ+XUs5VQ4eIewIaTyVSCF/nAY=
-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.20240922152136-7ea16f9137b4/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=
@@ -28,6 +28,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 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=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=

internal/handlers/base.go

@@ -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

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

@@ -29,11 +29,6 @@ var (
 	translationDir = path.Join(scriptDir, "locale")
 )
 
-type FSData struct {
-	Path string
-	St   *state.State
-}
-
 // FlagManager handles centralized flag management
 type FlagManager struct {
 	parser *asm.FlagParser
@@ -122,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 {
@@ -287,26 +279,11 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 // 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
-
+	flag_single_edit, err := h.flagManager.GetFlag("flag_single_edit")
-	menuOption := string(input)
+	if err != nil {
-
+		return res, err
-	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)
 	}
-
+	res.FlagReset = append(res.FlagReset, flag_single_edit)
 	return res, nil
 }
 
@@ -324,8 +301,6 @@ func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (res
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
-	//AccountPin, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_ACCOUNT_PIN)
 	store := h.userdataStore
 	AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
 	if err != nil {
@@ -362,6 +337,12 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 		return res, fmt.Errorf("missing session")
 	}
 
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
+
+	res.FlagReset = append(res.FlagReset, flag_allow_update)
+	res.FlagSet = append(res.FlagSet, flag_single_edit)
+
 	if len(input) > 0 {
 		firstName := string(input)
 		store := h.userdataStore
@@ -382,7 +363,6 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) > 0 {
 		familyName := string(input)
 		store := h.userdataStore
@@ -405,7 +385,6 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) == 4 {
 		yob := string(input)
 		store := h.userdataStore
@@ -426,7 +405,6 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) > 0 {
 		location := string(input)
 		store := h.userdataStore
@@ -447,16 +425,29 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
+	code := codeFromCtx(ctx)
 	if len(input) > 0 {
 		gender := string(input)
 		switch gender {
 		case "1":
-			gender = "Male"
+			if code == "swa" {
+				gender = "Mwanaume"
+			} else {
+				gender = "Male"
+			}
 		case "2":
-			gender = "Female"
+			if code == "swa" {
+				gender = "Mwanamke"
+			} else {
+				gender = "Female"
+			}
 		case "3":
-			gender = "Unspecified"
+			if code == "swa" {
+				gender = "Haijabainishwa"
+			} else {
+				gender = "Unspecified"
+			}
+
 		}
 		store := h.userdataStore
 		err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
@@ -645,7 +636,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
@@ -993,13 +983,20 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 // GetProfileInfo retrieves and formats the profile information of a user from a Gdbm backed storage.
 func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+	var defaultValue string
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 
+	code := h.st.Language.Code
+
 	// Default value when an entry is not found
-	defaultValue := "Not Provided"
+	if code == "swa" {
+		defaultValue = "Haipo"
+	} else {
+		defaultValue = "Not Provided"
+	}
 
 	// Helper function to handle nil byte slices and convert them to string
 	getEntryOrDefault := func(entry []byte, err error) string {
@@ -1036,12 +1033,22 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 			return res, fmt.Errorf("invalid year of birth: %v", err)
 		}
 	}
-
+	switch code {
-	// Format the result
+	case "eng":
-	res.Content = fmt.Sprintf(
+		res.Content = fmt.Sprintf(
-		"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-		name, gender, age, location, offerings,
+			name, gender, age, location, offerings,
-	)
+		)
-
+	case "swa":
+		res.Content = fmt.Sprintf(
+			"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
+			name, gender, age, location, offerings,
+		)
+	default:
+		res.Content = fmt.Sprintf(
+			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+			name, gender, age, location, offerings,
+		)
+	}
 	return res, nil
 }

internal/handlers/ussd/menuhandler_test.go

@@ -9,13 +9,15 @@ 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/handlers/ussd/mocks"
+	"git.grassecon.net/urdt/ussd/internal/mocks"
 	"git.grassecon.net/urdt/ussd/internal/models"
 	"git.grassecon.net/urdt/ussd/internal/utils"
 	"github.com/alecthomas/assert/v2"
 	testdataloader "github.com/peteole/testdata-loader"
+	"github.com/stretchr/testify/require"
 )
 
 var (
@@ -95,6 +97,11 @@ func TestCreateAccount(t *testing.T) {
 }
 
 func TestSaveFirstname(t *testing.T) {
+
+	fm, err := NewFlagManager(flagsPath)
+	if err != nil {
+		t.Fatal(err)
+	}
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)
 
@@ -103,12 +110,16 @@ func TestSaveFirstname(t *testing.T) {
 	firstName := "John"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
+	flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
+	flag_single_edit, _ := fm.parser.GetFlag("flag_single_edit")
+
 	// Set up the expected behavior of the mock
 	mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_FIRST_NAME, []byte(firstName)).Return(nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		flagManager:   fm.parser,
 	}
 
 	// Call the method
@@ -116,7 +127,10 @@ func TestSaveFirstname(t *testing.T) {
 
 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, resource.Result{}, res)
+	assert.Equal(t, resource.Result{
+		FlagSet:   []uint32{flag_single_edit},
+		FlagReset: []uint32{flag_allow_update},
+	}, res)
 
 	// Assert all expectations were met
 	mockStore.AssertExpectations(t)
@@ -349,7 +363,7 @@ func TestSaveGender(t *testing.T) {
 			}
 
 			// 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 +552,15 @@ func TestSetLanguage(t *testing.T) {
 	}
 	// Define test cases
 	tests := []struct {
-		name                string
+		name           string
-		execPath            []string
+		execPath       []string
-		expectedResult      resource.Result
+		expectedResult resource.Result
+		symbol         string
 	}{
 		{
 			name:     "Set Default Language (English)",
-			execPath: []string{"set_default"},
+			execPath: []string{"set_eng"},
+			symbol:   "set_eng",
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "eng",
@@ -552,19 +568,13 @@ func TestSetLanguage(t *testing.T) {
 		},
 		{
 			name:     "Set Swahili Language",
+			symbol:   "set_swa",
 			execPath: []string{"set_swa"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "swa",
 			},
 		},
-		{
-			name:     "Unhandled path",
-			execPath: []string{""},
-			expectedResult: resource.Result{
-				FlagSet: []uint32{8},
-			},
-		},
 	}
 
 	for _, tt := range tests {
@@ -580,7 +590,7 @@ func TestSetLanguage(t *testing.T) {
 			}
 
 			// Call the method
-			res, err := h.SetLanguage(context.Background(), "set_language", nil)
+			res, err := h.SetLanguage(context.Background(), tt.symbol, nil)
 
 			if err != nil {
 				t.Error(err)
@@ -596,7 +606,7 @@ func TestSetLanguage(t *testing.T) {
 func TestSetResetSingleEdit(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
 
-	flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
+	//flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
 	flag_single_edit, _ := fm.parser.GetFlag("flag_single_edit")
 
 	if err != nil {
@@ -608,30 +618,30 @@ func TestSetResetSingleEdit(t *testing.T) {
 		input          []byte
 		expectedResult resource.Result
 	}{
-		{
+		// {
-			name:  "Set single Edit",
+		// 	name:  "Set single Edit",
-			input: []byte("2"),
+		// 	input: []byte("2"),
-			expectedResult: resource.Result{
+		// 	expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_single_edit},
+		// 		FlagSet:   []uint32{flag_single_edit},
-				FlagReset: []uint32{flag_allow_update},
+		// 		FlagReset: []uint32{flag_allow_update},
-			},
+		// 	},
-		},
+		// },
-		{
+		// {
-			name:  "Set single Edit",
+		// 	name:  "Set single Edit",
-			input: []byte("3"),
+		// 	input: []byte("3"),
-			expectedResult: resource.Result{
+		// 	expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_single_edit},
+		// 		FlagSet:   []uint32{flag_single_edit},
-				FlagReset: []uint32{flag_allow_update},
+		// 		FlagReset: []uint32{flag_allow_update},
-			},
+		// 	},
-		},
+		// },
-		{
+		// {
-			name:  "Set single edit",
+		// 	name:  "Set single edit",
-			input: []byte("4"),
+		// 	input: []byte("4"),
-			expectedResult: resource.Result{
+		// 	expectedResult: resource.Result{
-				FlagReset: []uint32{flag_allow_update},
+		// 		FlagReset: []uint32{flag_allow_update},
-				FlagSet:   []uint32{flag_single_edit},
+		// 		FlagSet:   []uint32{flag_single_edit},
-			},
+		// 	},
-		},
+		// },
 		{
 			name:  "No single edit set",
 			input: []byte("1"),
@@ -1101,18 +1111,26 @@ func TestCheckAccountStatus(t *testing.T) {
 				FlagReset: []uint32{flag_account_pending},
 			},
 		},
+		{
+			name:   "Test when account status is not a success",
+			input:  []byte("TrackingId12"),
+			status: "REVERTED",
+			expectedResult: resource.Result{
+				FlagSet:   []uint32{flag_account_success},
+				FlagReset: []uint32{flag_account_pending},
+			},
+		},
 	}
 
 	typ := utils.DATA_TRACKING_ID
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.status, nil)
 
+			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(tt.status)).Return(nil).Maybe()
 			// Define expected interactions with the mock
 			mockDataStore.On("ReadEntry", ctx, sessionId, typ).Return(tt.input, nil)
 
-			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.status, nil)
-			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(tt.status)).Return(nil)
-
 			// Call the method under test
 			res, _ := h.CheckAccountStatus(ctx, "check_status", tt.input)
 
@@ -1480,7 +1498,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 +1527,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 +1554,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)
@@ -1630,7 +1648,6 @@ func TestCheckBalance(t *testing.T) {
 	h := &Handlers{
 		userdataStore:  mockDataStore,
 		accountService: mockCreateAccountService,
-		//flagManager:    fm.parser,
 	}
 	//mock call operations
 	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
@@ -1648,22 +1665,51 @@ func TestGetProfile(t *testing.T) {
 
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)
+	mockState := state.NewState(16)
+
 	h := &Handlers{
 		userdataStore:  mockDataStore,
 		accountService: mockCreateAccountService,
+		st:             mockState,
 	}
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	tests := []struct {
-		name        string
+		name         string
-		keys        []utils.DataTyp
+		languageCode string
-		profileInfo []string
+		keys         []utils.DataTyp
-		result      resource.Result
+		profileInfo  []string
+		result       resource.Result
 	}{
 		{
-			name:        "Test with full profile information",
+			name:         "Test with full profile information in eng",
-			keys:        []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
+			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
-			profileInfo: []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
+			profileInfo:  []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
+			languageCode: "eng",
+			result: resource.Result{
+				Content: fmt.Sprintf(
+					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+					"John Doee", "Male", "48", "Kilifi", "Bananas",
+				),
+			},
+		},
+		{
+			name:         "Test with with profile information in swa ",
+			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
+			profileInfo:  []string{"Doee", "John", "Jinsia", "Bananas", "Kilifi", "1976"},
+			languageCode: "swa",
+			result: resource.Result{
+				Content: fmt.Sprintf(
+					"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
+					"John Doee", "Male", "48", "Kilifi", "Bananas",
+				),
+			},
+		},
+		{
+			name:         "Test with with profile information with language that is not yet supported",
+			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
+			profileInfo:  []string{"Doee", "John", "Jinsia", "Bananas", "Kilifi", "1976"},
+			languageCode: "nor",
 			result: resource.Result{
 				Content: fmt.Sprintf(
 					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
@@ -1677,6 +1723,13 @@ func TestGetProfile(t *testing.T) {
 			for index, key := range tt.keys {
 				mockDataStore.On("ReadEntry", ctx, sessionId, key).Return([]byte(tt.profileInfo[index]), nil)
 			}
+
+			err := mockState.SetLanguage(tt.languageCode)
+			if err != nil {
+				t.Fail()
+			}
+			h.st = mockState
+
 			res, _ := h.GetProfileInfo(ctx, "get_profile_info", []byte(""))
 
 			// Assert that expectations were met
@@ -1784,6 +1837,25 @@ func TestSaveTemporaryPIn(t *testing.T) {
 	mockStore.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 TestConfirmPin(t *testing.T) {
 	sessionId := "session123"
 

internal/http/at_session_handler.go

@@ -32,6 +32,7 @@ func (ash *ATSessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request)
 	if err != nil {
 		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
 		ash.writeError(w, 400, err)
+		return
 	}
 	rqs.Config = cfg
 	rqs.Input, err = rp.GetInput(req)
@@ -41,16 +42,14 @@ func (ash *ATSessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request)
 		return
 	}
 
-	rqs, err = ash.Process(rqs)
+	rqs, err = ash.Process(rqs) 
 	switch err {
-	case handlers.ErrStorage:
+	case nil: // set code to 200 if no err
-		code = 500
+		code = 200
-	case handlers.ErrEngineInit:
+	case handlers.ErrStorage, handlers.ErrEngineInit, handlers.ErrEngineExec, handlers.ErrEngineType:
-		code = 500
-	case handlers.ErrEngineExec:
 		code = 500
 	default:
-		code = 200
+		code = 500
 	}
 
 	if code != 200 {
@@ -88,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

@@ -0,0 +1,449 @@
+package http
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+
+	"git.defalsify.org/vise.git/engine"
+	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/mocks/httpmocks"
+)
+
+// invalidRequestType is a custom type to test invalid request scenarios
+type invalidRequestType struct{}
+
+// errorReader is a helper type that always returns an error when Read is called
+type errorReader struct{}
+
+func (e *errorReader) Read(p []byte) (n int, err error) {
+	return 0, errors.New("read error")
+}
+
+func TestNewATSessionHandler(t *testing.T) {
+	mockHandler := &httpmocks.MockRequestHandler{}
+	ash := NewATSessionHandler(mockHandler)
+
+	if ash == nil {
+		t.Fatal("NewATSessionHandler returned nil")
+	}
+
+	if ash.SessionHandler == nil {
+		t.Fatal("SessionHandler is nil")
+	}
+}
+
+func TestATSessionHandler_ServeHTTP(t *testing.T) {
+	tests := []struct {
+		name           string
+		setupMocks     func(*httpmocks.MockRequestHandler, *httpmocks.MockRequestParser, *httpmocks.MockEngine)
+		formData       url.Values
+		expectedStatus int
+		expectedBody   string
+	}{
+		{
+			name: "Successful request",
+			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
+				mrp.GetSessionIdFunc = func(rq any) (string, error) {
+					req := rq.(*http.Request)
+					return req.FormValue("phoneNumber"), nil
+				}
+				mrp.GetInputFunc = func(rq any) ([]byte, error) {
+					req := rq.(*http.Request)
+					text := req.FormValue("text")
+					parts := strings.Split(text, "*")
+					return []byte(parts[len(parts)-1]), nil
+				}
+				mh.ProcessFunc = func(rqs handlers.RequestSession) (handlers.RequestSession, error) {
+					rqs.Continue = true
+					rqs.Engine = me
+					return rqs, nil
+				}
+				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
+				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.FlushFunc = func(context.Context, io.Writer) (int, error) { return 0, nil }
+			},
+			formData: url.Values{
+				"phoneNumber": []string{"+1234567890"},
+				"text":        []string{"1*2*3"},
+			},
+			expectedStatus: http.StatusOK,
+			expectedBody:   "CON ",
+		},
+		{
+			name: "GetSessionId error",
+			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
+				mrp.GetSessionIdFunc = func(rq any) (string, error) {
+					return "", errors.New("no phone number found")
+				}
+				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
+				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
+			},
+			formData: url.Values{
+				"text": []string{"1*2*3"},
+			},
+			expectedStatus: http.StatusBadRequest,
+			expectedBody:   "",
+		},
+		{
+			name: "GetInput error",
+			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
+				mrp.GetSessionIdFunc = func(rq any) (string, error) {
+					req := rq.(*http.Request)
+					return req.FormValue("phoneNumber"), nil
+				}
+				mrp.GetInputFunc = func(rq any) ([]byte, error) {
+					return nil, errors.New("no input found")
+				}
+				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
+				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
+			},
+			formData: url.Values{
+				"phoneNumber": []string{"+1234567890"},
+			},
+			expectedStatus: http.StatusBadRequest,
+			expectedBody:   "",
+		},
+		{
+			name: "Process error",
+			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
+				mrp.GetSessionIdFunc = func(rq any) (string, error) {
+					req := rq.(*http.Request)
+					return req.FormValue("phoneNumber"), nil
+				}
+				mrp.GetInputFunc = func(rq any) ([]byte, error) {
+					req := rq.(*http.Request)
+					text := req.FormValue("text")
+					parts := strings.Split(text, "*")
+					return []byte(parts[len(parts)-1]), nil
+				}
+				mh.ProcessFunc = func(rqs handlers.RequestSession) (handlers.RequestSession, error) {
+					return rqs, handlers.ErrStorage
+				}
+				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
+				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
+			},
+			formData: url.Values{
+				"phoneNumber": []string{"+1234567890"},
+				"text":        []string{"1*2*3"},
+			},
+			expectedStatus: http.StatusInternalServerError,
+			expectedBody:   "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			mockHandler := &httpmocks.MockRequestHandler{}
+			mockRequestParser := &httpmocks.MockRequestParser{}
+			mockEngine := &httpmocks.MockEngine{}
+			tt.setupMocks(mockHandler, mockRequestParser, mockEngine)
+
+			ash := NewATSessionHandler(mockHandler)
+
+			req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(tt.formData.Encode()))
+			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+			w := httptest.NewRecorder()
+
+			ash.ServeHTTP(w, req)
+
+			if w.Code != tt.expectedStatus {
+				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
+			}
+
+			if tt.expectedBody != "" && w.Body.String() != tt.expectedBody {
+				t.Errorf("Expected body %q, got %q", tt.expectedBody, w.Body.String())
+			}
+		})
+	}
+}
+
+func TestATSessionHandler_Output(t *testing.T) {
+	tests := []struct {
+		name           string
+		input          handlers.RequestSession
+		expectedPrefix string
+		expectedError  bool
+	}{
+		{
+			name: "Continue true",
+			input: handlers.RequestSession{
+				Continue: true,
+				Engine: &httpmocks.MockEngine{
+					FlushFunc: func(context.Context, io.Writer) (int, error) {
+						return 0, nil
+					},
+				},
+				Writer: &httpmocks.MockWriter{},
+			},
+			expectedPrefix: "CON ",
+			expectedError:  false,
+		},
+		{
+			name: "Continue false",
+			input: handlers.RequestSession{
+				Continue: false,
+				Engine: &httpmocks.MockEngine{
+					FlushFunc: func(context.Context, io.Writer) (int, error) {
+						return 0, nil
+					},
+				},
+				Writer: &httpmocks.MockWriter{},
+			},
+			expectedPrefix: "END ",
+			expectedError:  false,
+		},
+		{
+			name: "Flush error",
+			input: handlers.RequestSession{
+				Continue: true,
+				Engine: &httpmocks.MockEngine{
+					FlushFunc: func(context.Context, io.Writer) (int, error) {
+						return 0, errors.New("write error")
+					},
+				},
+				Writer: &httpmocks.MockWriter{},
+			},
+			expectedPrefix: "CON ",
+			expectedError:  true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ash := &ATSessionHandler{}
+			_, err := ash.Output(tt.input)
+
+			if tt.expectedError && err == nil {
+				t.Error("Expected an error, but got nil")
+			}
+
+			if !tt.expectedError && err != nil {
+				t.Errorf("Unexpected error: %v", err)
+			}
+
+			mw := tt.input.Writer.(*httpmocks.MockWriter)
+			if !mw.WriteStringCalled {
+				t.Error("WriteString was not called")
+			}
+
+			if mw.WrittenString != tt.expectedPrefix {
+				t.Errorf("Expected prefix %q, got %q", tt.expectedPrefix, mw.WrittenString)
+			}
+		})
+	}
+}
+
+func TestSessionHandler_ServeHTTP(t *testing.T) {
+	tests := []struct {
+		name           string
+		sessionID      string
+		input          []byte
+		parserErr      error
+		processErr     error
+		outputErr      error
+		resetErr       error
+		expectedStatus int
+	}{
+		{
+			name:           "Success",
+			sessionID:      "123",
+			input:          []byte("test input"),
+			expectedStatus: http.StatusOK,
+		},
+		{
+			name:           "Missing Session ID",
+			sessionID:      "",
+			parserErr:      handlers.ErrSessionMissing,
+			expectedStatus: http.StatusBadRequest,
+		},
+		{
+			name:           "Process Error",
+			sessionID:      "123",
+			input:          []byte("test input"),
+			processErr:     handlers.ErrStorage,
+			expectedStatus: http.StatusInternalServerError,
+		},
+		{
+			name:           "Output Error",
+			sessionID:      "123",
+			input:          []byte("test input"),
+			outputErr:      errors.New("output error"),
+			expectedStatus: http.StatusOK,
+		},
+		{
+			name:           "Reset Error",
+			sessionID:      "123",
+			input:          []byte("test input"),
+			resetErr:       errors.New("reset error"),
+			expectedStatus: http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			mockRequestParser := &httpmocks.MockRequestParser{
+				GetSessionIdFunc: func(any) (string, error) {
+					return tt.sessionID, tt.parserErr
+				},
+				GetInputFunc: func(any) ([]byte, error) {
+					return tt.input, nil
+				},
+			}
+
+			mockRequestHandler := &httpmocks.MockRequestHandler{
+				ProcessFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
+					return rs, tt.processErr
+				},
+				OutputFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
+					return rs, tt.outputErr
+				},
+				ResetFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
+					return rs, tt.resetErr
+				},
+				GetRequestParserFunc: func() handlers.RequestParser {
+					return mockRequestParser
+				},
+				GetConfigFunc: func() engine.Config {
+					return engine.Config{}
+				},
+			}
+
+			sessionHandler := ToSessionHandler(mockRequestHandler)
+
+			req := httptest.NewRequest(http.MethodPost, "/", bytes.NewBuffer(tt.input))
+			req.Header.Set("X-Vise-Session", tt.sessionID)
+
+			rr := httptest.NewRecorder()
+
+			sessionHandler.ServeHTTP(rr, req)
+
+			if status := rr.Code; status != tt.expectedStatus {
+				t.Errorf("handler returned wrong status code: got %v want %v",
+					status, tt.expectedStatus)
+			}
+		})
+	}
+}
+
+func TestSessionHandler_writeError(t *testing.T) {
+	handler := &SessionHandler{}
+	mockWriter := &httpmocks.MockWriter{}
+	err := errors.New("test error")
+
+	handler.writeError(mockWriter, http.StatusBadRequest, err)
+
+	if mockWriter.WrittenString != "" {
+		t.Errorf("Expected empty body, got %s", mockWriter.WrittenString)
+	}
+}
+
+func TestDefaultRequestParser_GetSessionId(t *testing.T) {
+	tests := []struct {
+		name          string
+		request       any
+		expectedID    string
+		expectedError error
+	}{
+		{
+			name: "Valid Session ID",
+			request: func() *http.Request {
+				req := httptest.NewRequest(http.MethodPost, "/", nil)
+				req.Header.Set("X-Vise-Session", "123456")
+				return req
+			}(),
+			expectedID:    "123456",
+			expectedError: nil,
+		},
+		{
+			name:          "Missing Session ID",
+			request:       httptest.NewRequest(http.MethodPost, "/", nil),
+			expectedID:    "",
+			expectedError: handlers.ErrSessionMissing,
+		},
+		{
+			name:          "Invalid Request Type",
+			request:       invalidRequestType{},
+			expectedID:    "",
+			expectedError: handlers.ErrInvalidRequest,
+		},
+	}
+
+	parser := &DefaultRequestParser{}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			id, err := parser.GetSessionId(tt.request)
+
+			if id != tt.expectedID {
+				t.Errorf("Expected session ID %s, got %s", tt.expectedID, id)
+			}
+
+			if err != tt.expectedError {
+				t.Errorf("Expected error %v, got %v", tt.expectedError, err)
+			}
+		})
+	}
+}
+
+func TestDefaultRequestParser_GetInput(t *testing.T) {
+	tests := []struct {
+		name          string
+		request       any
+		expectedInput []byte
+		expectedError error
+	}{
+		{
+			name: "Valid Input",
+			request: func() *http.Request {
+				return httptest.NewRequest(http.MethodPost, "/", bytes.NewBufferString("test input"))
+			}(),
+			expectedInput: []byte("test input"),
+			expectedError: nil,
+		},
+		{
+			name:          "Empty Input",
+			request:       httptest.NewRequest(http.MethodPost, "/", nil),
+			expectedInput: []byte{},
+			expectedError: nil,
+		},
+		{
+			name:          "Invalid Request Type",
+			request:       invalidRequestType{},
+			expectedInput: nil,
+			expectedError: handlers.ErrInvalidRequest,
+		},
+		{
+			name: "Read Error",
+			request: func() *http.Request {
+				return httptest.NewRequest(http.MethodPost, "/", &errorReader{})
+			}(),
+			expectedInput: nil,
+			expectedError: errors.New("read error"),
+		},
+	}
+
+	parser := &DefaultRequestParser{}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			input, err := parser.GetInput(tt.request)
+
+			if !bytes.Equal(input, tt.expectedInput) {
+				t.Errorf("Expected input %s, got %s", tt.expectedInput, input)
+			}
+
+			if err != tt.expectedError && (err == nil || err.Error() != tt.expectedError.Error()) {
+				t.Errorf("Expected error %v, got %v", tt.expectedError, err)
+			}
+		})
+	}
+}

internal/mocks/httpmocks/enginemock.go

@@ -0,0 +1,30 @@
+package httpmocks
+
+import (
+	"context"
+	"io"
+)
+
+// MockEngine implements the engine.Engine interface for testing
+type MockEngine struct {
+	InitFunc   func(context.Context) (bool, error)
+	ExecFunc   func(context.Context, []byte) (bool, error)
+	FlushFunc  func(context.Context, io.Writer) (int, error)
+	FinishFunc func() error
+}
+
+func (m *MockEngine) Init(ctx context.Context) (bool, error) {
+	return m.InitFunc(ctx)
+}
+
+func (m *MockEngine) Exec(ctx context.Context, input []byte) (bool, error) {
+	return m.ExecFunc(ctx, input)
+}
+
+func (m *MockEngine) Flush(ctx context.Context, w io.Writer) (int, error) {
+	return m.FlushFunc(ctx, w)
+}
+
+func (m *MockEngine) Finish() error {
+	return m.FinishFunc()
+}

internal/mocks/httpmocks/requesthandlermock.go

@@ -0,0 +1,47 @@
+package httpmocks
+
+import (
+	"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"
+)
+
+// MockRequestHandler implements handlers.RequestHandler interface for testing
+type MockRequestHandler struct {
+	ProcessFunc          func(handlers.RequestSession) (handlers.RequestSession, error)
+	GetConfigFunc        func() engine.Config
+	GetEngineFunc        func(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine
+	OutputFunc           func(rs handlers.RequestSession) (handlers.RequestSession, error)
+	ResetFunc            func(rs handlers.RequestSession) (handlers.RequestSession, error)
+	ShutdownFunc         func()
+	GetRequestParserFunc func() handlers.RequestParser
+}
+
+func (m *MockRequestHandler) Process(rqs handlers.RequestSession) (handlers.RequestSession, error) {
+	return m.ProcessFunc(rqs)
+}
+
+func (m *MockRequestHandler) GetConfig() engine.Config {
+	return m.GetConfigFunc()
+}
+
+func (m *MockRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine {
+	return m.GetEngineFunc(cfg, rs, pe)
+}
+
+func (m *MockRequestHandler) Output(rs handlers.RequestSession) (handlers.RequestSession, error) {
+	return m.OutputFunc(rs)
+}
+
+func (m *MockRequestHandler) Reset(rs handlers.RequestSession) (handlers.RequestSession, error) {
+	return m.ResetFunc(rs)
+}
+
+func (m *MockRequestHandler) Shutdown() {
+	m.ShutdownFunc()
+}
+
+func (m *MockRequestHandler) GetRequestParser() handlers.RequestParser {
+	return m.GetRequestParserFunc()
+}

internal/mocks/httpmocks/requestparsermock.go

@@ -0,0 +1,15 @@
+package httpmocks
+
+// MockRequestParser implements the handlers.RequestParser interface for testing
+type MockRequestParser struct {
+	GetSessionIdFunc func(any) (string, error)
+	GetInputFunc     func(any) ([]byte, error)
+}
+
+func (m *MockRequestParser) GetSessionId(rq any) (string, error) {
+	return m.GetSessionIdFunc(rq)
+}
+
+func (m *MockRequestParser) GetInput(rq any) ([]byte, error) {
+	return m.GetInputFunc(rq)
+}

internal/mocks/httpmocks/writermock.go

@@ -0,0 +1,25 @@
+package httpmocks
+
+import "net/http"
+
+// MockWriter implements a mock io.Writer for testing
+type MockWriter struct {
+	WriteStringCalled bool
+	WrittenString     string
+}
+
+func (m *MockWriter) Write(p []byte) (n int, err error) {
+	return len(p), nil
+}
+
+func (m *MockWriter) WriteString(s string) (n int, err error) {
+	m.WriteStringCalled = true
+	m.WrittenString = s
+	return len(s), nil
+}
+
+func (m *MockWriter) Header() http.Header {
+	return http.Header{}
+}
+
+func (m *MockWriter) WriteHeader(statusCode int) {}

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

@@ -8,57 +8,96 @@ import (
 
 	"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/persist"
 	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/logging"
 )
 
+var (
+	logg = logging.NewVanilla().WithDomain("storage")
+)	
+
 type StorageService interface {
-	GetPersister(dbDir string, ctx context.Context) (*persist.Persister, error)
+	GetPersister(ctx context.Context) (*persist.Persister, error)
-	GetUserdataDb(dbDir string, ctx context.Context) db.Db
+	GetUserdataDb(ctx context.Context) db.Db
-	GetResource(resourceDir string, ctx context.Context) (resource.Resource, error)
+	GetResource(ctx context.Context) (resource.Resource, error)
-	EnsureDbDir(dbDir string) error
+	EnsureDbDir() error
 }
 
-type MenuStorageService struct{}
+type MenuStorageService struct{
-
+	dbDir string
-func (menuStorageService *MenuStorageService) GetPersister(dbDir string, ctx context.Context) (*persist.Persister, error) {
+	resourceDir string
-	store := gdbmdb.NewGdbmDb()
+	resourceStore db.Db
-	storeFile := path.Join(dbDir, "state.gdbm")
+	stateStore db.Db
-	store.Connect(ctx, storeFile)
+	userDataStore db.Db
-	pr := persist.NewPersister(store)
-	return pr, nil
 }
 
-func (menuStorageService *MenuStorageService) GetUserdataDb(dbDir string, ctx context.Context) db.Db {
+func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {
-	store := gdbmdb.NewGdbmDb()
+	return &MenuStorageService{
-	storeFile := path.Join(dbDir, "userdata.gdbm")
+		dbDir: dbDir,
-	store.Connect(ctx, storeFile)
+		resourceDir: resourceDir,
-
+	}
-	return store
 }
 
-func (menuStorageService *MenuStorageService) GetResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
+func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
-	store := fsdb.NewFsDb()
+	ms.stateStore = NewThreadGdbmDb()
-	err := store.Connect(ctx, resourceDir)
+	storeFile := path.Join(ms.dbDir, "state.gdbm")
+	err := ms.stateStore.Connect(ctx, storeFile)
 	if err != nil {
 		return nil, err
 	}
-	rfs := resource.NewDbResource(store)
+	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 (menuStorageService *MenuStorageService) GetStateStore(dbDir string, ctx context.Context) (db.Db, error) {
+func (ms *MenuStorageService) GetStateStore(ctx context.Context) (db.Db, error) {
-	store := gdbmdb.NewGdbmDb()
+	if ms.stateStore != nil {
-	storeFile := path.Join(dbDir, "state.gdbm")
+		panic("set up store when already exists")
-	store.Connect(ctx, storeFile)
+	}
-	return store, nil
+	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 (menuStorageService *MenuStorageService) EnsureDbDir(dbDir string) error {
+func (ms *MenuStorageService) EnsureDbDir() error {
-	err := os.MkdirAll(dbDir, 0700)
+	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/isocodes.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/enter_location.vis

@@ -5,5 +5,5 @@ MOUT back 0
 HALT
 INCMP _ 0
 LOAD save_location 0
-CATCH pin_entry flag_single_edit 1
+CATCH pin_entry flag_single_edit 0
 INCMP enter_offerings *

services/registration/enter_yob.vis

@@ -5,5 +5,5 @@ HALT
 INCMP _ 0
 LOAD verify_yob 8
 LOAD save_yob 0
-CATCH pin_entry flag_single_edit 1
+CATCH pin_entry flag_single_edit 0
 INCMP enter_location *

services/registration/select_gender.vis

@@ -6,7 +6,7 @@ MOUT unspecified 3
 MOUT back 0
 HALT
 LOAD save_gender 0
-CATCH pin_entry flag_single_edit 1
+CATCH pin_entry flag_single_edit 0
 INCMP _ 0
 INCMP enter_yob 1
 INCMP enter_yob 2

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/update_success_swa

@@ -1 +1 @@
-Akaunti imeupdatiwa
+Ombi lako la kuweka wasifu limefanikiwa

services/registration/view_menu_swa

@@ -0,0 +1 @@
+Angalia Wasifu