Merge branch 'master' into test-coverage-bump

handlers/application/menuhandler.go

@@ -8,7 +8,6 @@ import (
 	"path"
 	"strconv"
 	"strings"
-	"unicode"
 
 	"gopkg.in/leonelquinteros/gotext.v1"
 
@@ -194,9 +193,8 @@ func (h *MenuHandlers) createAccountNoExist(ctx context.Context, sessionId strin
 	publicKey := r.PublicKey
 
 	data := map[storedb.DataTyp]string{
-		storedb.DATA_TRACKING_ID:   trackingId,
-		storedb.DATA_PUBLIC_KEY:    publicKey,
-		storedb.DATA_ACCOUNT_ALIAS: "",
+		storedb.DATA_TRACKING_ID: trackingId,
+		storedb.DATA_PUBLIC_KEY:  publicKey,
 	}
 	store := h.userdataStore
 	for key, value := range data {
@@ -243,28 +241,6 @@ func (h *MenuHandlers) CreateAccount(ctx context.Context, sym string, input []by
 	return res, nil
 }
 
-func (h *MenuHandlers) CheckAccountCreated(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
-
-	store := h.userdataStore
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	_, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
-	if err != nil {
-		if !db.IsNotFound(err) {
-			return res, err
-		}
-		return res, nil
-	}
-	res.FlagSet = append(res.FlagSet, flag_account_created)
-	return res, nil
-}
-
 // ResetValidPin resets the flag_valid_pin flag.
 func (h *MenuHandlers) ResetValidPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -1144,12 +1120,7 @@ func (h *MenuHandlers) GetCurrentProfileInfo(ctx context.Context, sym string, in
 			logg.ErrorCtxf(ctx, "Failed to read account alias entry with", "key", "error", storedb.DATA_ACCOUNT_ALIAS, err)
 			return res, err
 		}
-		alias := string(profileInfo)
-		if alias == "" {
-			res.Content = defaultValue
-		} else {
-			res.Content = alias
-		}
+		res.Content = string(profileInfo)
 	default:
 		break
 	}
@@ -1193,10 +1164,8 @@ func (h *MenuHandlers) GetProfileInfo(ctx context.Context, sym string, input []b
 	offerings := getEntryOrDefault(store.ReadEntry(ctx, sessionId, storedb.DATA_OFFERINGS))
 	alias := getEntryOrDefault(store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS))
 
-	if alias != defaultValue && alias != "" {
+	if alias != defaultValue {
 		alias = strings.Split(alias, ".")[0]
-	} else {
-		alias = defaultValue
 	}
 
 	// Construct the full name
@@ -1277,10 +1246,20 @@ func (h *MenuHandlers) UpdateAllProfileItems(ctx context.Context, sym string, in
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	flag_alias_set, _ := h.flagManager.GetFlag("flag_alias_set")
+	aliasSet := h.st.MatchFlag(flag_alias_set, true)
+
 	err := h.insertProfileItems(ctx, sessionId, &res)
 	if err != nil {
 		return res, err
 	}
+	//Only request an alias if it has not been set yet:
+	if !aliasSet {
+		err = h.constructAccountAlias(ctx)
+		if err != nil {
+			return res, err
+		}
+	}
 	return res, nil
 }
 
@@ -1481,7 +1460,7 @@ func loadUserContent(ctx context.Context, activeSym string, balance string, alia
 	if alias != "" {
 		content = l.Get("%s balance: %s\n", alias, balStr)
 	} else {
-		content = l.Get("Balance: %s\n", balStr)
+		content = l.Get("balance: %s\n", balStr)
 	}
 	return content, nil
 }
@@ -1489,6 +1468,7 @@ func loadUserContent(ctx context.Context, activeSym string, balance string, alia
 // CheckBalance retrieves the balance of the active voucher and sets
 // the balance as the result content.
 func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+
 	var (
 		res     resource.Result
 		err     error
@@ -1503,10 +1483,19 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 
 	store := h.userdataStore
 
+	accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
+	if err != nil {
+		if !db.IsNotFound(err) {
+			logg.ErrorCtxf(ctx, "failed to read account alias entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "error", err)
+			return res, err
+		}
+	} else {
+		alias = strings.Split(string(accAlias), ".")[0]
+	}
+
 	// get the active sym and active balance
 	activeSym, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
 	if err != nil {
-		logg.InfoCtxf(ctx, "could not find the activeSym in checkBalance:", "err", err)
 		if !db.IsNotFound(err) {
 			logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", storedb.DATA_ACTIVE_SYM, "error", err)
 			return res, err
@@ -1519,16 +1508,7 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 			logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
 			return res, err
 		}
-	}
 
-	accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
-	if err != nil {
-		if !db.IsNotFound(err) {
-			logg.ErrorCtxf(ctx, "failed to read account alias entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "error", err)
-			return res, err
-		}
-	} else {
-		alias = strings.Split(string(accAlias), ".")[0]
 	}
 
 	content, err = loadUserContent(ctx, string(activeSym), string(activeBal), alias)
@@ -1950,6 +1930,7 @@ func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, inpu
 // and sets the first as the default voucher, if no active voucher is set.
 func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+	var err error
 	userStore := h.userdataStore
 
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -1960,7 +1941,8 @@ func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input
 	flag_no_active_voucher, _ := h.flagManager.GetFlag("flag_no_active_voucher")
 
 	// check if the user has an active sym
-	_, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
+	_, err = userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
+
 	if err != nil {
 		if db.IsNotFound(err) {
 			publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
@@ -2052,8 +2034,6 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		return res, nil
 	}
 
-	logg.InfoCtxf(ctx, "fetched user vouchers", "public_key", string(publicKey), "vouchers", vouchersResp)
-
 	// check the current active sym and update the data
 	activeSym, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
 	if activeSym != nil {
@@ -2086,11 +2066,6 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		}
 	}
 
-	activeBal, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
-	activeAddr, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS)
-
-	logg.InfoCtxf(ctx, "The active data in CheckVouchers:", "activeSym", string(activeSym), string(activeBal), string(activeAddr))
-
 	data := store.ProcessVouchers(vouchersResp)
 
 	// Store all voucher data
@@ -2101,51 +2076,28 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		storedb.DATA_VOUCHER_ADDRESSES: data.Addresses,
 	}
 
-	// Write data entries
 	for key, value := range dataMap {
-		logg.InfoCtxf(ctx, "Writing data entry for sessionId: %s", sessionId, "key", key, "value", value)
-		if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
-			logg.ErrorCtxf(ctx, "Failed to write data entry for sessionId: %s", sessionId, "key", key, "error", err)
-			continue
+		if err := h.prefixDb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value)); err != nil {
+			return res, nil
 		}
 	}
 
-	// for key, value := range dataMap {
-	// 	if err := h.prefixDb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value)); err != nil {
-	// 		return res, nil
-	// 	}
-	// }
-
 	return res, nil
 }
 
 // GetVoucherList fetches the list of vouchers and formats them.
 func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	userStore := h.userdataStore
 
 	// Read vouchers from the store
-	voucherData, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS)
-	logg.InfoCtxf(ctx, "reading GetVoucherList entries for sessionId: %s", sessionId, "key", storedb.DATA_VOUCHER_SYMBOLS, "voucherData", voucherData)
+	voucherData, err := h.prefixDb.Get(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read voucherData entires with", "key", storedb.DATA_VOUCHER_SYMBOLS, "error", err)
+		logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
 		return res, err
 	}
-	// voucherData, err := h.prefixDb.Get(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS))
-	// if err != nil {
-	// 	logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
-	// 	return res, err
-	// }
 
 	formattedData := h.ReplaceSeparatorFunc(string(voucherData))
 
-	logg.InfoCtxf(ctx, "final output for sessionId: %s", sessionId, "key", storedb.DATA_VOUCHER_SYMBOLS, "formattedData", formattedData)
-
 	res.Content = string(formattedData)
 
 	return res, nil
@@ -2172,7 +2124,7 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
 		return res, nil
 	}
 
