Add mem storage service

Reviewed-on: urdt/ussd#268

.env.example

@@ -0,0 +1,20 @@
+#Serve Http
+PORT=7123
+HOST=127.0.0.1
+
+#AfricasTalking USSD POST endpoint
+AT_ENDPOINT=/ussd/africastalking
+
+#PostgreSQL
+DB_CONN=postgres://postgres:strongpass@localhost:5432/urdt_ussd
+#DB_TIMEZONE=Africa/Nairobi
+#DB_SCHEMA=vise
+
+#External API Calls
+CUSTODIAL_URL_BASE=http://localhost:5003
+BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
+DATA_URL_BASE=http://localhost:5006
+
+#Language
+DEFAULT_LANGUAGE=eng
+LANGUAGES=eng, swa

.gitignore

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

README.md

@@ -1,9 +0,0 @@
-# ussd
-
-> USSD
-
-USSD service.
-
-## License
-
-[AGPL-3.0](LICENSE).

cmd/main.go

@@ -1,146 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"path"
-
-	"git.defalsify.org/vise.git/cache"
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
-	"git.grassecon.net/urdt/ussd/internal/models"
-)
-
-var (
-	scriptDir = path.Join("services", "registration")
-)
-
-func main() {
-	var dir string
-	var root string
-	var size uint
-	var sessionId string
-	flag.StringVar(&dir, "d", ".", "resource dir to read from")
-	flag.UintVar(&size, "s", 0, "max size of output")
-	flag.StringVar(&root, "root", "root", "entry point symbol")
-	flag.StringVar(&sessionId, "session-id", "default", "session id")
-	flag.Parse()
-	fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir)
-
-	ctx := context.Background()
-	st := state.NewState(16)
-	st.UseDebug()
-	state.FlagDebugger.Register(models.USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE")
-	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED")
-	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_SUCCESS, "ACCOUNT_SUCCESS")
-	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_PENDING, "ACCOUNT_PENDING")
-	state.FlagDebugger.Register(models.USERFLAG_INCORRECTPIN, "INCORRECTPIN")
-	state.FlagDebugger.Register(models.USERFLAG_INCORRECTDATEFORMAT, "INVALIDDATEFORMAT")
-	state.FlagDebugger.Register(models.USERFLAG_INVALID_RECIPIENT, "INVALIDRECIPIENT")
-	state.FlagDebugger.Register(models.USERFLAG_PINMISMATCH, "PINMISMATCH")
-	state.FlagDebugger.Register(models.USERFLAG_PIN_SET, "PIN_SET")
-	state.FlagDebugger.Register(models.USERFLAG_INVALID_RECIPIENT_WITH_INVITE, "INVALIDRECIPIENT_WITH_INVITE")
-	state.FlagDebugger.Register(models.USERFLAG_INVALID_AMOUNT, "INVALIDAMOUNT")
-	state.FlagDebugger.Register(models.USERFLAG_ALLOW_UPDATE, "UNLOCKFORUPDATE")
-	state.FlagDebugger.Register(models.USERFLAG_VALIDPIN, "VALIDPIN")
-	state.FlagDebugger.Register(models.USERFLAG_VALIDPIN, "ACCOUNTUNLOCKED")
-	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_CREATION_FAILED, "ACCOUNT_CREATION_FAILED")
-	state.FlagDebugger.Register(models.USERFLAG_SINGLE_EDIT, "SINGLEEDIT")
-
-	rfs := resource.NewFsResource(scriptDir)
-	ca := cache.NewCache()
-	cfg := engine.Config{
-		Root:      "root",
-		SessionId: sessionId,
-	}
-
-	dp := path.Join(scriptDir, ".state")
-	err := os.MkdirAll(dp, 0700)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "state dir create exited with error: %v\n", err)
-		os.Exit(1)
-	}
-	pr := persist.NewFsPersister(dp)
-	en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs)
-
-	if err != nil {
-		pr = pr.WithContent(&st, ca)
-		err = pr.Save(cfg.SessionId)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to save state with error: %v\n", err)
-		}
-		en, err = engine.NewPersistedEngine(ctx, cfg, pr, rfs)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "engine create exited with error: %v\n", err)
-			os.Exit(1)
-		}
-	}
-
-	fp := path.Join(dp, sessionId)
-
-	ussdHandlers := ussd.NewHandlers(fp, &st)
-
-	rfs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
-	rfs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
-	rfs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
-	rfs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
-	rfs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
-	rfs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
-	rfs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
-	rfs.AddLocalFunc("quit", ussdHandlers.Quit)
-	rfs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
-	rfs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
-	rfs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
-	rfs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
-	rfs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
-	rfs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
-	rfs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
-	rfs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
-	rfs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
-	rfs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
-	rfs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
-	rfs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
-	rfs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
-	rfs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
-	rfs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
-	rfs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
-	rfs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
-	rfs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
-	rfs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
-	rfs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
-	rfs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
-	rfs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
-	rfs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
-	rfs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
-
-	cont, err := en.Init(ctx)
-	en.SetDebugger(engine.NewSimpleDebug(nil))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
-		os.Exit(1)
-	}
-	if !cont {
-		_, err = en.WriteResult(ctx, os.Stdout)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "dead init write error: %v\n", err)
-			os.Exit(1)
-		}
-		err = en.Finish()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "engine finish error: %v\n", err)
-			os.Exit(1)
-		}
-		os.Stdout.Write([]byte{0x0a})
-		os.Exit(0)
-	}
-	err = engine.Loop(ctx, en, os.Stdin, os.Stdout)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)
-		os.Exit(1)
-	}
-}

config/config.go

@@ -1,10 +1,59 @@
 package config
 
+import (
+	"strings"
 
-
+	"git.grassecon.net/grassrootseconomics/visedriver/env"
-const (
-    CreateAccountURL = "https://custodial.sarafu.africa/api/account/create"
-    TrackStatusURL   = "https://custodial.sarafu.africa/api/track/"
-    BalanceURL       = "https://custodial.sarafu.africa/api/account/status/"
 )
 
+var (
+	defaultLanguage		   = "eng"
+	languages []string
+)
+
+var (
+	DbConn		string
+	DefaultLanguage	    string
+	Languages	[]string
+)
+
+func setLanguage() error {
+	defaultLanguage = env.GetEnv("DEFAULT_LANGUAGE", defaultLanguage)
+	languages = strings.Split(env.GetEnv("LANGUAGES", defaultLanguage), ",")
+	haveDefaultLanguage := false
+	for i, v := range(languages) {
+		languages[i] = strings.ReplaceAll(v, " ", "")
+		if languages[i] == defaultLanguage {
+			haveDefaultLanguage = true
+		}
+	}
+
+	if !haveDefaultLanguage {
+		languages = append([]string{defaultLanguage}, languages...)
+	}
+
+	return nil
+}
+
+
+
+func setConn() error {
+	DbConn = env.GetEnv("DB_CONN", "")
+	return nil
+}
+
+// LoadConfig initializes the configuration values after environment variables are loaded.
+func LoadConfig() error {
+	err := setConn()
+	if err != nil {
+		return err
+	}
+	err = setLanguage()
+	if err != nil {
+		return err
+	}
+	DefaultLanguage = defaultLanguage
+	Languages = languages
+
+	return nil
+}

doc/data.md

@@ -0,0 +1,28 @@
+# Internals
+
+## Version
+
+This document describes component versions:
+
+* `urdt-ussd` `v0.5.0-beta`
+* `go-vise` `v0.2.2`
+
+
+## User profile data
+
+All user profile items are stored under keys matching the user's session id, prefixed with the 8-bit value `git.defalsify.org/vise.git/db.DATATYPE_USERDATA` (32), and followed with a 16-big big-endian value subprefix.
+
+For example, given the sessionId `+254123` and the key `git.grassecon.net/urdt-ussd/common.DATA_PUBLIC_KEY` (2) will be stored under the key:
+
+```
+0x322b3235343132330002
+
+prefix   sessionid       subprefix
+32       2b323534313233  0002
+```
+
+### Sub-prefixes
+
+All sub-prefixes are defined as constants in the `git.grassecon.net/urdt-ussd/common` package. The constant names have the prefix `DATA_`
+
+Please refer to inline godoc documentation for the `git.grassecon.net/urdt-ussd/common` package for details on each data item.

entry/handlers.go

@@ -0,0 +1,13 @@
+package entry
+
+import (
+	"context"
+	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/persist"
+)
+
+type EntryHandler interface {
+	Init(context.Context, string, []byte) (resource.Result, error) // HandlerFunc
+	Exit()
+	SetPersister(*persist.Persister)
+}

env/load.go

@@ -0,0 +1,40 @@
+package env
+
+import (
+	"log"
+	"os"
+	"path"
+	"strconv"
+
+	"github.com/joho/godotenv"
+)
+
+func LoadEnvVariables() {
+	LoadEnvVariablesPath(".")
+}
+
+func LoadEnvVariablesPath(dir string) {
+	fp := path.Join(dir, ".env")
+	err := godotenv.Load(fp)
+	if err != nil {
+		log.Fatal("Error loading .env file", err)
+	}
+}
+
+// Helper to get environment variables with a default fallback
+func GetEnv(key, defaultVal string) string {
+	if value, exists := os.LookupEnv(key); exists {
+		return value
+	}
+	return defaultVal
+}
+
+// Helper to safely convert environment variables to uint
+func GetEnvUint(key string, defaultVal uint) uint {
+	if value, exists := os.LookupEnv(key); exists {
+		if parsed, err := strconv.Atoi(value); err == nil && parsed >= 0 {
+			return uint(parsed)
+		}
+	}
+	return defaultVal
+}

errors/errors.go

@@ -0,0 +1,15 @@
+package errors
+
+import (
+	"errors"
+)
+
+var (
+	ErrInvalidRequest = errors.New("invalid request for context")
+	ErrSessionMissing = errors.New("missing session")
+	ErrInvalidInput   = errors.New("invalid input")
+	ErrStorage        = errors.New("storage retrieval fail")
+	ErrEngineType     = errors.New("incompatible engine")
+	ErrEngineInit     = errors.New("engine init fail")
+	ErrEngineExec     = errors.New("engine exec fail")
+)

go-vise

@@ -1 +0,0 @@
-Subproject commit 1f47a674d95380be8c387f410f0342eb72357df5

go.mod

@@ -1,5 +1,39 @@
-module git.grassecon.net/urdt/ussd
+module git.grassecon.net/grassrootseconomics/visedriver
 
-go 1.22.6
+go 1.23.0
 
-require github.com/stretchr/testify v1.9.0 // indirect
+require (
+	git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d
+	github.com/alecthomas/assert/v2 v2.2.2
+	github.com/gofrs/uuid v4.4.0+incompatible
+	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
+	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
+	github.com/jackc/pgx/v5 v5.7.1
+	github.com/joho/godotenv v1.5.1
+	github.com/peteole/testdata-loader v0.3.0
+	github.com/stretchr/testify v1.9.0
+	golang.org/x/crypto v0.27.0
+)
+
+require (
+	github.com/alecthomas/repr v0.2.0 // indirect
+	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
+	github.com/hexops/gotextdiff v1.0.3 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	gopkg.in/leonelquinteros/gotext.v1 v1.3.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -1,2 +1,76 @@
+git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d h1:bPAOVZOX4frSGhfOdcj7kc555f8dc9DmMd2YAyC2AMw=
+git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+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/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
+github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
+github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
+github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU=
+github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
+github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk=
+github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0=
+github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
+github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
+github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
+github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
+github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s=
+github.com/pashagolub/pgxmock/v4 v4.3.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A=
+github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
+github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
+gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/handlers/server/accountservice.go

@@ -1,112 +0,0 @@
-package server
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/models"
-)
-
-type AccountServiceInterface interface {
-	CheckBalance(publicKey string) (string, error)
-	CreateAccount() (*models.AccountResponse, error)
-	CheckAccountStatus(trackingId string) (string, error)
-}
-
-type AccountService struct {
-}
-
-
-
-// CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
-//
-// Parameters:
-//   - trackingId: A unique identifier for the account.This should be obtained from a previous call to
-//     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
-//     AccountResponse struct can be used here to check the account status during a transaction.
-//
-//
-// Returns:
-//   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
-//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
-//     If no error occurs, this will be nil.
-//
-func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
-	resp, err := http.Get(config.TrackStatusURL + trackingId)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-
-	var trackResp models.TrackStatusResponse
-	err = json.Unmarshal(body, &trackResp)
-	if err != nil {
-		return "", err
-	}
-
-	status := trackResp.Result.Transaction.Status
-
-	return status, nil
-}
-
-
-// CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
-// Parameters:
-//   - publicKey: The public key associated with the account whose balance needs to be checked.
-func (as *AccountService) CheckBalance(publicKey string) (string, error) {
-
-	resp, err := http.Get(config.BalanceURL + publicKey)
-	if err != nil {
-		return "0.0", err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "0.0", err
-	}
-
-	var balanceResp models.BalanceResponse
-	err = json.Unmarshal(body, &balanceResp)
-	if err != nil {
-		return "0.0", err
-	}
-
-	balance := balanceResp.Result.Balance
-	return balance, nil
-}
-
-
-//CreateAccount creates a new account in the custodial system.
-// Returns:
-//   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
-//     If there is an error during the request or processing, this will be nil.
-//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
-//     If no error occurs, this will be nil.
-func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
-	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	var accountResp models.AccountResponse
-	err = json.Unmarshal(body, &accountResp)
-	if err != nil {
-		return nil, err
-	}
-
-	return &accountResp, nil
-}

