Merge branch 'master' into test-coverage-bump

Dockerfile

@@ -21,7 +21,7 @@ RUN make VISE_PATH=/build/go-vise -B
 WORKDIR /build/sarafu-vise
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
-RUN go build -tags logdebug,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
+RUN go build -tags logtrace,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
 
 FROM debian:bookworm-slim
 

cmd/africastalking/main.go

@@ -44,7 +44,6 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string
 
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -56,7 +55,6 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()
 
 	config.Apply(override)
@@ -102,11 +100,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, "userdatadb: %v\n", err)
 		os.Exit(1)
 	}
-	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -120,7 +113,6 @@ func main() {
 		os.Exit(1)
 	}
 	lhs.SetDataStore(&userdataStore)
-	lhs.SetLogDb(&logdb)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "setdatastore: %v\n", err)
 		os.Exit(1)

cmd/async/main.go

@@ -56,7 +56,6 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -70,7 +69,6 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()
 
 	config.Apply(override)
@@ -122,12 +120,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-
-	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
 	//defer userdataStore.Close(ctx)
 
 	dbResource, ok := rs.(*resource.DbResource)
@@ -137,7 +129,6 @@ func main() {
 
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-	lhs.SetLogDb(&logdb)
 
 	accountService := services.New(ctx, menuStorageService)
 	hl, err := lhs.GetHandler(accountService)

cmd/http/main.go

@@ -43,7 +43,6 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string
 
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
 	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
@@ -56,7 +55,6 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()
 
 	config.Apply(override)
@@ -105,12 +103,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
-
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		os.Exit(1)
@@ -118,7 +110,6 @@ func main() {
 
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-	lhs.SetLogDb(&logdb)
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())

cmd/main.go

@@ -36,7 +36,6 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -47,7 +46,6 @@ func main() {
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()
 
 	config.Apply(override)
@@ -112,12 +110,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	logdb, err := menuStorageService.GetLogDb(ctx, userdatastore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
-
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		fmt.Fprintf(os.Stderr, "get dbresource error: %v\n", err)
@@ -126,7 +118,6 @@ func main() {
 
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdatastore)
-	lhs.SetLogDb(&logdb)
 	lhs.SetPersister(pe)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "localhandler service error: %v\n", err)

go.mod

@@ -3,10 +3,10 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce
+	git.defalsify.org/vise.git v0.3.1
-	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b
-	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306
+	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible

go.sum

@@ -1,11 +1,11 @@
-git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce h1:Uke2jQ4wG97gQKnTzxPyBGyhosrU1IWnRNFHtKVrmrk=
+git.defalsify.org/vise.git v0.3.1 h1:A6FhMcur09ft/JzUPGXR+KpA17fltfeBnasyvLMZmq4=
-git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.1/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e h1:DcC9qkNl9ny3hxQmsMK6W81+5R/j4ZwYUbvewMI/rlc=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
-git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f h1:OAHCP3YR1C5h1WFnnEnLs5kn6jTxQHQYWYtQaMZJIMY=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b h1:xiTpaqWWoF5qcnarY/9ZkT6aVdnKwqztb2gzIahJn4w=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2 h1:YFztSsexCUgFo6M0tbngRwYdgJd3LQV3RO/Jw09u3+k=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=

handlers/event/token.go

@@ -49,8 +49,9 @@ func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Iden
 
 // set default token to given symbol.
 func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, activeSym string) error {
+	pfxDb := toPrefixDb(userStore, identity.SessionId)
 	// TODO: the activeSym input should instead be newline separated list?
-	tokenData, err := store.GetVoucherData(ctx, userStore, identity.SessionId, activeSym)
+	tokenData, err := store.GetVoucherData(ctx, pfxDb, activeSym)
 	if err != nil {
 		return err
 	}

handlers/local.go

@@ -27,7 +27,6 @@ type LocalHandlerService struct {
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
-	LogDb         *db.Db
 	Cfg           engine.Config
 	Rs            resource.Resource
 	first         resource.EntryFunc
@@ -58,16 +57,12 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }
 
-func (ls *LocalHandlerService) SetLogDb(db *db.Db) {
-	ls.LogDb = db
-}
-
 func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) (*application.MenuHandlers, error) {
 	replaceSeparatorFunc := func(input string) string {
 		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
 	}
 
-	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, *ls.LogDb, accountService, replaceSeparatorFunc)
+	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}
@@ -104,18 +99,23 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("verify_yob", appHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", appHandlers.ResetIncorrectYob)
 	ls.DbRs.AddLocalFunc("initiate_transaction", appHandlers.InitiateTransaction)
+	ls.DbRs.AddLocalFunc("verify_new_pin", appHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", appHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", appHandlers.QuitWithHelp)
 	ls.DbRs.AddLocalFunc("fetch_community_balance", appHandlers.FetchCommunityBalance)
-	ls.DbRs.AddLocalFunc("manage_vouchers", appHandlers.ManageVouchers)
+	ls.DbRs.AddLocalFunc("set_default_voucher", appHandlers.SetDefaultVoucher)
+	ls.DbRs.AddLocalFunc("check_vouchers", appHandlers.CheckVouchers)
 	ls.DbRs.AddLocalFunc("get_vouchers", appHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", appHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", appHandlers.SetVoucher)
 	ls.DbRs.AddLocalFunc("get_voucher_details", appHandlers.GetVoucherDetails)
+	ls.DbRs.AddLocalFunc("reset_valid_pin", appHandlers.ResetValidPin)
+	ls.DbRs.AddLocalFunc("check_pin_mismatch", appHandlers.CheckBlockedNumPinMisMatch)
 	ls.DbRs.AddLocalFunc("validate_blocked_number", appHandlers.ValidateBlockedNumber)
 	ls.DbRs.AddLocalFunc("retrieve_blocked_number", appHandlers.RetrieveBlockedNumber)
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", appHandlers.ResetUnregisteredNumber)
 	ls.DbRs.AddLocalFunc("reset_others_pin", appHandlers.ResetOthersPin)
+	ls.DbRs.AddLocalFunc("save_others_temporary_pin", appHandlers.SaveOthersTemporaryPin)
 	ls.DbRs.AddLocalFunc("get_current_profile_info", appHandlers.GetCurrentProfileInfo)
 	ls.DbRs.AddLocalFunc("check_transactions", appHandlers.CheckTransactions)
 	ls.DbRs.AddLocalFunc("get_transactions", appHandlers.GetTransactionsList)
@@ -128,8 +128,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("request_custom_alias", appHandlers.RequestCustomAlias)
 	ls.DbRs.AddLocalFunc("get_suggested_alias", appHandlers.GetSuggestedAlias)
 	ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias)