-	metadata, err := store.GetVoucherData(ctx, h.userdataStore, sessionId, inputStr)
+	metadata, err := store.GetVoucherData(ctx, h.prefixDb, inputStr)
 	if err != nil {
 		return res, fmt.Errorf("failed to retrieve voucher data: %v", err)
 	}
@@ -2532,8 +2484,7 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input
 				return res, nil
 			}
 		}
-		sanitizedInput := sanitizeAliasHint(string(input))
-		aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), sanitizedInput)
+		aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), string(input))
 		if err != nil {
 			logg.ErrorCtxf(ctx, "failed to retrieve alias", "alias", string(aliasHint), "error_alias_request", err)
 			return res, fmt.Errorf("Failed to retrieve alias: %s", err.Error())
@@ -2550,17 +2501,6 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input
 	return res, nil
 }
 
-func sanitizeAliasHint(input string) string {
-	for i, r := range input {
-		// Check if the character is a special character (non-alphanumeric)
-		if !unicode.IsLetter(r) && !unicode.IsNumber(r) {
-			return input[:i]
-		}
-	}
-	// If no special character is found, return the whole input
-	return input
-}
-
 // GetSuggestedAlias loads and displays the suggested alias name from the temporary value
 func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result

handlers/application/menuhandler_test.go