internal/handlers/ussd/menuhandler.go

@@ -1,779 +0,0 @@
-package ussd
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"path"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/lang"
-	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"git.grassecon.net/urdt/ussd/internal/utils"
-	"gopkg.in/leonelquinteros/gotext.v1"
-)
-
-var (
-	scriptDir      = path.Join("services", "registration")
-	translationDir = path.Join(scriptDir, "locale")
-)
-
-type FSData struct {
-	Path string
-	St   *state.State
-}
-
-
-type Handlers struct {
-	fs                 *FSData
-	accountFileHandler utils.AccountFileHandlerInterface
-	accountService     server.AccountServiceInterface
-}
-
-func NewHandlers(path string, st *state.State) *Handlers {
-	return &Handlers{
-		fs: &FSData{
-			Path: path,
-			St:   st,
-		},
-		accountFileHandler: utils.NewAccountFileHandler(path + "_data"),
-		accountService:     &server.AccountService{},
-	}
-}
-
-
-
-// Define the regex pattern as a constant
-const pinPattern = `^\d{4}$`
-
-// isValidPIN checks whether the given input is a 4 digit number
-func isValidPIN(pin string) bool {
-	match, _ := regexp.MatchString(pinPattern, pin)
-	return match
-}
-
-// SetLanguage sets the language across the menu
-func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	inputStr := string(input)
-	res := resource.Result{}
-	switch inputStr {
-	case "0":
-		res.FlagSet = []uint32{state.FLAG_LANG}
-		res.Content = "eng"
-	case "1":
-		res.FlagSet = []uint32{state.FLAG_LANG}
-		res.Content = "swa"
-	default:
-	}
-
-	res.FlagSet = append(res.FlagSet, models.USERFLAG_LANGUAGE_SET)
-
-	return res, nil
-}
-
-// CreateAccount checks if any account exists on the JSON data file, and if not
-// creates an account on the API,
-// sets the default values and flags
-func (h *Handlers) CreateAccount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	err := h.accountFileHandler.EnsureFileExists()
-	if err != nil {
-		return res, err
-	}
-
-	// if an account exists, return to prevent duplicate account creation
-	existingAccountData, err := h.accountFileHandler.ReadAccountData()
-	if existingAccountData != nil {
-		return res, err
-	}
-
-	accountResp, err := h.accountService.CreateAccount()
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_ACCOUNT_CREATION_FAILED)
-		return res, err
-	}
-
-	accountData := map[string]string{
-		"TrackingId":  accountResp.Result.TrackingId,
-		"PublicKey":   accountResp.Result.PublicKey,
-		"CustodialId": accountResp.Result.CustodialId.String(),
-		"Status":      "PENDING",
-		"Gender":      "Not provided",
-		"YOB":         "Not provided",
-		"Location":    "Not provided",
-		"Offerings":   "Not provided",
-		"FirstName":   "Not provided",
-		"FamilyName":  "Not provided",
-	}
-	err = h.accountFileHandler.WriteAccountData(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	res.FlagSet = append(res.FlagSet, models.USERFLAG_ACCOUNT_CREATED)
-	return res, err
-}
-
-// SavePin persists the user's PIN choice into the filesystem
-func (h *Handlers) SavePin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	accountPIN := string(input)
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	// Validate that the PIN is a 4-digit number
-	if !isValidPIN(accountPIN) {
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_INCORRECTPIN)
-		return res, nil
-	}
-
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTPIN)
-	accountData["AccountPIN"] = accountPIN
-
-	err = h.accountFileHandler.WriteAccountData(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	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) {
-	res := resource.Result{}
-	menuOption := string(input)
-	switch menuOption {
-	case "2":
-		res.FlagReset = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_SINGLE_EDIT)
-	case "3":
-		res.FlagReset = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_SINGLE_EDIT)
-	case "4":
-		res.FlagReset = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_SINGLE_EDIT)
-	default:
-		res.FlagReset = append(res.FlagReset, models.USERFLAG_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
-func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	if bytes.Equal(input, []byte(accountData["AccountPIN"])) {
-		res.FlagSet = []uint32{models.USERFLAG_VALIDPIN}
-		res.FlagReset = []uint32{models.USERFLAG_PINMISMATCH}
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_PIN_SET)
-	} else {
-		res.FlagSet = []uint32{models.USERFLAG_PINMISMATCH}
-	}
-
-	return res, nil
-}
-
-//codeFromCtx retrieves language codes from the context that can be used for handling translations
-func codeFromCtx(ctx context.Context) string {
-	var code string
-	engine.Logg.DebugCtxf(ctx, "in msg", "ctx", ctx, "val", code)
-	if ctx.Value("Language") != nil {
-		lang := ctx.Value("Language").(lang.Language)
-		code = lang.Code
-	}
-	return code
-}
-
-// SaveFirstname updates the first name in a JSON data file with the provided input.
-func (h *Handlers) SaveFirstname(cxt context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-	if len(input) > 0 {
-		name := string(input)
-		accountData["FirstName"] = name
-
-		err = h.accountFileHandler.WriteAccountData(accountData)
-		if err != nil {
-			return res, err
-		}
-	}
-
-	return res, nil
-}
-
-// SaveFamilyname updates the family name in a JSON data file with the provided input.
-func (h *Handlers) SaveFamilyname(cxt context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-	if len(input) > 0 {
-		secondname := string(input)
-		accountData["FamilyName"] = secondname
-
-		err = h.accountFileHandler.WriteAccountData(accountData)
-		if err != nil {
-			return res, err
-		}
-	}
-
-	return res, nil
-}
-
-// SaveYOB updates the Year of Birth(YOB) in a JSON data file with the provided input.
-func (h *Handlers) SaveYob(cxt context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	yob := string(input)
-	if len(yob) == 4 {
-		yob := string(input)
-		accountData["YOB"] = yob
-
-		err = h.accountFileHandler.WriteAccountData(accountData)
-		if err != nil {
-			return res, err
-		}
-	}
-
-	return res, nil
-}
-
-// SaveLocation updates the location in a JSON data file with the provided input.
-func (h *Handlers) SaveLocation(cxt context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	if len(input) > 0 {
-		location := string(input)
-		accountData["Location"] = location
-
-		err = h.accountFileHandler.WriteAccountData(accountData)
-		if err != nil {
-			return res, err
-		}
-	}
-
-	return res, nil
-}
-
-// SaveGender updates the gender in a JSON data file with the provided input.
-func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	if len(input) > 0 {
-		gender := string(input)
-
-		switch gender {
-		case "1":
-			gender = "Male"
-		case "2":
-			gender = "Female"
-		case "3":
-			gender = "Unspecified"
-		}
-		accountData["Gender"] = gender
-
-		err = h.accountFileHandler.WriteAccountData(accountData)
-		if err != nil {
-			return res, err
-		}
-	}
-	return res, nil
-}
-
-// SaveOfferings updates the offerings(goods and services provided by the user) in a JSON data file with the provided input.
-func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	if len(input) > 0 {
-		offerings := string(input)
-		accountData["Offerings"] = offerings
-
-		err = h.accountFileHandler.WriteAccountData(accountData)
-		if err != nil {
-			return res, err
-		}
-	}
-	return res, nil
-}
-
-// ResetAllowUpdate resets the allowupdate flag that allows a user to update  profile data.
-func (h *Handlers) ResetAllowUpdate(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ALLOW_UPDATE)
-	return res, nil
-}
-
-// ResetAccountAuthorized resets the account authorization flag after a successful PIN entry.
-func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
-	return res, nil
-}
-
-// CheckIdentifier retrieves the PublicKey from the JSON data file.
-func (h *Handlers) CheckIdentifier(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	res.Content = accountData["PublicKey"]
-
-	return res, nil
-}
-
-// Authorize attempts to unlock the next sequential nodes by verifying the provided PIN against the already set PIN.
-// It sets the required flags that control the flow.
-func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	pin := string(input)
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	if len(input) == 4 {
-		if pin != accountData["AccountPIN"] {
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_INCORRECTPIN)
-			res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
-			return res, nil
-		}
-		if h.fs.St.MatchFlag(models.USERFLAG_ACCOUNT_AUTHORIZED, false) {
-			res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTPIN)
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_ACCOUNT_AUTHORIZED)
-		} else {
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
-			res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
-		}
-	}
-	return res, nil
-}
-
-// ResetIncorrectPin resets the incorrect pin flag  after a new PIN attempt.
-func (h *Handlers) ResetIncorrectPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTPIN)
-	return res, nil
-}
-
-// CheckAccountStatus queries the API using the TrackingId and sets flags
-// based on the account status
-func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	status, err := h.accountService.CheckAccountStatus(accountData["TrackingId"])
-
-	if err != nil {
-		fmt.Println("Error checking account status:", err)
-		return res, nil
-	}
-
-	accountData["Status"] = status
-
-	if status == "SUCCESS" {
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_ACCOUNT_SUCCESS)
-		res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_PENDING)
-	} else {
-		res.FlagReset = append(res.FlagSet, models.USERFLAG_ACCOUNT_SUCCESS)
-		res.FlagSet = append(res.FlagReset, models.USERFLAG_ACCOUNT_PENDING)
-	}
-
-	err = h.accountFileHandler.WriteAccountData(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	return res, nil
-}
-
-// Quit displays the Thank you message and exits the menu
-func (h *Handlers) Quit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-	
-	res.Content = l.Get("Thank you for using Sarafu. Goodbye!")
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
-	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) {
-	res := resource.Result{}
-	date := string(input)
-	_, err := strconv.Atoi(date)
-	if err != nil {
-		// If conversion fails, input is not numeric
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_INCORRECTDATEFORMAT)
-		return res, nil
-	}
-
-	if len(date) == 4 {
-		res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTDATEFORMAT)
-	} else {
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_INCORRECTDATEFORMAT)
-	}
-
-	return res, nil
-}
-
-// ResetIncorrectYob resets the incorrect date format after a new attempt
-func (h *Handlers) ResetIncorrectYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTDATEFORMAT)
-	return res, nil
-}
-
-// CheckBalance retrieves the balance from the API using the "PublicKey" and sets
-// the balance as the result content
-func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	balance, err := h.accountService.CheckBalance(accountData["PublicKey"])
-	if err != nil {
-		return res, nil
-	}
-	res.Content = balance
-
-	return res, nil
-}
-
-// ValidateRecipient validates that the given input is a valid phone number.
-func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	recipient := string(input)
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	if recipient != "0" {
-		// mimic invalid number check
-		if recipient == "000" {
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_INVALID_RECIPIENT)
-			res.Content = recipient
-
-			return res, nil
-		}
-
-		accountData["Recipient"] = recipient
-
-		err = h.accountFileHandler.WriteAccountData(accountData)
-		if err != nil {
-			return res, err
-		}
-	}
-
-	return res, nil
-}
-
-// TransactionReset resets the previous transaction data (Recipient and Amount)
-// as well as the invalid flags
-func (h *Handlers) TransactionReset(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	// reset the transaction
-	accountData["Recipient"] = ""
-	accountData["Amount"] = ""
-
-	err = h.accountFileHandler.WriteAccountData(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_INVALID_RECIPIENT, models.USERFLAG_INVALID_RECIPIENT_WITH_INVITE)
-
-	return res, nil
-}
-
-// ResetTransactionAmount resets the transaction amount and invalid flag
-func (h *Handlers) ResetTransactionAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	// reset the amount
-	accountData["Amount"] = ""
-
-	err = h.accountFileHandler.WriteAccountData(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_INVALID_AMOUNT)
-
-	return res, nil
-}
-
-// MaxAmount gets the current balance from the API and sets it as
-// the result content.
-func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	balance, err := h.accountService.CheckBalance(accountData["PublicKey"])
-	if err != nil {
-		return res, nil
-	}
-
-	res.Content = balance
-
-	return res, nil
-}
-
-// ValidateAmount ensures that the given input is a valid amount and that
-// it is not more than the current balance.
-func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	amountStr := string(input)
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	balanceStr, err := h.accountService.CheckBalance(accountData["PublicKey"])
-	if err != nil {
-		return res, err
-	}
-	res.Content = balanceStr
-
-	// Parse the balance
-	balanceParts := strings.Split(balanceStr, " ")
-	if len(balanceParts) != 2 {
-		return res, fmt.Errorf("unexpected balance format: %s", balanceStr)
-	}
-	balanceValue, err := strconv.ParseFloat(balanceParts[0], 64)
-	if err != nil {
-		return res, fmt.Errorf("failed to parse balance: %v", err)
-	}
-
-	// Extract numeric part from input
-	re := regexp.MustCompile(`^(\d+(\.\d+)?)\s*(?:CELO)?$`)
-	matches := re.FindStringSubmatch(strings.TrimSpace(amountStr))
-	if len(matches) < 2 {
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_INVALID_AMOUNT)
-		res.Content = amountStr
-		return res, nil
-	}
-
-	inputAmount, err := strconv.ParseFloat(matches[1], 64)
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_INVALID_AMOUNT)
-		res.Content = amountStr
-		return res, nil
-	}
-
-	if inputAmount > balanceValue {
-		res.FlagSet = append(res.FlagSet, models.USERFLAG_INVALID_AMOUNT)
-		res.Content = amountStr
-		return res, nil
-	}
-
-	res.Content = fmt.Sprintf("%.3f", inputAmount) // Format to 3 decimal places
-	accountData["Amount"] = res.Content
-
-	err = h.accountFileHandler.WriteAccountData(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	return res, nil
-}
-
-// GetRecipient returns the transaction recipient from a JSON data file.
-func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	res.Content = accountData["Recipient"]
-
-	return res, nil
-}
-
-// GetProfileInfo retrieves and formats the profile information of a user from a JSON data file.
-func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	var age string
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-	var name string
-	if accountData["FirstName"] == "Not provided" || accountData["FamilyName"] == "Not provided" {
-		name = "Not provided"
-	} else {
-		name = accountData["FirstName"] + " " + accountData["FamilyName"]
-	}
-
-	gender := accountData["Gender"]
-	yob := accountData["YOB"]
-	location := accountData["Location"]
-	offerings := accountData["Offerings"]
-	if yob == "Not provided" {
-		age = "Not provided"
-	} else {
-		ageInt, err := strconv.Atoi(yob)
-		if err != nil {
-			return res, nil
-		}
-		age = strconv.Itoa(utils.CalculateAgeWithYOB(ageInt))
-	}
-	formattedData := fmt.Sprintf("Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n", name, gender, age, location, offerings)
-	res.Content = formattedData
-	return res, nil
-}
-
-// GetSender retrieves the public key from a JSON data file.
-func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	res.Content = accountData["PublicKey"]
-
-	return res, nil
-}
-
-// GetAmount retrieves the amount from a JSON data file.
-func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	res.Content = accountData["Amount"]
-
-	return res, nil
-}
-
-// QuickWithBalance retrieves the balance for a given public key from the custodial balance API endpoint before
-// gracefully exiting the session.
-func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-	balance, err := h.accountService.CheckBalance(accountData["PublicKey"])
-	if err != nil {
-		return res, nil
-	}
-	res.Content = l.Get("Your account balance is %s", balance)
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
-	return res, nil
-}
-
-// InitiateTransaction returns a confirmation and resets the transaction data
-// on the JSON file.
-func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-
-	accountData, err := h.accountFileHandler.ReadAccountData()
-	if err != nil {
-		return res, err
-	}
-
-	// TODO
-	// Use the amount, recipient and sender to call the API and initialize the transaction
-
-	res.Content = l.Get("Your request has been sent. %s will receive %s from %s.", accountData["Recipient"], accountData["Amount"], accountData["PublicKey"])
-
-	// reset the transaction
-	accountData["Recipient"] = ""
-	accountData["Amount"] = ""
-
-	err = h.accountFileHandler.WriteAccountData(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
-	return res, nil
-}

