Merge pull request 'use a different key for the suggested aliases' (#47) from fix-double-alias-request into master

Reviewed-on: #47

devtools/admin/main.go

@@ -8,7 +8,6 @@ import (
 	"path"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/engine"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
@@ -19,7 +18,6 @@ import (
 var (
 	logg      = logging.NewVanilla().WithContextKey("SessionId")
 	scriptDir = path.Join("services", "registration")
-	menuSeparator = ": "
 )
 
 func main() {
@@ -27,8 +25,6 @@ func main() {
 
 	override := config.NewOverride()
 	var sessionId string
-	var size uint
-	var engineDebug bool
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -36,8 +32,6 @@ func main() {
 
 	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
 	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
-	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.Parse()
 
 	config.Apply(override)
@@ -56,18 +50,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	cfg := engine.Config{
-		Root:              "root",
-		SessionId:         sessionId,
-		OutputSize:        uint32(size),
-		FlagCount:         uint32(128),
-		MenuSeparator:     menuSeparator,
-		EngineDebug:       engineDebug,
-		ResetOnEmptyInput: true,
-	}
-
 	x := cmd.NewCmd(sessionId, flagParser)
-	x = x.WithEngine(cfg)
 	err = x.Parse(flag.Args())
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "cmd parse fail: %v\n", err)

go.mod

@@ -3,7 +3,7 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.3.2-0.20250326034808-b9c2294cbf1a
+	git.defalsify.org/vise.git v0.3.1
 	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
 	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b
 	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2

go.sum

@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.3.2-0.20250326034808-b9c2294cbf1a h1:5uLBUZC6armYgBPkuNEsQPtqT3qZxRfNP4HUdkhjm4I=
+git.defalsify.org/vise.git v0.3.1 h1:A6FhMcur09ft/JzUPGXR+KpA17fltfeBnasyvLMZmq4=
-git.defalsify.org/vise.git v0.3.2-0.20250326034808-b9c2294cbf1a/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.1/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
 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.20250310093912-8145b4bd004b h1:xiTpaqWWoF5qcnarY/9ZkT6aVdnKwqztb2gzIahJn4w=

handlers/application/menuhandler.go

@@ -2528,9 +2528,10 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input
 			return res, fmt.Errorf("Failed to retrieve alias: %s", err.Error())
 		}
 		alias := aliasResult.Alias
+		logg.InfoCtxf(ctx, "Suggested alias ", "alias", alias)
 
 		//Store the returned alias,wait for user to confirm it as new account alias
-		err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(alias))
+		err = store.WriteEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS, []byte(alias))
 		if err != nil {
 			logg.ErrorCtxf(ctx, "failed to write account alias", "key", storedb.DATA_TEMPORARY_VALUE, "value", alias, "error", err)
 			return res, err
@@ -2559,7 +2560,7 @@ func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	suggestedAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
+	suggestedAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS)
 	if err != nil {
 		return res, nil
 	}
@@ -2567,7 +2568,7 @@ func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input
 	return res, nil
 }
 
-// ConfirmNewAlias  reads  the suggested alias from the temporary value and confirms it  as the new account alias.
+// ConfirmNewAlias  reads  the suggested alias from the [DATA_SUGGECTED_ALIAS] key and confirms it  as the new account alias.
 func (h *MenuHandlers) ConfirmNewAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	store := h.userdataStore
@@ -2578,10 +2579,11 @@ func (h *MenuHandlers) ConfirmNewAlias(ctx context.Context, sym string, input []
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	newAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
+	newAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS)
 	if err != nil {
 		return res, nil
 	}
+	logg.InfoCtxf(ctx, "Confirming new alias", "alias", string(newAlias))
 	err = store.WriteEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS, []byte(string(newAlias)))
 	if err != nil {
 		logg.ErrorCtxf(ctx, "failed to clear DATA_ACCOUNT_ALIAS_VALUE entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "value", "empty", "error", err)

internal/cmd/cmd.go

@@ -5,32 +5,21 @@ import (
 	"fmt"
 
 	"git.defalsify.org/vise.git/logging"
-	"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/grassrootseconomics/sarafu-vise/handlers/application"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
-var argc map[string]int = map[string]int{
-	"reset": 0,
-	"admin": 1,
-}
-
 var (
 	logg = logging.NewVanilla().WithDomain("cmd").WithContextKey("SessionId")
 )
 
 type Cmd struct {
-	sessionId    string
+	sessionId  string
-	conn         storage.ConnData
+	conn       storage.ConnData
-	flagParser   *application.FlagManager
+	flagParser *application.FlagManager
-	cmd          int
+	cmd        int
-	enable       bool
+	enable     bool
-	exec         func(ctx context.Context, ss storage.StorageService) error
+	exec       func(ctx context.Context, ss storage.StorageService) error
-	engineConfig *engine.Config
-	st           *state.State
 }
 
 func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
@@ -40,74 +29,10 @@ func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
 	}
 }
 
-func (c *Cmd) WithEngine(engineConfig engine.Config) *Cmd {
-	c.engineConfig = &engineConfig
-	return c
-}
-
 func (c *Cmd) Exec(ctx context.Context, ss storage.StorageService) error {
 	return c.exec(ctx, ss)
 }
 
-func (c *Cmd) engine(ctx context.Context, rs resource.Resource, pe *persist.Persister) (engine.Engine, error) {
-	if c.engineConfig == nil {
-		return nil, fmt.Errorf("engine config missing")
-	}
-	en := engine.NewEngine(*c.engineConfig, rs)
-
-	st := pe.GetState()
-	if st == nil {
-		return nil, fmt.Errorf("persister state fail")
-	}
-	en = en.WithState(st)
-	st.UseDebug()
-	ca := pe.GetMemory()
-	if ca == nil {
-		return nil, fmt.Errorf("persister cache fail")
-	}
-	en = en.WithMemory(ca)
-	logg.DebugCtxf(ctx, "state loaded", "state", st)
-	return en, nil
-}
-
-func (c *Cmd) execReset(ctx context.Context, ss storage.StorageService) error {
-	pe, err := ss.GetPersister(ctx)
-	if err != nil {
-		return fmt.Errorf("get persister error: %v", err)
-	}
-	rs, err := ss.GetResource(ctx)
-	if err != nil {
-		return fmt.Errorf("get resource error: %v", err)
-	}
-	dbResource, ok := rs.(*resource.DbResource)
-	if !ok {
-		return fmt.Errorf("get dbresource error: %v", err)
-	}
-	err = pe.Load(c.engineConfig.SessionId)
-	if err != nil {
-		return fmt.Errorf("persister load error: %v", err)
-	}
-	en, err := c.engine(ctx, dbResource, pe)
-	if err != nil {
-		return err
-	}
-	ca := pe.GetMemory()
-	ca.Pop()
-
-	_, err = en.(*engine.DefaultEngine).Reset(ctx, false)
-	if err != nil {
-		return err
-	}
-	st := pe.GetState()
-	logg.DebugCtxf(ctx, "state after reset", "state", st)
-
-	err = pe.Save(c.engineConfig.SessionId)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (c *Cmd) execAdmin(ctx context.Context, ss storage.StorageService) error {
 	pe, err := ss.GetPersister(ctx)
 	if err != nil {
@@ -151,33 +76,13 @@ func (c *Cmd) parseCmdAdmin(cmd string, param string, more []string) (bool, erro
 	return false, nil
 }
 
-func (c *Cmd) parseCmdReset(cmd string, param string, more []string) (bool, error) {
-	if cmd == "reset" {
-		c.enable = false
-		c.exec = c.execReset
-		return true, nil
-	}
-	return false, nil
-}
-
 func (c *Cmd) Parse(args []string) error {
-	var param string
+	if len(args) < 2 {
-	if len(args) < 1 {
 		return fmt.Errorf("Wrong number of arguments: %v", args)
 	}
 	cmd := args[0]
-
+	param := args[1]
-	n, ok := argc[cmd]
+	args = args[2:]
-	if !ok {
-		return fmt.Errorf("invalid command: %v", cmd)
-	}
-	if n > 0 {
-		if len(args) < n+1 {
-			return fmt.Errorf("Wrong number of arguments, need: %d", n)
-		}
-		param = args[1]
-		args = args[2:]
-	}
 
 	r, err := c.parseCmdAdmin(cmd, param, args)
 	if err != nil {
@@ -187,13 +92,5 @@ func (c *Cmd) Parse(args []string) error {
 		return nil
 	}
 
-	r, err = c.parseCmdReset(cmd, param, args)
-	if err != nil {
-		return err
-	}
-	if r {
-		return nil
-	}
-
 	return fmt.Errorf("unknown subcommand: %s", cmd)
 }

services/registration/my_account_alias

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

services/registration/my_account_alias_swa

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

store/db/db.go

@@ -63,6 +63,8 @@ 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
 )
 
 const (