@@ -275,36 +275,80 @@ func TestSaveFirstname(t *testing.T) {
 
 	// Set the flag in the State
 	mockState := state.NewState(128)
-	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
-	// Define test data
-	firstName := "John"
-
-	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(firstName)); err != nil {
-		t.Fatal(err)
-	}
-
-	expectedResult.FlagSet = []uint32{flag_firstname_set}
-
-	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
 		st:            mockState,
+		profile:       &profile.Profile{Max: 6},
 	}
 
-	// Call the method
-	res, err := h.SaveFirstname(ctx, "save_firstname", []byte(firstName))
+	tests := []struct {
+		name              string
+		setupfunc         func()
+		saveItem          string
+		expectedSavedItem string
+		expectedResult    resource.Result
+	}{
+		{
+			name:     "test when `flag_allow_update` flag is set",
+			saveItem: "John",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.SetFlag(flag_allow_update)
+			},
+			expectedSavedItem: "John",
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_firstname_set},
+			},
+		},
+		{
+			name: "test when `flag_allow_update flag` is not set but `flag_firstname_set` set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.SetFlag(flag_firstname_set)
+			},
+			saveItem:          "John",
+			expectedSavedItem: "John",
+			expectedResult:    resource.Result{},
+		},
+		{
+			name: "test when both `flag_allow_update flag`  `flag_firstname_set` are  not set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.ResetFlag(flag_firstname_set)
+			},
+			saveItem:          "John",
+			expectedSavedItem: "John",
+			expectedResult:    resource.Result{},
+		},
+	}
 
-	// Assert results
-	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.setupfunc()
 