internal/handlers/ussd/menuhandler_test.go

@@ -1,878 +0,0 @@
-package ussd
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd/mocks"
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"git.grassecon.net/urdt/ussd/internal/utils"
-	"github.com/alecthomas/assert/v2"
-	"github.com/stretchr/testify/mock"
-)
-
-// MockAccountService implements AccountServiceInterface for testing
-type MockAccountService struct {
-	mock.Mock
-}
-
-func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
-	args := m.Called()
-	return args.Get(0).(*models.AccountResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
-	args := m.Called(publicKey)
-	return args.String(0), args.Error(1)
-}
-
-func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
-	args := m.Called(trackingId)
-	return args.String(0), args.Error(1)
-}
-
-func TestCreateAccount(t *testing.T) {
-	// Setup
-	tempDir, err := os.MkdirTemp("", "test_create_account")
-	if err != nil {
-		t.Fatalf("Failed to create temp directory: %v", err)
-	}
-	defer os.RemoveAll(tempDir) // Clean up after the test run
-
-	sessionID := "07xxxxxxxx"
-
-	// Set up the data file path using the session ID
-	accountFilePath := filepath.Join(tempDir, sessionID+"_data")
-
-	// Initialize account file handler
-	accountFileHandler := utils.NewAccountFileHandler(accountFilePath)
-
-	// Create a mock account service
-	mockAccountService := &MockAccountService{}
-	mockAccountResponse := &models.AccountResponse{
-		Ok: true,
-		Result: struct {
-			CustodialId json.Number `json:"custodialId"`
-			PublicKey   string      `json:"publicKey"`
-			TrackingId  string      `json:"trackingId"`
-		}{
-			CustodialId: "test-custodial-id",
-			PublicKey:   "test-public-key",
-			TrackingId:  "test-tracking-id",
-		},
-	}
-
-	// Set up expectations for the mock account service
-	mockAccountService.On("CreateAccount").Return(mockAccountResponse, nil)
-
-	// Initialize Handlers with mock account service
-	h := &Handlers{
-		fs:                 &FSData{Path: accountFilePath},
-		accountFileHandler: accountFileHandler,
-		accountService:     mockAccountService,
-	}
-
-	tests := []struct {
-		name           string
-		existingData   map[string]string
-		expectedResult resource.Result
-		expectedData   map[string]string
-	}{
-		{
-			name:         "New account creation",
-			existingData: nil,
-			expectedResult: resource.Result{
-				FlagSet: []uint32{models.USERFLAG_ACCOUNT_CREATED},
-			},
-			expectedData: map[string]string{
-				"TrackingId":  "test-tracking-id",
-				"PublicKey":   "test-public-key",
-				"CustodialId": "test-custodial-id",
-				"Status":      "PENDING",
-				"Gender":      "Not provided",
-				"YOB":         "Not provided",
-				"Location":    "Not provided",
-				"Offerings":   "Not provided",
-				"FirstName":   "Not provided",
-				"FamilyName":  "Not provided",
-			},
-		},
-		{
-			name: "Existing account",
-			existingData: map[string]string{
-				"TrackingId":  "test-tracking-id",
-				"PublicKey":   "test-public-key",
-				"CustodialId": "test-custodial-id",
-				"Status":      "PENDING",
-				"Gender":      "Not provided",
-				"YOB":         "Not provided",
-				"Location":    "Not provided",
-				"Offerings":   "Not provided",
-				"FirstName":   "Not provided",
-				"FamilyName":  "Not provided",
-			},
-			expectedResult: resource.Result{},
-			expectedData: map[string]string{
-				"TrackingId":  "test-tracking-id",
-				"PublicKey":   "test-public-key",
-				"CustodialId": "test-custodial-id",
-				"Status":      "PENDING",
-				"Gender":      "Not provided",
-				"YOB":         "Not provided",
-				"Location":    "Not provided",
-				"Offerings":   "Not provided",
-				"FirstName":   "Not provided",
-				"FamilyName":  "Not provided",
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set up the data file path using the session ID
-			accountFilePath := filepath.Join(tempDir, sessionID+"_data")
-
-			// Setup existing data if any
-			if tt.existingData != nil {
-				data, _ := json.Marshal(tt.existingData)
-				err := os.WriteFile(accountFilePath, data, 0644)
-				if err != nil {
-					t.Fatalf("Failed to write existing data: %v", err)
-				}
-			}
-
-			// Call the function
-			result, err := h.CreateAccount(context.Background(), "", nil)
-
-			// Check for errors
-			if err != nil {
-				t.Fatalf("CreateAccount returned an error: %v", err)
-			}
-
-			// Check the result
-			if len(result.FlagSet) != len(tt.expectedResult.FlagSet) {
-				t.Errorf("Expected %d flags, got %d", len(tt.expectedResult.FlagSet), len(result.FlagSet))
-			}
-			for i, flag := range tt.expectedResult.FlagSet {
-				if result.FlagSet[i] != flag {
-					t.Errorf("Expected flag %d, got %d", flag, result.FlagSet[i])
-				}
-			}
-
-			// Check the stored data
-			data, err := os.ReadFile(accountFilePath)
-			if err != nil {
-				t.Fatalf("Failed to read account data file: %v", err)
-			}
-
-			var storedData map[string]string
-			err = json.Unmarshal(data, &storedData)
-			if err != nil {
-				t.Fatalf("Failed to unmarshal stored data: %v", err)
-			}
-
-			for key, expectedValue := range tt.expectedData {
-				if storedValue, ok := storedData[key]; !ok || storedValue != expectedValue {
-					t.Errorf("Expected %s to be %s, got %s", key, expectedValue, storedValue)
-				}
-			}
-		})
-	}
-}
-
-func TestCreateAccount_Success(t *testing.T) {
-	mockAccountFileHandler := new(mocks.MockAccountFileHandler)
-	mockCreateAccountService := new(mocks.MockAccountService)
-
-	mockAccountFileHandler.On("EnsureFileExists").Return(nil)
-
-	// Mock that no account data exists
-	mockAccountFileHandler.On("ReadAccountData").Return(nil, nil)
-
-	// Define expected account response after api call
-	expectedAccountResp := &models.AccountResponse{
-		Ok: true,
-		Result: struct {
-			CustodialId json.Number `json:"custodialId"`
-			PublicKey   string      `json:"publicKey"`
-			TrackingId  string      `json:"trackingId"`
-		}{
-			CustodialId: "12",
-			PublicKey:   "0x8E0XSCSVA",
-			TrackingId:  "d95a7e83-196c-4fd0-866fSGAGA",
-		},
-	}
-	mockCreateAccountService.On("CreateAccount").Return(expectedAccountResp, nil)
-
-	// Mock WriteAccountData to not error
-	mockAccountFileHandler.On("WriteAccountData", mock.Anything).Return(nil)
-
-	handlers := &Handlers{
-		accountService: mockCreateAccountService,
-	}
-
-	actualResponse, err := handlers.accountService.CreateAccount()
-
-	// Assert results
-	assert.NoError(t, err)
-	assert.Equal(t, expectedAccountResp.Ok, true)
-	assert.Equal(t, expectedAccountResp, actualResponse)
-}
-
-func TestSavePin(t *testing.T) {
-	// Setup
-	tempDir, err := os.MkdirTemp("", "test_save_pin")
-	if err != nil {
-		t.Fatalf("Failed to create temp directory: %v", err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	sessionID := "07xxxxxxxx"
-
-	// Set up the data file path using the session ID
-	accountFilePath := filepath.Join(tempDir, sessionID+"_data")
-	initialAccountData := map[string]string{
-		"TrackingId": "test-tracking-id",
-		"PublicKey":  "test-public-key",
-	}
-	data, _ := json.Marshal(initialAccountData)
-	err = os.WriteFile(accountFilePath, data, 0644)
-	if err != nil {
-		t.Fatalf("Failed to write initial account data: %v", err)
-	}
-
-	// Create a new AccountFileHandler and set it in the Handlers struct
-	accountFileHandler := utils.NewAccountFileHandler(accountFilePath)
-	h := &Handlers{
-		accountFileHandler: accountFileHandler,
-	}
-
-	tests := []struct {
-		name           string
-		input          []byte
-		expectedFlags  []uint32
-		expectedData   map[string]string
-		expectedErrors bool
-	}{
-		{
-			name:          "Valid PIN",
-			input:         []byte("1234"),
-			expectedFlags: []uint32{},
-			expectedData: map[string]string{
-				"TrackingId": "test-tracking-id",
-				"PublicKey":  "test-public-key",
-				"AccountPIN": "1234",
-			},
-		},
-		{
-			name:           "Invalid PIN - non-numeric",
-			input:          []byte("12ab"),
-			expectedFlags:  []uint32{models.USERFLAG_INCORRECTPIN},
-			expectedData:   initialAccountData, // No changes expected
-			expectedErrors: false,
-		},
-		{
-			name:           "Invalid PIN - less than 4 digits",
-			input:          []byte("123"),
-			expectedFlags:  []uint32{models.USERFLAG_INCORRECTPIN},
-			expectedData:   initialAccountData, // No changes expected
-			expectedErrors: false,
-		},
-		{
-			name:           "Invalid PIN - more than 4 digits",
-			input:          []byte("12345"),
-			expectedFlags:  []uint32{models.USERFLAG_INCORRECTPIN},
-			expectedData:   initialAccountData, // No changes expected
-			expectedErrors: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Ensure the file exists before running the test
-			err := accountFileHandler.EnsureFileExists()
-			if err != nil {
-				t.Fatalf("Failed to ensure account file exists: %v", err)
-			}
-
-			result, err := h.SavePin(context.Background(), "", tt.input)
-			if err != nil && !tt.expectedErrors {
-				t.Fatalf("SavePin returned an unexpected error: %v", err)
-			}
-
-			if len(result.FlagSet) != len(tt.expectedFlags) {
-				t.Errorf("Expected %d flags, got %d", len(tt.expectedFlags), len(result.FlagSet))
-			}
-			for i, flag := range tt.expectedFlags {
-				if result.FlagSet[i] != flag {
-					t.Errorf("Expected flag %d, got %d", flag, result.FlagSet[i])
-				}
-			}
-
-			data, err := os.ReadFile(accountFilePath)
-			if err != nil {
-				t.Fatalf("Failed to read account data file: %v", err)
-			}
-
-			var storedData map[string]string
-			err = json.Unmarshal(data, &storedData)
-			if err != nil {
-				t.Fatalf("Failed to unmarshal stored data: %v", err)
-			}
-
-			for key, expectedValue := range tt.expectedData {
-				if storedValue, ok := storedData[key]; !ok || storedValue != expectedValue {
-					t.Errorf("Expected %s to be %s, got %s", key, expectedValue, storedValue)
-				}
-			}
-		})
-	}
-}
-
-func TestSaveLocation(t *testing.T) {
-	// Create a new instance of MockAccountFileHandler
-	mockFileHandler := new(mocks.MockAccountFileHandler)
-
-	// Define test cases
-	tests := []struct {
-		name           string
-		input          []byte
-		existingData   map[string]string
-		writeError     error
-		expectedResult resource.Result
-		expectedError  error
-	}{
-		{
-			name:           "Successful Save",
-			input:          []byte("Mombasa"),
-			existingData:   map[string]string{"Location": "Mombasa"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-		},
-		{
-			name:           "Empty location input",
-			input:          []byte{},
-			existingData:   map[string]string{"OtherKey": "OtherValue"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set up the mock expectations
-			mockFileHandler.On("ReadAccountData").Return(tt.existingData, tt.expectedError)
-			if tt.expectedError == nil && len(tt.input) > 0 {
-				mockFileHandler.On("WriteAccountData", mock.MatchedBy(func(data map[string]string) bool {
-					return data["Location"] == string(tt.input)
-				})).Return(tt.writeError)
-			} else if len(tt.input) == 0 {
-				// For empty input, no WriteAccountData call should be made
-				mockFileHandler.On("WriteAccountData", mock.Anything).Maybe().Return(tt.writeError)
-				return
-			}
-
-			// Create the Handlers instance with the mock file handler
-			h := &Handlers{
-				accountFileHandler: mockFileHandler,
-			}
-
-			// Call Save Location
-			result, err := h.SaveLocation(context.Background(), "save_location", tt.input)
-
-			if err != nil {
-				t.Fatalf("Failed to save location with error: %v", err)
-			}
-
-			savedData, err := h.accountFileHandler.ReadAccountData()
-			if err == nil {
-				//Assert that the input provided is what was saved into the file
-				assert.Equal(t, string(tt.input), savedData["Location"])
-			}
-
-			// Assert the results
-			assert.Equal(t, tt.expectedResult, result)
-			assert.Equal(t, tt.expectedError, err)
-
-			// Assert all expectations were met
-			mockFileHandler.AssertExpectations(t)
-		})
-	}
-}
-
-func TestSaveFirstname(t *testing.T) {
-	// Create a new instance of MockAccountFileHandler
-	mockFileHandler := new(mocks.MockAccountFileHandler)
-
-	// Define test cases
-	tests := []struct {
-		name           string
-		input          []byte
-		existingData   map[string]string
-		writeError     error
-		expectedResult resource.Result
-		expectedError  error
-	}{
-		{
-			name:           "Successful Save",
-			input:          []byte("Joe"),
-			existingData:   map[string]string{"Name": "Joe"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-		},
-		{
-			name:          "Empty Input",
-			input:         []byte{},
-			existingData:  map[string]string{"OtherKey": "OtherValue"},
-			writeError:    nil,
-			expectedError: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set up the mock expectations
-			mockFileHandler.On("ReadAccountData").Return(tt.existingData, tt.expectedError)
-			if tt.expectedError == nil && len(tt.input) > 0 {
-				mockFileHandler.On("WriteAccountData", mock.MatchedBy(func(data map[string]string) bool {
-					return data["FirstName"] == string(tt.input)
-				})).Return(tt.writeError)
-			} else if len(tt.input) == 0 {
-				// For empty input, no WriteAccountData call should be made
-				mockFileHandler.On("WriteAccountData", mock.Anything).Maybe().Return(tt.writeError)
-				return
-			}
-
-			// Create the Handlers instance with the mock file handler
-			h := &Handlers{
-				accountFileHandler: mockFileHandler,
-			}
-
-			// Call save location
-			result, err := h.SaveFirstname(context.Background(), "save_location", tt.input)
-
-			if err != nil {
-				t.Fatalf("Failed to save first name with error: %v", err)
-			}
-			savedData, err := h.accountFileHandler.ReadAccountData()
-			if err == nil {
-				//Assert that the input provided is what was saved into the file
-				assert.Equal(t, string(tt.input), savedData["FirstName"])
-			}
-
-			// Assert the results
-			assert.Equal(t, tt.expectedResult, result)
-			assert.Equal(t, tt.expectedError, err)
-
-			// Assert all expectations were met
-			mockFileHandler.AssertExpectations(t)
-		})
-	}
-}
-
-func TestSaveFamilyName(t *testing.T) {
-	// Create a new instance of MockAccountFileHandler
-	mockFileHandler := new(mocks.MockAccountFileHandler)
-
-	// Define test cases
-	tests := []struct {
-		name           string
-		input          []byte
-		existingData   map[string]string
-		writeError     error
-		expectedResult resource.Result
-		expectedError  error
-	}{
-		{
-			name:           "Successful Save",
-			input:          []byte("Doe"),
-			existingData:   map[string]string{"FamilyName": "Doe"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-		},
-		{
-			name:          "Empty Input",
-			input:         []byte{},
-			existingData:  map[string]string{"FamilyName": "Doe"},
-			writeError:    nil,
-			expectedError: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set up the mock expectations
-			mockFileHandler.On("ReadAccountData").Return(tt.existingData, tt.expectedError)
-			if tt.expectedError == nil && len(tt.input) > 0 {
-				mockFileHandler.On("WriteAccountData", mock.MatchedBy(func(data map[string]string) bool {
-					return data["FamilyName"] == string(tt.input)
-				})).Return(tt.writeError)
-			} else if len(tt.input) == 0 {
-				// For empty input, no WriteAccountData call should be made
-				mockFileHandler.On("WriteAccountData", mock.Anything).Maybe().Return(tt.writeError)
-				return
-			}
-
-			// Create the Handlers instance with the mock file handler
-			h := &Handlers{
-				accountFileHandler: mockFileHandler,
-			}
-
-			// Call save familyname
-			result, err := h.SaveFamilyname(context.Background(), "save_familyname", tt.input)
-
-			if err != nil {
-				t.Fatalf("Failed to save family name with error: %v", err)
-			}
-			savedData, err := h.accountFileHandler.ReadAccountData()
-			if err == nil {
-				//Assert that the input provided is what was saved into the file
-				assert.Equal(t, string(tt.input), savedData["FamilyName"])
-			}
-
-			// Assert the results
-			assert.Equal(t, tt.expectedResult, result)
-			assert.Equal(t, tt.expectedError, err)
-
-			// Assert all expectations were met
-			mockFileHandler.AssertExpectations(t)
-		})
-	}
-}
-
-func TestSaveYOB(t *testing.T) {
-	// Create a new instance of MockAccountFileHandler
-	mockFileHandler := new(mocks.MockAccountFileHandler)
-
-	// Define test cases
-	tests := []struct {
-		name           string
-		input          []byte
-		existingData   map[string]string
-		writeError     error
-		expectedResult resource.Result
-		expectedError  error
-	}{
-		{
-			name:           "Successful Save",
-			input:          []byte("2006"),
-			existingData:   map[string]string{"": ""},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-		},
-		{
-			name:          "YOB less than 4 digits(invalid date entry)",
-			input:         []byte{},
-			existingData:  map[string]string{"": ""},
-			writeError:    nil,
-			expectedError: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set up the mock expectations
-			mockFileHandler.On("ReadAccountData").Return(tt.existingData, tt.expectedError)
-			if tt.expectedError == nil && len(tt.input) > 0 {
-				mockFileHandler.On("WriteAccountData", mock.MatchedBy(func(data map[string]string) bool {
-					return data["YOB"] == string(tt.input)
-				})).Return(tt.writeError)
-			} else if len(tt.input) != 4 {
-				// For input whose input is not a valid yob, no WriteAccountData call should be made
-				mockFileHandler.On("WriteAccountData", mock.Anything).Maybe().Return(tt.writeError)
-				return
-			}
-
-			// Create the Handlers instance with the mock file handler
-			h := &Handlers{
-				accountFileHandler: mockFileHandler,
-			}
-
-			// Call save yob
-			result, err := h.SaveYob(context.Background(), "save_yob", tt.input)
-
-			if err != nil {
-				t.Fatalf("Failed to save family name with error: %v", err)
-			}
-			savedData, err := h.accountFileHandler.ReadAccountData()
-			if err == nil {
-				//Assert that the input provided is what was saved into the file
-				assert.Equal(t, string(tt.input), savedData["YOB"])
-			}
-
-			// Assert the results
-			assert.Equal(t, tt.expectedResult, result)
-			assert.Equal(t, tt.expectedError, err)
-
-			// Assert all expectations were met
-			mockFileHandler.AssertExpectations(t)
-		})
-	}
-}
-
-func TestSaveOfferings(t *testing.T) {
-	// Create a new instance of MockAccountFileHandler
-	mockFileHandler := new(mocks.MockAccountFileHandler)
-
-	// Define test cases
-	tests := []struct {
-		name           string
-		input          []byte
-		existingData   map[string]string
-		writeError     error
-		expectedResult resource.Result
-		expectedError  error
-	}{
-		{
-			name:           "Successful Save",
-			input:          []byte("Bananas"),
-			existingData:   map[string]string{"": ""},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-		},
-		{
-			name:          "Empty input",
-			input:         []byte{},
-			existingData:  map[string]string{"": ""},
-			writeError:    nil,
-			expectedError: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set up the mock expectations
-			mockFileHandler.On("ReadAccountData").Return(tt.existingData, tt.expectedError)
-			if tt.expectedError == nil && len(tt.input) > 0 {
-				mockFileHandler.On("WriteAccountData", mock.MatchedBy(func(data map[string]string) bool {
-					return data["Offerings"] == string(tt.input)
-				})).Return(tt.writeError)
-			} else if len(tt.input) != 4 {
-				// For input whose input is not a valid yob, no WriteAccountData call should be made
-				mockFileHandler.On("WriteAccountData", mock.Anything).Maybe().Return(tt.writeError)
-				return
-			}
-
-			// Create the Handlers instance with the mock file handler
-			h := &Handlers{
-				accountFileHandler: mockFileHandler,
-			}
-
-			// Call save yob
-			result, err := h.SaveOfferings(context.Background(), "save_offerings", tt.input)
-
-			if err != nil {
-				t.Fatalf("Failed to save offerings with error: %v", err)
-			}
-			savedData, err := h.accountFileHandler.ReadAccountData()
-			if err == nil {
-				//Assert that the input provided is what was saved into the file
-				assert.Equal(t, string(tt.input), savedData["Offerings"])
-			}
-
-			// Assert the results
-			assert.Equal(t, tt.expectedResult, result)
-			assert.Equal(t, tt.expectedError, err)
-
-			// Assert all expectations were met
-			mockFileHandler.AssertExpectations(t)
-		})
-	}
-}
-
-
-func TestSaveGender(t *testing.T) {
-	// Create a new instance of MockAccountFileHandler
-	mockFileHandler := new(mocks.MockAccountFileHandler)
-
-	// Define test cases
-	tests := []struct {
-		name           string
-		input          []byte
-		existingData   map[string]string
-		writeError     error
-		expectedResult resource.Result
-		expectedError  error
-		expectedGender string
-	}{
-		{
-			name:           "Successful Save - Male",
-			input:          []byte("1"),
-			existingData:   map[string]string{"OtherKey": "OtherValue"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-			expectedGender: "Male",
-		},
-		{
-			name:           "Successful Save - Female",
-			input:          []byte("2"),
-			existingData:   map[string]string{"OtherKey": "OtherValue"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-			expectedGender: "Female",
-		},
-		{
-			name:           "Successful Save - Unspecified",
-			input:          []byte("3"),
-			existingData:   map[string]string{"OtherKey": "OtherValue"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-			expectedGender: "Unspecified",
-		},
-	
-		{
-			name:           "Empty Input",
-			input:          []byte{},
-			existingData:   map[string]string{"OtherKey": "OtherValue"},
-			writeError:     nil,
-			expectedResult: resource.Result{},
-			expectedError:  nil,
-			expectedGender: "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set up the mock expectations
-			mockFileHandler.On("ReadAccountData").Return(tt.existingData, tt.expectedError)
-			if tt.expectedError == nil && len(tt.input) > 0 {
-				mockFileHandler.On("WriteAccountData", mock.MatchedBy(func(data map[string]string) bool {
-					return data["Gender"] == tt.expectedGender
-				})).Return(tt.writeError)
-			}  else if len(tt.input) == 0 {
-				// For empty input, no WriteAccountData call should be made
-				mockFileHandler.On("WriteAccountData", mock.Anything).Maybe().Return(tt.writeError)
-			}
-
-			// Create the Handlers instance with the mock file handler
-			h := &Handlers{
-				accountFileHandler: mockFileHandler,
-			}
-
-			// Call the method
-			result, err := h.SaveGender(context.Background(), "save_gender", tt.input)
-
-			// Assert the results
-			assert.Equal(t, tt.expectedResult, result)
-			assert.Equal(t, tt.expectedError, err)
-
-			// Verify WriteAccountData was called with the expected data
-			if len(tt.input) > 0 && tt.expectedError == nil {
-				mockFileHandler.AssertCalled(t, "WriteAccountData", mock.MatchedBy(func(data map[string]string) bool {
-					return data["Gender"] == tt.expectedGender
-				}))
-			}
-
-			// Assert all expectations were met
-			mockFileHandler.AssertExpectations(t)
-		})
-	}
-}
-
-func TestGetSender(t *testing.T) {
-	mockAccountFileHandler := new(mocks.MockAccountFileHandler)
-	h := &Handlers{
-		accountFileHandler: mockAccountFileHandler,
-	}
-
-	tests := []struct {
-		name           string
-		expectedResult resource.Result
-		accountData    map[string]string
-	}{
-		{
-			name: "Valid public key",
-			expectedResult: resource.Result{
-				Content: "test-public-key",
-			},
-			accountData: map[string]string{
-				"PublicKey": "test-public-key",
-			},
-		},
-		{
-			name: "Missing public key",
-			expectedResult: resource.Result{
-				Content: "",
-			},
-			accountData: map[string]string{},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Reset the mock state
-			mockAccountFileHandler.Mock = mock.Mock{}
-
-			mockAccountFileHandler.On("ReadAccountData").Return(tt.accountData, nil)
-
-			result, err := h.GetSender(context.Background(), "", nil)
-
-			if err != nil {
-				t.Fatalf("Error occurred: %v", err)
-			}
-
-			assert.Equal(t, tt.expectedResult.Content, result.Content)
-			mockAccountFileHandler.AssertCalled(t, "ReadAccountData")
-		})
-	}
-}
-
-func TestGetAmount(t *testing.T) {
-	mockAccountFileHandler := new(mocks.MockAccountFileHandler)
-	h := &Handlers{
-		accountFileHandler: mockAccountFileHandler,
-	}
-
-	tests := []struct {
-		name           string
-		expectedResult resource.Result
-		accountData    map[string]string
-	}{
-		{
-			name: "Valid amount",
-			expectedResult: resource.Result{
-				Content: "0.003",
-			},
-			accountData: map[string]string{
-				"Amount": "0.003",
-			},
-		},
-		{
-			name:           "Missing amount",
-			expectedResult: resource.Result{},
-			accountData: map[string]string{
-				"Amount": "",
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Reset the mock state
-			mockAccountFileHandler.Mock = mock.Mock{}
-
-			mockAccountFileHandler.On("ReadAccountData").Return(tt.accountData, nil)
-
-			result, err := h.GetAmount(context.Background(), "", nil)
-
-			assert.NoError(t, err)
-			assert.Equal(t, tt.expectedResult.Content, result.Content)
-
-			mockAccountFileHandler.AssertCalled(t, "ReadAccountData")
-		})
-	}
-}
-

internal/handlers/ussd/mocks/mocks.go

@@ -1,44 +0,0 @@
-package mocks
-
-import (
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/stretchr/testify/mock"
-)
-
-type MockAccountFileHandler struct {
-	mock.Mock
-}
-
-func (m *MockAccountFileHandler) EnsureFileExists() error {
-	args := m.Called()
-	return args.Error(0)
-}
-
-func (m *MockAccountFileHandler) ReadAccountData() (map[string]string, error) {
-	args := m.Called()
-	return args.Get(0).(map[string]string), args.Error(1)
-}
-
-func (m *MockAccountFileHandler) WriteAccountData(data map[string]string) error {
-	args := m.Called(data)
-	return args.Error(0)
-}
-
-type MockAccountService struct {
-	mock.Mock
-}
-
-func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
-	args := m.Called()
-	return args.Get(0).(*models.AccountResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckAccountStatus(TrackingId string) (string, error) {
-	args := m.Called()
-	return args.Get(0).(string), args.Error(1)
-}
-
-func (m *MockAccountService) CheckBalance(PublicKey string) (string, error) {
-	args := m.Called()
-	return args.Get(0).(string), args.Error(1)
-}

internal/models/accountresponse.go

@@ -1,15 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-
-)
-
-type AccountResponse struct {
-	Ok     bool `json:"ok"`
-	Result struct {
-		CustodialId json.Number `json:"custodialId"`
-		PublicKey   string      `json:"publicKey"`
-		TrackingId  string      `json:"trackingId"`
-	} `json:"result"`
-}

internal/models/balanceresponse.go

@@ -1,12 +0,0 @@
-package models
-
-import "encoding/json"
-
-
-type BalanceResponse struct {
-	Ok     bool `json:"ok"`
-	Result struct {
-		Balance string      `json:"balance"`
-		Nonce   json.Number `json:"nonce"`
-	} `json:"result"`
-}

internal/models/flags.go

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

internal/models/trackstatusresponse.go

@@ -1,20 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-	"time"
-)
-
-
-type TrackStatusResponse struct {
-	Ok     bool `json:"ok"`
-	Result struct {
-		Transaction struct {
-			CreatedAt     time.Time   `json:"createdAt"`
-			Status        string      `json:"status"`
-			TransferValue json.Number `json:"transferValue"`
-			TxHash        string      `json:"txHash"`
-			TxType        string      `json:"txType"`
-		}
-	} `json:"result"`
-}