-	ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated)
-	ls.DbRs.AddLocalFunc("reset_api_call_failure", appHandlers.ResetApiCallFailure)
 
 	ls.first = appHandlers.Init
 

internal/sms/sms.go

@@ -1,96 +0,0 @@
-package sms
-
-import (
-	"context"
-	"fmt"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/common/phone"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("smsservice")
-)
-
-type SmsService struct {
-	Accountservice remote.AccountService
-	Userdatastore  store.UserDataStore
-}
-
-// SendUpsellSMS will send an invitation SMS to an unregistered phone number
-func (smsservice *SmsService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) error {
-	if !phone.IsValidPhoneNumber(inviterPhone) {
-		return fmt.Errorf("invalid inviter phone number %v", inviterPhone)
-	}
-
-	if !phone.IsValidPhoneNumber(inviteePhone) {
-		return fmt.Errorf("Invalid invitee phone number %v", inviteePhone)
-	}
-	_, err := smsservice.Accountservice.SendUpsellSMS(ctx, inviterPhone, inviteePhone)
-	if err != nil {
-		return fmt.Errorf("Failed to send upsell sms: %v", err)
-	}
-	return nil
-}
-
-// sendPINResetSMS will send an SMS to a user's phonenumber in the event that the associated account's PIN has been reset.
-func (smsService *SmsService) SendPINResetSMS(ctx context.Context, adminPhoneNumber, blockedPhoneNumber string) error {
-	formattedAdminPhone, err := phone.FormatPhoneNumber(adminPhoneNumber)
-	if err != nil {
-		return fmt.Errorf("failed to format admin phone number: %w", err)
-	}
-
-	formattedBlockedPhone, err := phone.FormatPhoneNumber(blockedPhoneNumber)
-	if err != nil {
-		return fmt.Errorf("failed to format blocked phone number: %w", err)
-	}
-
-	if !phone.IsValidPhoneNumber(formattedAdminPhone) {
-		return fmt.Errorf("invalid admin phone number")
-	}
-	if !phone.IsValidPhoneNumber(formattedBlockedPhone) {
-		return fmt.Errorf("invalid blocked phone number")
-	}
-
-	err = smsService.Accountservice.SendPINResetSMS(ctx, formattedAdminPhone, formattedBlockedPhone)
-	if err != nil {
-		return fmt.Errorf("failed to send pin reset sms: %v", err)
-	}
-
-	return nil
-}
-
-// SendAddressSMS will triger an SMS when a user navigates to the my address node.The SMS will be sent to the associated phonenumber.
-func (smsService *SmsService) SendAddressSMS(ctx context.Context) error {
-	store := smsService.Userdatastore
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return fmt.Errorf("missing session")
-	}
-
-	publicKey, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", storedb.DATA_PUBLIC_KEY, "error", err)
-		return err
-	}
-
-	originPhone, err := phone.FormatPhoneNumber(sessionId)
-	if err != nil {
-		logg.DebugCtxf(ctx, "Failed to format origin phonenumber", "sessionid", sessionId)
-		return nil
-	}
-
-	if !phone.IsValidPhoneNumber(originPhone) {
-		logg.InfoCtxf(ctx, "Invalid origin phone number", "origin phonenumber", originPhone)
-		return fmt.Errorf("invalid origin phone number")
-	}
-	err = smsService.Accountservice.SendAddressSMS(ctx, string(publicKey), originPhone)
-	if err != nil {
-		logg.DebugCtxf(ctx, "Failed to send address sms", "error", err)
-		return fmt.Errorf("Failed to send address sms: %v", err)
-	}
-	return nil
-}