-	// Verify that the DATA_FIRST_NAME entry has been updated with the temporary value
-	storedFirstName, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_FIRST_NAME)
-	assert.Equal(t, firstName, string(storedFirstName))
+			if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tt.saveItem)); err != nil {
+				t.Fatal(err)
+			}
+			// Call the method
+			res, err := h.SaveFirstname(ctx, "save_firstname", []byte(tt.saveItem))
+
+			if err != nil {
+				t.Fatalf("Failed to save firstname with error %v", err)
+			}
+			// Assert results
+			assert.NoError(t, err)
+			assert.Equal(t, tt.expectedResult, res)
+
+			// Verify that the DATA_FIRST_NAME entry has been updated with the temporary value
+			storedFirstName, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_FIRST_NAME)
+			assert.Equal(t, tt.expectedSavedItem, string(storedFirstName))
+
+		})
+	}
 }
 
 func TestSaveFamilyname(t *testing.T) {
@@ -315,40 +359,84 @@ func TestSaveFamilyname(t *testing.T) {
 	fm, _ := NewFlagManager(flagsPath)
 
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
-	flag_firstname_set, _ := fm.GetFlag("flag_familyname_set")
+	flag_familyname_set, _ := fm.GetFlag("flag_familyname_set")
 
 	// Set the flag in the State
 	mockState := state.NewState(128)
-	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
-	expectedResult.FlagSet = []uint32{flag_firstname_set}
-
-	// Define test data
-	familyName := "Doeee"
-
-	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(familyName)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		st:            mockState,
 		flagManager:   fm,
+		st:            mockState,
+		profile:       &profile.Profile{Max: 6},
 	}
 
-	// Call the method
-	res, err := h.SaveFamilyname(ctx, "save_familyname", []byte(familyName))
+	tests := []struct {
+		name              string
+		setupfunc         func()
+		saveItem          string
+		expectedSavedItem string
+		expectedResult    resource.Result
+	}{
+		{
+			name:     "test when `flag_allow_update` flag is set",
+			saveItem: "Doe",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.SetFlag(flag_allow_update)
+			},
+			expectedSavedItem: "Doe",
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_familyname_set},
+			},
+		},
+		{
+			name: "test when `flag_allow_update flag` is not set but `flag_familyname_set` set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.SetFlag(flag_familyname_set)
+			},
+			saveItem:          "Doe",
+			expectedSavedItem: "Doe",
+			expectedResult:    resource.Result{},
+		},
+		{
+			name: "test when both `flag_allow_update flag`  `flag_familyname_set` are  not set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.ResetFlag(flag_familyname_set)
+			},
+			saveItem:          "Doe",
+			expectedSavedItem: "Doe",
+			expectedResult:    resource.Result{},
+		},
+	}
 
-	// Assert results
-	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.setupfunc()
 
-	// Verify that the DATA_FAMILY_NAME entry has been updated with the temporary value
-	storedFamilyName, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_FAMILY_NAME)
-	assert.Equal(t, familyName, string(storedFamilyName))
+			if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tt.saveItem)); err != nil {
+				t.Fatal(err)
+			}
+			// Call the method
+			res, err := h.SaveFamilyname(ctx, "save_yob", []byte(tt.saveItem))
+
+			if err != nil {
+				t.Fatalf("Failed to save family name with error %v", err)
+			}
+			// Assert results
+			assert.NoError(t, err)
+			assert.Equal(t, tt.expectedResult, res)
+
+			// Verify that the DATA_FAMILY_NAME entry has been updated with the temporary value
+			storedFamilyname, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_FAMILY_NAME)
+			assert.Equal(t, tt.expectedSavedItem, string(storedFamilyname))
+
+		})
+	}
 }
 
 func TestSaveYoB(t *testing.T) {
@@ -365,37 +453,83 @@ func TestSaveYoB(t *testing.T) {
 	mockState := state.NewState(108)
 	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
-	// Define test data
-	yob := "1980"
-
-	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(yob)); err != nil {
-		t.Fatal(err)
-	}
-
-	expectedResult.FlagSet = []uint32{flag_yob_set}
-
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
 		st:            mockState,
+		profile:       &profile.Profile{Max: 6},
 	}
 
-	// Call the method
-	res, err := h.SaveYob(ctx, "save_yob", []byte(yob))
+	tests := []struct {
+		name              string
+		setupfunc         func()
+		saveItem          string
+		expectedSavedItem string
+		expectedResult    resource.Result
+	}{
+		{
+			name:     "test when `flag_allow_update` flag is set",
+			saveItem: "1980",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.SetFlag(flag_allow_update)
+			},
+			expectedSavedItem: "1980",
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_yob_set},
+			},
+		},
+		{
+			name: "test when `flag_allow_update flag` is not set but `flag_yob_set` set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.SetFlag(flag_yob_set)
+			},
+			saveItem:          "1980",
+			expectedSavedItem: "1980",
+			expectedResult:    resource.Result{},
+		},
+		{
+			name: "test when both `flag_allow_update flag`  `flag_yob_set` are  not set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.ResetFlag(flag_yob_set)
+			},
+			saveItem:          "1980",
+			expectedSavedItem: "1980",
+			expectedResult:    resource.Result{},
+		},
+	}
 