internal/utils/account_utils.go

@@ -1,46 +0,0 @@
-package utils
-
-import (
-	"encoding/json"
-	"os"
-)
-
-type AccountFileHandler struct {
-	FilePath string
-}
-
-func NewAccountFileHandler(path string) *AccountFileHandler {
-	return &AccountFileHandler{FilePath: path}
-}
-
-func (afh *AccountFileHandler) ReadAccountData() (map[string]string, error) {
-	jsonData, err := os.ReadFile(afh.FilePath)
-	if err != nil {
-		return nil, err
-	}
-
-	var accountData map[string]string
-	err = json.Unmarshal(jsonData, &accountData)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountData, nil
-}
-
-func (afh *AccountFileHandler) WriteAccountData(accountData map[string]string) error {
-	jsonData, err := json.Marshal(accountData)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(afh.FilePath, jsonData, 0644)
-}
-
-func (afh *AccountFileHandler) EnsureFileExists() error {
-	f, err := os.OpenFile(afh.FilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		return err
-	}
-	return f.Close()
-}

internal/utils/age.go

@@ -1,35 +0,0 @@
-package utils
-
-import "time"
-
-// CalculateAge calculates the age based on a given birthdate and the current date in the format dd/mm/yy
-// It adjusts for cases where the current date is before the birthday in the current year.
-func CalculateAge(birthdate, today time.Time) int {
-	today = today.In(birthdate.Location())
-	ty, tm, td := today.Date()
-	today = time.Date(ty, tm, td, 0, 0, 0, 0, time.UTC)
-	by, bm, bd := birthdate.Date()
-	birthdate = time.Date(by, bm, bd, 0, 0, 0, 0, time.UTC)
-	if today.Before(birthdate) {
-		return 0
-	}
-	age := ty - by
-	anniversary := birthdate.AddDate(age, 0, 0)
-	if anniversary.After(today) {
-		age--
-	}
-	return age
-}
-
-// CalculateAgeWithYOB calculates the age based on the given year of birth (YOB).
-// It subtracts the YOB from the current year to determine the age.
-//
-// Parameters:
-//   yob: The year of birth as an integer.
-//
-// Returns:
-//   The calculated age as an integer.
-func CalculateAgeWithYOB(yob int) int {
-    currentYear := time.Now().Year()
-    return currentYear - yob
-}