menutraversal_test/group_test.json

@@ -140,6 +140,39 @@
                 }
             ]
         },
+        {
+            "name": "menu_my_account_my_alias",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "3",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "7",
+                    "expectedContent": "Current alias: Not Provided\nEdit my alias:\n0:Back"
+                },
+                {
+                    "input": "foo",
+                    "expectedContent": "Your full alias will be: \nPlease enter your PIN to confirm: \n\n0:Back"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Your alias has been updated successfully\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
         {
             "name": "menu_my_account_reset_others_pin_with_unregistered_number",
             "steps": [
@@ -202,7 +235,23 @@
                 },
                 {
                     "input": "0700000000",
-                    "expectedContent": "{secondary_session_id} will get a PIN reset request.\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                    "expectedContent": "Please enter new PIN for: {secondary_session_id}\n0:Back"
+                },
+                {
+                    "input": "11111",
+                    "expectedContent": "The PIN you have entered is invalid.Please try a 4 digit number instead.\n1:Retry\n9:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Please enter new PIN for: {secondary_session_id}\n0:Back"
+                },
+                {
+                    "input": "1111",
+                    "expectedContent": "Please confirm new PIN for: {secondary_session_id}\n0:Back"
+                },
+                {
+                    "input": "1111",
+                    "expectedContent": "Please enter your PIN:"
                 },
                 {
                     "input": "1234",
@@ -596,7 +645,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: Not Provided\n\n0:Back\n9:Quit"
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: \n\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",

services/registration/address.vis

@@ -1,4 +1,5 @@
 LOAD check_identifier 0
+RELOAD check_identifier
 MAP check_identifier
 MOUT back 0
 MOUT quit 9

services/registration/amount.vis

@@ -1,12 +1,12 @@
 LOAD reset_transaction_amount 0
-LOAD max_amount 40
+LOAD max_amount 10
 RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure flag_api_call_error 1
+CATCH api_failure flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 0

services/registration/api_failure

@@ -1 +1 @@
-Failed to connect to the custodial service .Please try again.
+Failed to connect to the custodial service.Please try again.

services/registration/api_failure.vis

@@ -1,7 +1,5 @@
-LOAD reset_api_call_failure 6
-RELOAD reset_api_call_failure
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP ^ 1
+INCMP _ 1
 INCMP quit 9

services/registration/api_failure_swa

@@ -1 +0,0 @@
-Imeshindwa kuunganisha kwenye huduma ya uangalizi. Tafadhali jaribu tena.

services/registration/authorize_reset_others_pin

@@ -1,2 +0,0 @@
-{{.retrieve_blocked_number}} will get a PIN reset request.
-Please enter your PIN to confirm:

services/registration/authorize_reset_others_pin.vis

@@ -1,12 +0,0 @@
-LOAD retrieve_blocked_number 0
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP pin_reset_result *

services/registration/authorize_reset_others_pin_swa

@@ -1,2 +0,0 @@
-{{.retrieve_blocked_number}} atapokea ombi la kuweka upya PIN.
-Tafadhali weka PIN yako kudhibitisha:

services/registration/check_statement.vis

@@ -1,6 +1,5 @@
 LOAD check_transactions 0
 RELOAD check_transactions
-CATCH api_failure flag_api_call_error 1
 CATCH no_transfers flag_no_transfers 1
 LOAD authorize_account 6
 MOUT back 0

services/registration/community_balance.vis

@@ -1,6 +1,6 @@
 LOAD reset_incorrect 6
 LOAD fetch_community_balance 0
-CATCH api_failure flag_api_call_error 1
+CATCH api_failure  flag_api_call_error  1
 MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0

services/registration/confirm_create_pin.vis

@@ -1,7 +1,4 @@
-MOUT back 0
+LOAD save_temporary_pin 6
 HALT
-INCMP _ 0
 LOAD verify_create_pin 8
-RELOAD verify_create_pin
-CATCH pin_mismatch flag_pin_mismatch 1
 INCMP account_creation *

services/registration/confirm_new_alias.vis

@@ -8,5 +8,5 @@ HALT
 INCMP _ 0
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH invalid_pin flag_invalid_pin 1
+CATCH invalid_pin flag_invalid_pin   1
 CATCH update_alias flag_allow_update 1

services/registration/confirm_others_new_pin

@@ -0,0 +1 @@
+Please confirm new PIN for: {{.retrieve_blocked_number}}

services/registration/confirm_others_new_pin.vis

@@ -0,0 +1,14 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+CATCH invalid_others_pin flag_valid_pin 0
+CATCH pin_reset_result flag_account_authorized 1
+LOAD save_others_temporary_pin 6
+RELOAD save_others_temporary_pin
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD check_pin_mismatch 6
+RELOAD check_pin_mismatch
+CATCH others_pin_mismatch flag_pin_mismatch 1
+INCMP pin_entry *

services/registration/confirm_others_new_pin_swa

@@ -0,0 +1 @@
+Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}

services/registration/confirm_pin_change.vis

@@ -1,7 +1,7 @@
+LOAD confirm_pin_change 0
 MOUT back 0
 HALT
 INCMP _ 0
-LOAD confirm_pin_change 0
 RELOAD confirm_pin_change
-CATCH pin_mismatch flag_pin_mismatch 1
+CATCH pin_reset_mismatch  flag_pin_mismatch 1
-INCMP pin_reset_success *
+INCMP * pin_reset_success

services/registration/create_pin.vis

@@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
-INCMP quit 0
 LOAD save_temporary_pin 6
 RELOAD save_temporary_pin
-CATCH invalid_pin flag_invalid_pin 1
+CATCH . flag_incorrect_pin 1
+INCMP quit 0
 INCMP confirm_create_pin *

services/registration/create_pin_mismatch.vis

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

services/registration/enter_other_number.vis

@@ -7,4 +7,4 @@ INCMP _ 0
 LOAD validate_blocked_number 6
 RELOAD validate_blocked_number
 CATCH unregistered_number flag_unregistered_number 1
-INCMP authorize_reset_others_pin *
+INCMP enter_others_new_pin *

services/registration/enter_others_new_pin

@@ -0,0 +1 @@
+Please enter new PIN for: {{.retrieve_blocked_number}}

services/registration/enter_others_new_pin.vis

@@ -0,0 +1,9 @@
+LOAD retrieve_blocked_number 0
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+MOUT back 0
+HALT 
+LOAD verify_new_pin 6
+RELOAD verify_new_pin
+INCMP _ 0
+INCMP * confirm_others_new_pin

services/registration/enter_others_new_pin_swa

@@ -0,0 +1 @@
+Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}

services/registration/invalid_others_pin

@@ -0,0 +1 @@
+The PIN you have entered is invalid.Please try a 4 digit number instead.

services/registration/invalid_others_pin.vis

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

services/registration/invalid_pin

@@ -1 +1 @@
-The PIN you entered is invalid. The PIN must be a 4 digit number.
+The PIN you entered is invalid.The PIN must be a 4 digit number.

services/registration/locale/swa/default.po

@@ -30,7 +30,3 @@ msgstr "Salio la Kikundi: 0.00"
 
 msgid "Symbol: %s\nBalance: %s"
 msgstr "Sarafu: %s\nSalio: %s"
-
-
-msgid "%s balance: %s\n"
-msgstr "%s salio: %s\n"

services/registration/main.vis

@@ -1,8 +1,9 @@
 LOAD clear_temporary_value 2
 RELOAD clear_temporary_value
-LOAD manage_vouchers 160
+LOAD set_default_voucher 8
-RELOAD manage_vouchers
+RELOAD set_default_voucher
-CATCH  api_failure flag_api_call_error 1
+LOAD check_vouchers 10
+RELOAD check_vouchers
 LOAD check_balance 128
 RELOAD check_balance
 CATCH api_failure flag_api_call_error 1

services/registration/my_account.vis

@@ -9,7 +9,7 @@ MOUT my_address 6
 MOUT my_account_alias 7
 MOUT back 0
 HALT
-INCMP ^ 0
+INCMP main 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3

services/registration/my_account_alias

@@ -1,2 +1,2 @@
 Current alias: {{.get_current_profile_info}}
-Enter your preferred alias:
+Edit my alias:

services/registration/my_account_alias.vis

@@ -5,5 +5,4 @@ HALT
 INCMP _ 0
 LOAD request_custom_alias 0
 RELOAD request_custom_alias
-CATCH api_failure flag_api_call_error 1
+INCMP  confirm_new_alias *
-INCMP confirm_new_alias *

services/registration/my_account_alias_swa

@@ -1,2 +1,2 @@
 Lakabu ya sasa: {{.get_current_profile_info}}
-Weka lakabu unalopendelea:
+Badilisha Lakabu yangu:

services/registration/my_balance.vis

@@ -1,6 +1,6 @@
 LOAD reset_incorrect 6
 LOAD check_balance 0
-CATCH api_failure flag_api_call_error 1
+CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0

services/registration/new_pin.vis

@@ -2,5 +2,6 @@ MOUT back 0
 HALT
 INCMP _ 0
 RELOAD save_temporary_pin
-CATCH invalid_pin flag_invalid_pin 1
+RELOAD verify_new_pin
-INCMP confirm_pin_change *
+CATCH invalid_pin flag_valid_pin 0
+INCMP * confirm_pin_change

services/registration/old_pin.vis

@@ -4,5 +4,5 @@ HALT
 INCMP _ 0
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH invalid_pin flag_invalid_pin 1
+CATCH invalid_pin  flag_invalid_pin 1
 INCMP new_pin *

services/registration/others_pin_mismatch

@@ -0,0 +1 @@
+The PIN you have entered is not a match

services/registration/others_pin_mismatch_swa

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

services/registration/pin_management.vis

@@ -1,6 +1,7 @@
 LOAD set_back 6
 LOAD authorize_account 16
 LOAD reset_allow_update 4
+LOAD verify_new_pin 2
 LOAD save_temporary_pin 1
 LOAD reset_incorrect 0
 LOAD reset_invalid_pin 6

services/registration/pin_reset_mismatch

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

services/registration/pin_reset_mismatch.vis

@@ -0,0 +1,6 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP quit 9
+INCMP . *

services/registration/pin_reset_mismatch_swa

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

services/registration/pin_reset_result.vis

@@ -1,4 +1,3 @@
-CATCH _ flag_account_authorized 0
 LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
 LOAD reset_others_pin 6
@@ -6,4 +5,4 @@ MOUT back 0
 MOUT quit 9
 HALT
 INCMP ^ 0
-INCMP quit 9
+INCMP quit  9

services/registration/pin_reset_success.vis

@@ -1,6 +1,6 @@
 MOUT back 0
 MOUT quit 9
 HALT
-INCMP ^ 0
+INCMP main 0
 INCMP quit 9
 INCMP . *

services/registration/pp.csv

@@ -9,7 +9,7 @@ flag,flag_account_authorized,15,this is set to allow a user access guarded nodes
 flag,flag_invalid_recipient,16,this is set when the transaction recipient is invalid
 flag,flag_invalid_recipient_with_invite,17,this is set when the transaction recipient is valid but not on the platform
 flag,flag_invalid_amount,18,this is set when the given transaction amount is invalid
-flag,flag_incorrect_pin,19,this is set when the provided PIN does not match the current account's PIN
+flag,flag_incorrect_pin,19,this is set when the provided PIN is invalid or does not match the current account's PIN
 flag,flag_valid_pin,20,this is set when the given PIN is valid
 flag,flag_allow_update,21,this is set to allow a user to update their profile data
 flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
@@ -31,4 +31,3 @@ flag,flag_back_set,37,this is set when it is a back navigation
 flag,flag_account_blocked,38,this is set when an account has been blocked after the allowed incorrect PIN attempts have been exceeded
 flag,flag_invalid_pin,39,this is set when the given PIN is invalid(is  less than or more than 4 digits)
 flag,flag_alias_set,40,this is set when an account alias has been assigned to a user
-flag,flag_account_pin_reset,41,this is set on an account when an admin triggers a PIN reset for them

services/registration/root.vis

@@ -1,15 +1,12 @@
 LOAD check_blocked_status 1
 RELOAD check_blocked_status
-LOAD check_account_created 2
-RELOAD check_account_created
-CATCH self_reset_pin flag_account_pin_reset 1
 CATCH blocked_account flag_account_blocked 1
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0
-CATCH create_pin flag_pin_set 0
 LOAD check_account_status 0
 RELOAD check_account_status
-CATCH api_failure flag_api_call_error 1
+CATCH api_failure flag_api_call_error  1
 CATCH account_pending flag_account_pending 1
+CATCH create_pin flag_pin_set 0
 CATCH main flag_account_success 1
 HALT

services/registration/self_reset_pin

@@ -1,2 +0,0 @@
-A PIN reset has been done on your account.
-Please enter a new four number PIN:

services/registration/self_reset_pin.vis

@@ -1,6 +0,0 @@
-LOAD reset_invalid_pin 6
-HALT
-LOAD save_temporary_pin 1
-RELOAD save_temporary_pin
-CATCH invalid_pin flag_invalid_pin 1
-INCMP confirm_pin_change * 

services/registration/self_reset_pin_swa

@@ -1,2 +0,0 @@
-Uwekaji upya wa PIN umefanyika kwenye akaunti yako.
-Tafadhali weka PIN mpya ya nambari nne:

services/registration/send.vis

@@ -5,7 +5,6 @@ MOUT back 0
 HALT
 LOAD validate_recipient 50
 RELOAD validate_recipient
-CATCH api_failure flag_api_call_error  1
 CATCH invalid_recipient flag_invalid_recipient 1
 CATCH invite_recipient flag_invalid_recipient_with_invite 1
 INCMP _ 0

services/registration/voucher_details.vis

@@ -1,7 +1,5 @@
 CATCH no_voucher flag_no_active_voucher 1
 LOAD get_voucher_details 0
-RELOAD get_voucher_details
-CATCH api_failure flag_api_call_error  1
 MAP get_voucher_details
 MOUT back 0
 HALT

store/db/db.go

@@ -63,10 +63,6 @@ const (
 	DATA_INITIAL_LANGUAGE_CODE
 	//Fully qualified account alias string
 	DATA_ACCOUNT_ALIAS
-	//currently suggested alias by the api awaiting user's confirmation as accepted account alias
-	DATA_SUGGESTED_ALIAS
-	//Key used to store a value of 1 for a user to reset their own PIN once they access the menu. 
-	DATA_SELF_PIN_RESET
 )
 
 const (

store/db/sub_prefix_db.go

@@ -33,14 +33,11 @@ func (s *SubPrefixDb) toKey(k []byte) []byte {
 func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
-	logg.InfoCtxf(ctx, "SubPrefixDb Get log", "key", string(key))
-
 	return s.store.Get(ctx, key)
 }
 
 func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
-	logg.InfoCtxf(ctx, "SubPrefixDb Put log", "key", string(key))
 	return s.store.Put(ctx, key, val)
 }

store/log_db.go

@@ -1,27 +0,0 @@
-package store
-
-import (
-	"context"
-
-	visedb "git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-)
-
-type LogDb struct {
-	visedb.Db
-}
-
-func (db *LogDb) WriteLogEntry(ctx context.Context, sessionId string, typ db.DataTyp, v []byte) error {
-	db.SetPrefix(visedb.DATATYPE_USERDATA)
-	db.SetSession(sessionId)
-	k := storedb.ToBytes(typ)
-	return db.Put(ctx, k, v)
-}
-
-func (db *LogDb) ReadLogEntry(ctx context.Context, sessionId string, typ db.DataTyp) ([]byte, error) {
-	db.SetPrefix(visedb.DATATYPE_USERDATA)
-	db.SetSession(sessionId)
-	k := storedb.ToBytes(typ)
-	return db.Get(ctx, k)
-}

store/vouchers.go

@@ -68,7 +68,7 @@ func ScaleDownBalance(balance, decimals string) string {
 }
 
 // GetVoucherData retrieves and matches voucher data
-func GetVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
+func GetVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
 	keys := []storedb.DataTyp{
 		storedb.DATA_VOUCHER_SYMBOLS,
 		storedb.DATA_VOUCHER_BALANCES,
@@ -78,9 +78,9 @@ func GetVoucherData(ctx context.Context, store DataStore, sessionId string, inpu
 	data := make(map[storedb.DataTyp]string)
 
 	for _, key := range keys {
-		value, err := store.ReadEntry(ctx, sessionId, key)
+		value, err := db.Get(ctx, storedb.ToBytes(key))
 		if err != nil {
-			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
+			return nil, fmt.Errorf("failed to get prefix key %x: %v", storedb.ToBytes(key), err)
 		}
 		data[key] = string(value)
 	}

store/vouchers_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/alecthomas/assert/v2"
 	"github.com/stretchr/testify/require"
 
+	visedb "git.defalsify.org/vise.git/db"
 	memdb "git.defalsify.org/vise.git/db/mem"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
@@ -76,8 +77,16 @@ func TestProcessVouchers(t *testing.T) {
 }
 
 func TestGetVoucherData(t *testing.T) {
-	ctx, store := InitializeTestDb(t)
+	ctx := context.Background()
-	sessionId := "session123"
+
+	db := memdb.NewMemDb()
+	err := db.Connect(ctx, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	prefix := storedb.ToBytes(visedb.DATATYPE_USERDATA)
+	spdb := storedb.NewSubPrefixDb(db, prefix)
 
 	// Test voucher data
 	mockData := map[storedb.DataTyp][]byte{
@@ -89,13 +98,13 @@ func TestGetVoucherData(t *testing.T) {
 
 	// Put the data
 	for key, value := range mockData {
-		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
+		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
 	}
 
-	result, err := GetVoucherData(ctx, store, sessionId, "1")
+	result, err := GetVoucherData(ctx, spdb, "1")
 
 	assert.NoError(t, err)
 	assert.Equal(t, "SRF", result.TokenSymbol)

testutil/engine.go

@@ -113,12 +113,6 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe
 		os.Exit(1)
 	}
 
-	logdb, err := menuStorageService.GetLogDb(ctx, userDataStore, "test-db-logs", "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
-
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		fmt.Fprintf(os.Stderr, "dbresource cast error")
@@ -127,7 +121,6 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe
 
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userDataStore)
-	lhs.SetLogDb(&logdb)
 	lhs.SetPersister(pe)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -161,7 +154,6 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe
 
 	en := lhs.GetEngine(lhs.Cfg, rs, pe)
 	cleanFn := func() {
-		logdb.Close(ctx)
 		err := en.Finish(ctx)
 		if err != nil {
 			logg.Errorf(err.Error())