-	// Assert results
-	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.setupfunc()
+			if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tt.saveItem)); err != nil {
+				t.Fatal(err)
+			}
+			// Call the method
+			res, err := h.SaveYob(ctx, "save_yob", []byte(tt.saveItem))
 
-	// Verify that the DATA_YOB entry has been updated with the temporary value
-	storedYob, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_YOB)
-	assert.Equal(t, yob, string(storedYob))
+			if err != nil {
+				t.Fatalf("Failed to save location with error %v", err)
+			}
+			// Assert results
+			assert.NoError(t, err)
+			assert.Equal(t, tt.expectedResult, res)
+
+			// Verify that the DATA_YOB entry has been updated with the temporary value
+			storedYob, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_YOB)
+			assert.Equal(t, tt.expectedSavedItem, string(storedYob))
+
+		})
+	}
 }
 
 func TestSaveLocation(t *testing.T) {
+
 	sessionId := "session123"
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
@@ -407,36 +541,80 @@ func TestSaveLocation(t *testing.T) {
 
 	// Set the flag in the State
 	mockState := state.NewState(108)
-	mockState.SetFlag(flag_allow_update)
-
-	expectedResult := resource.Result{}
-
-	// Define test data
-	location := "Kilifi"
-
-	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(location)); err != nil {
-		t.Fatal(err)
-	}
-
-	expectedResult.FlagSet = []uint32{flag_location_set}
 
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
+		profile:       &profile.Profile{Max: 6},
 		st:            mockState,
 	}
 
-	// Call the method
-	res, err := h.SaveLocation(ctx, "save_location", []byte(location))
+	tests := []struct {
+		name              string
+		setupfunc         func()
+		saveItem          string
+		expectedSavedItem string
+		expectedResult    resource.Result
+	}{
+		{
+			name:     "test when `flag_allow_update` flag is set",
+			saveItem: "Kilifi",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.SetFlag(flag_allow_update)
+			},
+			expectedSavedItem: "Kilifi",
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_location_set},
+			},
+		},
+		{
+			name: "test when `flag_allow_update flag` is not set but `flag_location_set` set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.SetFlag(flag_location_set)
+			},
+			saveItem:          "Kilifi",
+			expectedSavedItem: "Kilifi",
+			expectedResult:    resource.Result{FlagSet: []uint32{flag_location_set}},
+		},
+		{
+			name: "test when both `flag_allow_update flag`  `flag_location_set` are  not set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.ResetFlag(flag_location_set)
+			},
+			saveItem:          "Kilifi",
+			expectedSavedItem: "Kilifi",
+			expectedResult:    resource.Result{},
+		},
+	}
 
-	// Assert results
-	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.setupfunc()
+			if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tt.saveItem)); err != nil {
+				t.Fatal(err)
+			}
+			// Call the method
+			res, err := h.SaveLocation(ctx, "save_location", []byte(tt.saveItem))
 
-	// Verify that the DATA_LOCATION entry has been updated with the temporary value
-	storedLocation, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_LOCATION)
-	assert.Equal(t, location, string(storedLocation))
+			if err != nil {
+				t.Fatalf("Failed to save location with error %v", err)
+			}
+			// Assert results
+			assert.NoError(t, err)
+			assert.Equal(t, tt.expectedResult, res)
+
+			// Verify that the DATA_LOCATION entry has been updated with the temporary value
+			storedLocation, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_LOCATION)
+			assert.Equal(t, tt.expectedSavedItem, string(storedLocation))
+
+		})
+	}
 }
 
 func TestSaveOfferings(t *testing.T) {
@@ -451,36 +629,76 @@ func TestSaveOfferings(t *testing.T) {
 
 	// Set the flag in the State
 	mockState := state.NewState(108)
-	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
-	// Define test data
-	offerings := "Bananas"
-
-	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(offerings)); err != nil {
-		t.Fatal(err)
-	}
-
-	expectedResult.FlagSet = []uint32{flag_offerings_set}
-
-	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
 		st:            mockState,
+		profile:       &profile.Profile{Max: 6},
 	}
 