internal/utils/filehandler.go

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

request/base.go

@@ -0,0 +1,110 @@
+package request
+
+import (
+	"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/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/errors"
+	"git.grassecon.net/grassrootseconomics/visedriver/entry"
+)
+
+type BaseRequestHandler struct {
+	cfgTemplate engine.Config
+	rp RequestParser
+	rs resource.Resource
+	hn entry.EntryHandler
+	provider storage.StorageProvider
+}
+
+//func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *handlers.Handlers) *BaseRequestHandler {
+func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn entry.EntryHandler) *BaseRequestHandler {
+	return &BaseRequestHandler{
+		cfgTemplate: cfg,
+		rs:          rs,
+		hn:          hn,
+		rp:          rp,
+		provider:    storage.NewSimpleStorageProvider(stateDb, userdataDb),
+	}
+}
+
+func (f *BaseRequestHandler) Shutdown() {
+	err := f.provider.Close()
+	if err != nil {
+		logg.Errorf("handler shutdown error", "err", err)
+	}
+}
+
+func (f *BaseRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
+	en := engine.NewEngine(cfg, rs)
+	en = en.WithPersister(pr)
+	return en
+}
+
+func(f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error) {
+	var r bool
+	var err error
+	var ok bool
+
+	logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
+
+	rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
+	if err != nil {
+		logg.ErrorCtxf(rqs.Ctx, "", "storage get error", err)
+		return rqs, errors.ErrStorage
+	}
+
+	//f.hn = f.hn.WithPersister(rqs.Storage.Persister)
+	f.hn.SetPersister(rqs.Storage.Persister)
+	defer func() {
+		f.hn.Exit()
+	}()
+	eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
+	en, ok := eni.(*engine.DefaultEngine)
+	if !ok {
+		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, errors.ErrEngineType
+	}
+	en = en.WithFirst(f.hn.Init)
+	if rqs.Config.EngineDebug {
+		en = en.WithDebug(nil)
+	}
+	rqs.Engine = en
+
+	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
+	}
+
+	rqs.Continue = r
+	return rqs, nil
+}
+
+func(f *BaseRequestHandler) Output(rqs RequestSession) (RequestSession,  error) {
+	var err error
+	_, err = rqs.Engine.Flush(rqs.Ctx, rqs.Writer)
+	return rqs, err
+}
+
+func(f *BaseRequestHandler) Reset(rqs RequestSession) (RequestSession, error) {
+	defer f.provider.Put(rqs.Config.SessionId, rqs.Storage)
+	return rqs, rqs.Engine.Finish()
+}
+
+func (f *BaseRequestHandler) GetConfig() engine.Config {
+	return f.cfgTemplate
+}
+
+func(f *BaseRequestHandler) GetRequestParser() RequestParser {
+	return f.rp
+}

request/http/parse.go

@@ -0,0 +1,37 @@
+package http
+
+import (
+	"context"
+	"io/ioutil"
+	"net/http"
+
+	"git.grassecon.net/grassrootseconomics/visedriver/errors"
+)
+
+type DefaultRequestParser struct {
+}
+
+func (rp *DefaultRequestParser) GetSessionId(ctx context.Context, rq any) (string, error) {
+	rqv, ok := rq.(*http.Request)
+	if !ok {
+		return "", errors.ErrInvalidRequest
+	}
+	v := rqv.Header.Get("X-Vise-Session")
+	if v == "" {
+		return "", errors.ErrSessionMissing
+	}
+	return v, nil
+}
+
+func (rp *DefaultRequestParser) GetInput(rq any) ([]byte, error) {
+	rqv, ok := rq.(*http.Request)
+	if !ok {
+		return nil, errors.ErrInvalidRequest
+	}
+	defer rqv.Body.Close()
+	v, err := ioutil.ReadAll(rqv.Body)
+	if err != nil {
+		return nil, err
+	}
+	return v, nil
+}

request/http/server.go

@@ -0,0 +1,92 @@
+package http
+
+import (
+	"net/http"
+	"strconv"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"git.grassecon.net/grassrootseconomics/visedriver/errors"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("visedriver.http.session")
+)
+
+// HTTPRequestHandler implements the session handler for HTTP
+type HTTPRequestHandler struct {
+	request.RequestHandler
+}
+
+func (f *HTTPRequestHandler) WriteError(w http.ResponseWriter, code int, err error) {
+	s := err.Error()
+	w.Header().Set("Content-Length", strconv.Itoa(len(s)))
+	w.WriteHeader(code)
+	_, err = w.Write([]byte(s))
+	if err != nil {
+		logg.Errorf("error writing error!!", "err", err, "olderr", s)
+		w.WriteHeader(500)
+	}
+}
+
+func NewHTTPRequestHandler(h request.RequestHandler) *HTTPRequestHandler {
+	return &HTTPRequestHandler{
+		RequestHandler: h,
+	}
+}
+
+func (hh *HTTPRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	var code int
+	var err error
+	var perr error
+
+	rqs := request.RequestSession{
+		Ctx:    req.Context(),
+		Writer: w,
+	}
+
+	rp := hh.GetRequestParser()
+	cfg := hh.GetConfig()
+	cfg.SessionId, err = rp.GetSessionId(req.Context(), req)
+	if err != nil {
+		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
+		hh.WriteError(w, 400, err)
+	}
+	rqs.Config = cfg
+	rqs.Input, err = rp.GetInput(req)
+	if err != nil {
+		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
+		hh.WriteError(w, 400, err)
+		return
+	}
+
+	rqs, err = hh.Process(rqs)
+	switch err {
+	case errors.ErrStorage:
+		code = 500
+	case errors.ErrEngineInit:
+		code = 500
+	case errors.ErrEngineExec:
+		code = 500
+	default:
+		code = 200
+	}
+
+	if code != 200 {
+		hh.WriteError(w, 500, err)
+		return
+	}
+
+	w.WriteHeader(200)
+	w.Header().Set("Content-Type", "text/plain")
+	rqs, err = hh.Output(rqs)
+	rqs, perr = hh.Reset(rqs)
+	if err != nil {
+		hh.WriteError(w, 500, err)
+		return
+	}
+	if perr != nil {
+		hh.WriteError(w, 500, perr)
+		return
+	}
+}