-	// Call the method
-	res, err := h.SaveOfferings(ctx, "save_offerings", []byte(offerings))
+	tests := []struct {
+		name              string
+		setupfunc         func()
+		saveItem          string
+		expectedSavedItem string
+		expectedResult    resource.Result
+	}{
+		{
+			name:     "test when `flag_allow_update` flag is set",
+			saveItem: "Bananas",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.SetFlag(flag_allow_update)
+			},
+			expectedSavedItem: "Bananas",
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_offerings_set},
+			},
+		},
+		{
+			name: "test when `flag_allow_update flag` is not set but `flag_offerings_set` set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.SetFlag(flag_offerings_set)
+			},
+			saveItem:          "Bananas",
+			expectedSavedItem: "Bananas",
+			expectedResult:    resource.Result{},
+		},
+		{
+			name: "test when both `flag_allow_update flag`  `flag_offerings_set` are  not set ",
+			setupfunc: func() {
+				//setup the required flags
+				mockState.ResetFlag(flag_allow_update)
+				mockState.ResetFlag(flag_offerings_set)
+			},
+			saveItem:          "Bananas",
+			expectedSavedItem: "Bananas",
+			expectedResult:    resource.Result{},
+		},
+	}
 
-	// Assert results
-	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.setupfunc()
 
-	// Verify that the DATA_OFFERINGS entry has been updated with the temporary value
-	storedOfferings, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_OFFERINGS)
-	assert.Equal(t, offerings, string(storedOfferings))
+			if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tt.saveItem)); err != nil {
+				t.Fatal(err)
+			}
+
+			res, err := h.SaveOfferings(ctx, "save_offerings", []byte(tt.saveItem))
+
+			// Assert results
+			assert.NoError(t, err)
+			assert.Equal(t, tt.expectedResult, res)
+
+			// Verify that the DATA_OFFERINGS entry has been updated with the temporary value
+			storedOfferings, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_OFFERINGS)
+			assert.Equal(t, tt.expectedSavedItem, string(storedOfferings))
+		})
+	}
 }
 
 func TestSaveGender(t *testing.T) {
@@ -495,63 +713,89 @@ func TestSaveGender(t *testing.T) {
 
 	// Set the flag in the State
 	mockState := state.NewState(108)
-	mockState.SetFlag(flag_allow_update)
 
 	// Define test cases
 	tests := []struct {
 		name            string
+		setupfunc       func()
 		input           []byte
 		expectedGender  string
+		expectedResult  resource.Result
 		executingSymbol string
 	}{
 		{
-			name:            "Valid Male Input",
-			input:           []byte("1"),
+			name:  "Valid Male Input with `flag_allow_update_set` set",
+			input: []byte("1"),
+			setupfunc: func() {
+				mockState.SetFlag(flag_allow_update)
+				mockState.ExecPath = []string{}
+			},
 			expectedGender:  "male",
 			executingSymbol: "set_male",
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_gender_set},
+			},
 		},
 		{
-			name:            "Valid Female Input",
-			input:           []byte("2"),
+			name:  "Valid Female Input when `flag_allow_update` is not set but `flag_gender_set` is set",
+			input: []byte("2"),
+			setupfunc: func() {
+				mockState.ResetFlag(flag_allow_update)
+				mockState.SetFlag(flag_gender_set)
+				mockState.ExecPath = []string{}
+			},
+			expectedResult:  resource.Result{},
 			expectedGender:  "female",
 			executingSymbol: "set_female",
 		},
 		{
-			name:            "Valid Unspecified Input",
+			name: "Valid Unspecified Input when both `flag_allow_update` and  `flag_gender_set` are not set",
+			setupfunc: func() {
+				mockState.ResetFlag(flag_allow_update)
+				mockState.ResetFlag(flag_gender_set)
+				mockState.ExecPath = []string{}
+			},
 			input:           []byte("3"),
 			executingSymbol: "set_unspecified",
+			expectedResult:  resource.Result{},
 			expectedGender:  "unspecified",
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			tt.setupfunc()
+			mockState.ExecPath = append(mockState.ExecPath, tt.executingSymbol)
+
 			if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tt.expectedGender)); err != nil {
 				t.Fatal(err)
 			}
 