request/http/server_test.go

@@ -0,0 +1,233 @@
+package http
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"git.defalsify.org/vise.git/engine"
+	viseerrors "git.grassecon.net/grassrootseconomics/visedriver/errors"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks/httpmocks"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+)
+
+// 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 TestRequestHandler_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:      viseerrors.ErrSessionMissing,
+			expectedStatus: http.StatusBadRequest,
+		},
+		{
+			name:           "Process Error",
+			sessionID:      "123",
+			input:          []byte("test input"),
+			processErr:     viseerrors.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 request.RequestSession) (request.RequestSession, error) {
+					return rs, tt.processErr
+				},
+				OutputFunc: func(rs request.RequestSession) (request.RequestSession, error) {
+					return rs, tt.outputErr
+				},
+				ResetFunc: func(rs request.RequestSession) (request.RequestSession, error) {
+					return rs, tt.resetErr
+				},
+				GetRequestParserFunc: func() request.RequestParser {
+					return mockRequestParser
+				},
+				GetConfigFunc: func() engine.Config {
+					return engine.Config{}
+				},
+			}
+
+			sessionHandler := &HTTPRequestHandler{
+				RequestHandler: 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 TestRequestHandler_WriteError(t *testing.T) {
+	handler := &HTTPRequestHandler{}
+	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: viseerrors.ErrSessionMissing,
+		},
+		{
+			name:          "Invalid Request Type",
+			request:       invalidRequestType{},
+			expectedID:    "",
+			expectedError: viseerrors.ErrInvalidRequest,
+		},
+	}
+
+	parser := &DefaultRequestParser{}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			id, err := parser.GetSessionId(context.Background(),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: viseerrors.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)
+			}
+		})
+	}
+}

request/request.go

@@ -0,0 +1,42 @@
+package request
+
+import (
+	"context"
+	"io"
+
+	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/persist"
+	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("visedriver.request")
+)
+
+type RequestSession struct {
+	Ctx context.Context
+	Config engine.Config
+	Engine engine.Engine
+	Input []byte
+	Storage *storage.Storage
+	Writer io.Writer
+	Continue bool
+}
+
+// TODO: seems like can remove this.
+type RequestParser interface {
+	GetSessionId(ctx context.Context, rq any) (string, error)
+	GetInput(rq any) ([]byte, error)
+}
+
+type RequestHandler interface {
+	GetConfig() engine.Config
+	GetRequestParser() RequestParser
+	GetEngine(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine 
+	Process(rs RequestSession) (RequestSession, error)
+	Output(rs RequestSession) (RequestSession, error)
+	Reset(rs RequestSession) (RequestSession, error)
+	Shutdown()
+}

sample_tokens.json

@@ -0,0 +1,44 @@
+{
+    "ok": true,
+    "description": "Token holdings with current balances",
+    "result": {
+      "holdings": [
+        {
+          "contractAddress": "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
+          "tokenSymbol": "FSPTST",
+          "tokenDecimals": "6",
+          "balance": "8869964242"
+        },
+        {
+          "contractAddress": "0x724F2910D790B54A39a7638282a45B1D83564fFA",
+          "tokenSymbol": "GEO",
+          "tokenDecimals": "6",
+          "balance": "9884"
+        },
+        {
+          "contractAddress": "0x2105a206B7bec31E2F90acF7385cc8F7F5f9D273",
+          "tokenSymbol": "MFNK",
+          "tokenDecimals": "6",
+          "balance": "19788697"
+        },
+        {
+          "contractAddress": "0x63DE2Ac8D1008351Cc69Fb8aCb94Ba47728a7E83",
+          "tokenSymbol": "MILO",
+          "tokenDecimals": "6",
+          "balance": "75"
+        },
+        {
+          "contractAddress": "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+          "tokenSymbol": "SOHAIL",
+          "tokenDecimals": "6",
+          "balance": "27874115"
+        },
+        {
+          "contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
+          "tokenSymbol": "SRF",
+          "tokenDecimals": "6",
+          "balance": "2745987"
+        }
+      ]
+    }
+  }

services/registration/Makefile

@@ -1,17 +0,0 @@
-# Variables to match files in the current directory
-INPUTS = $(wildcard ./*.vis)
-TXTS = $(wildcard ./*.txt.orig)
-
-# Rule to build .bin files from .vis files
-%.vis:
-	go run ../../go-vise/dev/asm $(basename $@).vis > $(basename $@).bin
-	@echo "Built $(basename $@).bin from $(basename $@).vis"
-
-# Rule to copy .orig files to .txt
-%.txt.orig:
-	cp -v $(basename $@).orig $(basename $@)
-	@echo "Copied $(basename $@).orig to $(basename $@)"
-
-# 'all' target depends on all .vis and .txt.orig files
-all: $(INPUTS) $(TXTS)
-	@echo "Running all: $(INPUTS) $(TXTS)"

services/registration/account_creation

@@ -1 +0,0 @@
-Your account is being created...

services/registration/account_creation.vis

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

services/registration/account_creation_failed

@@ -1 +0,0 @@
-Your account creation request failed. Please try again later.

services/registration/account_creation_failed.vis

@@ -1,3 +0,0 @@
-MOUT quit 9
-HALT
-INCMP quit 9

services/registration/account_creation_failed_swa

@@ -1 +0,0 @@
-Ombi lako la kusajiliwa haliwezi kukamilishwa. Tafadhali jaribu tena baadaye.

services/registration/account_creation_swa

@@ -1 +0,0 @@
-Akaunti yako inatengenezwa...

services/registration/account_menu

@@ -1 +0,0 @@
-My Account

services/registration/account_menu_swa

@@ -1 +0,0 @@
-Akaunti yangu

services/registration/account_pending

@@ -1 +0,0 @@
-Your account is still being created.

services/registration/account_pending.vis

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

services/registration/account_pending_swa

@@ -1 +0,0 @@
-Akaunti yako bado inatengenezwa

services/registration/address

@@ -1 +0,0 @@
-Address: {{.check_identifier}}

services/registration/address.vis

@@ -1,6 +0,0 @@
-LOAD check_identifier 0
-RELOAD check_identifier
-MAP check_identifier
-MOUT quit 9
-HALT
-INCMP quit 9

services/registration/amount

@@ -1,2 +0,0 @@
-Maximum amount: {{.max_amount}}
-Enter amount:

services/registration/amount.vis

@@ -1,12 +0,0 @@
-LOAD reset_transaction_amount 0
-LOAD max_amount 10
-MAP max_amount
-MOUT back 0
-HALT
-LOAD validate_amount 64
-RELOAD validate_amount
-CATCH invalid_amount 17 1
-INCMP _ 0
-LOAD get_recipient 12
-LOAD get_sender 64
-INCMP transaction_pin *

services/registration/amount_swa

@@ -1,2 +0,0 @@
-Kiwango cha juu: {{.max_amount}}
-Weka kiwango:

services/registration/back_menu

@@ -1 +0,0 @@
-Back

services/registration/back_menu_swa

@@ -1 +0,0 @@
-Rudi

services/registration/balances

@@ -1 +0,0 @@
-Balances:

services/registration/balances.vis

@@ -1,8 +0,0 @@
-LOAD reset_unlocked 0
-MOUT my_balance 1
-MOUT community_balance 2
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP my_balance 1
-INCMP community_balance 2

services/registration/balances_swa

@@ -1 +0,0 @@
-Salio

services/registration/change_language_menu

@@ -1 +0,0 @@
-Change language

services/registration/change_language_menu_swa

@@ -1 +0,0 @@
-Badili lugha

services/registration/change_pin_menu

@@ -1 +0,0 @@
-Change PIN

services/registration/change_pin_menu_swa

@@ -1 +0,0 @@
-Badili PIN

services/registration/check_balance_menu

@@ -1 +0,0 @@
-Check balances

services/registration/check_balance_menu_swa

@@ -1 +0,0 @@
-Angalia salio

services/registration/check_statement_menu

@@ -1 +0,0 @@
-Check statement

services/registration/check_statement_menu_swa

@@ -1 +0,0 @@
-Taarifa ya matumizi

services/registration/comminity_balance_swa

@@ -1 +0,0 @@
-Salio la kikundi

services/registration/community_balance

@@ -1,2 +0,0 @@
-Your community balance is: 0.00SRF
-

services/registration/community_balance.vis

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

services/registration/community_balance_menu

@@ -1 +0,0 @@
-Community  balance

services/registration/community_balance_menu_swa

@@ -1 +0,0 @@
-Salio la kikundi

services/registration/confirm_create_pin

@@ -1 +0,0 @@
-Enter your four number PIN again:

services/registration/confirm_create_pin.vis

@@ -1,4 +0,0 @@
-LOAD save_pin 0
-HALT
-LOAD verify_pin 8
-INCMP account_creation *

services/registration/confirm_create_pin_swa

@@ -1 +0,0 @@
-Weka PIN yako tena:

services/registration/create_pin

@@ -1 +0,0 @@
-Please enter a new four number PIN for your account:

services/registration/create_pin.vis

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

services/registration/create_pin_mismatch

@@ -1 +0,0 @@
-The PIN is not a match. Try again

services/registration/create_pin_mismatch.vis

@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_create_pin 1
-INCMP quit 9

services/registration/create_pin_mismatch_swa

@@ -1 +0,0 @@
-PIN uliyoweka haifanani. Jaribu tena

services/registration/create_pin_swa

@@ -1 +0,0 @@
-Tafadhali weka PIN mpya yenye nambari nne kwa akaunti yako:

services/registration/display_profile_info

@@ -1,5 +0,0 @@
-Wasifu wangu
-Name: Not provided
-Gender: Not provided
-Age: Not provided
-Location: Not provided

services/registration/display_profile_info.vis

@@ -1,3 +0,0 @@
-MOUT back 0
-HALT
-INCMP _ 0

services/registration/edit_gender_menu

@@ -1 +0,0 @@
-Edit gender

services/registration/edit_gender_menu_swa

@@ -1 +0,0 @@
-Weka jinsia

services/registration/edit_location_menu

@@ -1 +0,0 @@
-Edit location

services/registration/edit_location_menu_swa

@@ -1 +0,0 @@
-Weka eneo

services/registration/edit_name_menu

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

services/registration/edit_name_menu_swa

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

services/registration/edit_offerings_menu

@@ -1 +0,0 @@
-Edit offerings

services/registration/edit_offerings_menu_swa

@@ -1 +0,0 @@
-Weka unachouza

services/registration/edit_profile

@@ -1 +0,0 @@
-My profile

services/registration/edit_profile.vis

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

services/registration/edit_profile_swa

@@ -1 +0,0 @@
-Wasifu wangu

services/registration/edit_yob_menu

@@ -1 +0,0 @@
-Edit year of birth

services/registration/edit_yob_menu_swa

@@ -1 +0,0 @@
-Weka mwaka wa kuzaliwa

services/registration/enter_familyname

@@ -1 +0,0 @@
-Enter family name:

services/registration/enter_familyname.vis

@@ -1,5 +0,0 @@
-LOAD save_firstname 0
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP select_gender *

services/registration/enter_location

@@ -1 +0,0 @@
-Enter your location:

services/registration/enter_location.vis

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

services/registration/enter_location_swa

@@ -1 +0,0 @@
-Weka eneo:

services/registration/enter_name

@@ -1 +0,0 @@
-Enter your first names:

services/registration/enter_name.vis

@@ -1,4 +0,0 @@
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP enter_familyname *

services/registration/enter_name_swa

@@ -1 +0,0 @@
-Weka majina yako ya kwanza:

services/registration/enter_offerings

@@ -1 +0,0 @@
-Enter the services or goods you offer: 

services/registration/enter_offerings.vis

@@ -1,8 +0,0 @@
-LOAD save_location 0
-CATCH incorrect_pin 15 1
-CATCH update_success 16 1
-MOUT back 0
-HALT
-LOAD save_offerings 0
-INCMP _ 0
-INCMP pin_entry *