-			mockState.ExecPath = append(mockState.ExecPath, tt.executingSymbol)
 			// Create the MenuHandlers instance with the mock store
 			h := &MenuHandlers{
 				userdataStore: store,
 				st:            mockState,
 				flagManager:   fm,
+				profile:       &profile.Profile{Max: 6},
 			}
-
-			expectedResult := resource.Result{}
+			allowUpdate := h.st.MatchFlag(flag_allow_update, true)
 
 			// Call the method
 			res, err := h.SaveGender(ctx, "save_gender", tt.input)
 
-			expectedResult.FlagSet = []uint32{flag_gender_set}
-
 			// Assert results
 			assert.NoError(t, err)
-			assert.Equal(t, expectedResult, res)
+			assert.Equal(t, tt.expectedResult, res)
 
-			// Verify that the DATA_GENDER entry has been updated with the temporary value
-			storedGender, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_GENDER)
-			assert.Equal(t, tt.expectedGender, string(storedGender))
+			// Verify that the DATA_GENDER entry if the flag_allow_update is set has been updated with the temporary value
+			if allowUpdate {
+				storedGender, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_GENDER)
+				assert.Equal(t, tt.expectedGender, string(storedGender))
+			} else {
+				// Verify that DATA_TEMPORARY_VALUE is updated with the latest user input
+				temporaryGenderValue, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
+				assert.Equal(t, tt.expectedGender, string(temporaryGenderValue))
+			}
 		})
 	}
 }
@@ -1071,8 +1315,15 @@ func TestAuthorize(t *testing.T) {
 			},
 		},
 		{
-			name:  "Test with pin that is not a 4 digit",
-			input: []byte("1235aqds"),
+			name:  "Test with PIN that is more than  4 digits",
+			input: []byte("12357"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_invalid_pin},
+			},
+		},
+		{
+			name:  "Test with pin that is less than 4 digit",
+			input: []byte("123"),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_invalid_pin},
 			},
@@ -1650,7 +1901,7 @@ func TestValidateRecipient(t *testing.T) {
 			},
 		},
 		{
-			name:  "Test with valid unregistered recepient",
+			name:  "Test with valid unregistered recipient",
 			input: []byte("0712345678"),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_invalid_recipient_with_invite},
@@ -1658,7 +1909,7 @@ func TestValidateRecipient(t *testing.T) {
 			},
 		},
 		{
-			name:           "Test with valid registered recepient",
+			name:           "Test with valid registered recipient",
 			input:          []byte("0711223344"),
 			expectedResult: resource.Result{},
 		},
@@ -1668,7 +1919,12 @@ func TestValidateRecipient(t *testing.T) {
 			expectedResult: resource.Result{},
 		},
 		{
-			name:           "Test with alias recepient",
+			name:           "Test with alias recipient",
+			input:          []byte("foobar.sarafu.eth"),
+			expectedResult: resource.Result{},
+		},
+		{
+			name:           "Test with alias recipient",
 			input:          []byte("alias123.sarafu.local"),
 			expectedResult: resource.Result{},
 		},
@@ -1697,7 +1953,7 @@ func TestValidateRecipient(t *testing.T) {
 			mockAccountService.On("CheckAliasAddress", string(tt.input)).Return(aliasResponse, nil)
 
 			// Call the method
-			res, err := h.ValidateRecipient(ctx, "validate_recepient", tt.input)
+			res, err := h.ValidateRecipient(ctx, "validate_recipient", tt.input)
 
 			if err != nil {
 				t.Error(err)
@@ -1727,7 +1983,7 @@ func TestCheckBalance(t *testing.T) {
 			publicKey:      "0X98765432109",
 			activeSym:      "ETH",
 			activeBal:      "1.5",
-			expectedResult: resource.Result{Content: "Balance: 1.50 ETH\n"},
+			expectedResult: resource.Result{Content: "balance: 1.50 ETH\n"},
 			expectError:    false,
 		},
 	}
@@ -3080,6 +3336,53 @@ func TestCheckBlockedNumPinMisMatch(t *testing.T) {
 	}
 }
 
+func TestSetBack(t *testing.T) {
+	ctx, store := InitializeTestStore(t)
+
+	fm, err := NewFlagManager(flagsPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	h := &MenuHandlers{
+		userdataStore: store,
+		flagManager:   fm,
+		st:            state.NewState(16),
+	}
+
+	flag_back_set, _ := h.flagManager.GetFlag("flag_back_set")
+
+	tests := []struct {
+		name           string
+		input          []byte
+		expectedResult resource.Result
+	}{
+		{
+			name:  "Test with `0` input for back navigation",
+			input: []byte("0"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_back_set},
+			},
+		},
+		{
+			name:  "Test with input that is not back",
+			input: []byte("1345"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_back_set},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			//Call the function under test
+			res, _ := h.SetBack(ctx, "set_back", tt.input)
+
+			//Assert that the result set to content is what was expected
+			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
+		})
+	}
+}
+
 func TestGetCurrentProfileInfo(t *testing.T) {
 	sessionId := "session123"
 	ctx, store := InitializeTestStore(t)
@@ -3531,3 +3834,70 @@ func TestClearTemporaryValue(t *testing.T) {
 	// assert that the temp value is empty
 	assert.Equal(t, currentTempValue, []byte(""))
 }
+
+func TestGetSuggestedAlias(t *testing.T) {
+	ctx, store := InitializeTestStore(t)
+	sessionId := "session123"
+	alias := "foo.sarafu.eth"
+
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+
+	h := &MenuHandlers{
+		userdataStore: store,
+	}
+
+	//Set a suggested alias a temporary value that will be expected to be in the result content
+	err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(alias))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	res, err := h.GetSuggestedAlias(ctx, "getsuggested_alias", []byte(""))
+	if err != nil {
+		t.Fail()
+	}
+	assert.Equal(t, res.Content, alias)
+
+}
+
+func TestConfirmNewAlias(t *testing.T) {
+	ctx, store := InitializeTestStore(t)
+	sessionId := "session123"
+	expectedSavedAlias := "fooo.sarafu.eth"
+
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+
+	//Set a temporary alias that is suggested,confirm if the the current new alias after confirmation
+	err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(expectedSavedAlias))
+	if err != nil {
+		t.Fatal(err)
+	}
+	mockState := state.NewState(128)
+
+	fm, err := NewFlagManager(flagsPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	h := &MenuHandlers{
+		userdataStore: store,
+		st:            mockState,
+		flagManager:   fm,
+	}
+	flag_alias_set, _ := h.flagManager.GetFlag("flag_alias_set")
+
+	expectedResult := resource.Result{
+		FlagSet: []uint32{flag_alias_set},
+	}
+
+	res, err := h.ConfirmNewAlias(ctx, "confirm_new_alias", []byte(""))
+	if err != nil {
+		t.Fail()
+	}
+	accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, expectedResult, res)
+	assert.Equal(t, expectedSavedAlias, string(accAlias))
+}

handlers/local.go

@@ -128,7 +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.first = appHandlers.Init
 

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": [

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

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

services/registration/root.vis

@@ -1,7 +1,5 @@
 LOAD check_blocked_status 1
 RELOAD check_blocked_status
-LOAD check_account_created 2
-RELOAD check_account_created
 CATCH blocked_account flag_account_blocked 1
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0

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/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)
 	}