Clean up messily failed conflict resolution

Reviewed-on: #150

common/db.go

@@ -22,17 +22,14 @@ const (
 	DATA_OFFERINGS
 	DATA_RECIPIENT
 	DATA_AMOUNT
-	DATA_TEMPORARY_PIN
+	DATA_TEMPORARY_VALUE
 	DATA_VOUCHER_LIST
-	DATA_TEMPORARY_SYM
 	DATA_ACTIVE_SYM
-	DATA_TEMPORARY_BAL
 	DATA_ACTIVE_BAL
 	DATA_PUBLIC_KEY_REVERSE
-	DATA_TEMPORARY_DECIMAL
 	DATA_ACTIVE_DECIMAL
-	DATA_TEMPORARY_ADDRESS
 	DATA_ACTIVE_ADDRESS
+
 )
 
 func typToBytes(typ DataTyp) []byte {

common/vouchers.go

@@ -1,4 +1,4 @@
-package utils
+package common
 
 import (
 	"context"
@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"git.grassecon.net/urdt/ussd/internal/storage"
-	"git.grassecon.net/urdt/ussd/common"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
@@ -78,7 +77,7 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
 
 	for i, sym := range symList {
 		parts := strings.SplitN(sym, ":", 2)
-	
+
 		if input == parts[0] || strings.EqualFold(input, parts[1]) {
 			symbol = parts[1]
 			if i < len(balList) {
@@ -96,59 +95,44 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
 	return
 }
 
-// StoreTemporaryVoucher saves voucher metadata as temporary entries in the common.DataStore.
+// StoreTemporaryVoucher saves voucher metadata as temporary entries in the DataStore.
-func StoreTemporaryVoucher(ctx context.Context, store common.DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+func StoreTemporaryVoucher(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
-	entries := map[common.DataTyp][]byte{
+	tempData := fmt.Sprintf("%s,%s,%s,%s", data.TokenSymbol, data.Balance, data.TokenDecimals, data.ContractAddress)
-		common.DATA_TEMPORARY_SYM:     []byte(data.TokenSymbol),
+
-		common.DATA_TEMPORARY_BAL:     []byte(data.Balance),
+	if err := store.WriteEntry(ctx, sessionId, DATA_TEMPORARY_VALUE, []byte(tempData)); err != nil {
-		common.DATA_TEMPORARY_DECIMAL: []byte(data.TokenDecimals),
+		return err
-		common.DATA_TEMPORARY_ADDRESS: []byte(data.ContractAddress),
 	}
 
-	for key, value := range entries {
-		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
-			return err
-		}
-	}
 	return nil
 }
 
-// GetTemporaryVoucherData retrieves temporary voucher metadata from the common.DataStore.
+// GetTemporaryVoucherData retrieves temporary voucher metadata from the DataStore.
-func GetTemporaryVoucherData(ctx context.Context, store common.DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
+func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
-	keys := []common.DataTyp{
+	temp_data, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
-		common.DATA_TEMPORARY_SYM,
+	if err != nil {
-		common.DATA_TEMPORARY_BAL,
+		return nil, err
-		common.DATA_TEMPORARY_DECIMAL,
-		common.DATA_TEMPORARY_ADDRESS,
 	}
 
+	values := strings.SplitN(string(temp_data), ",", 4)
+
 	data := &dataserviceapi.TokenHoldings{}
-	values := make([][]byte, len(keys))
 
-	for i, key := range keys {
+	data.TokenSymbol = values[0]
-		value, err := store.ReadEntry(ctx, sessionId, key)
+	data.Balance = values[1]
-		if err != nil {
+	data.TokenDecimals = values[2]
-			return nil, err
+	data.ContractAddress = values[3]
-		}
-		values[i] = value
-	}
-
-	data.TokenSymbol = string(values[0])
-	data.Balance = string(values[1])
-	data.TokenDecimals = string(values[2])
-	data.ContractAddress = string(values[3])
 
 	return data, nil
 }
 
-// UpdateVoucherData sets the active voucher data and clears the temporary voucher data in the common.DataStore.
+// UpdateVoucherData sets the active voucher data and clears the temporary voucher data in the DataStore.
-func UpdateVoucherData(ctx context.Context, store common.DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+func UpdateVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
 	// Active voucher data entries
-	activeEntries := map[common.DataTyp][]byte{
+	activeEntries := map[DataTyp][]byte{
-		common.DATA_ACTIVE_SYM:     []byte(data.TokenSymbol),
+		DATA_ACTIVE_SYM:     []byte(data.TokenSymbol),
-		common.DATA_ACTIVE_BAL:     []byte(data.Balance),
+		DATA_ACTIVE_BAL:     []byte(data.Balance),
-		common.DATA_ACTIVE_DECIMAL: []byte(data.TokenDecimals),
+		DATA_ACTIVE_DECIMAL: []byte(data.TokenDecimals),
-		common.DATA_ACTIVE_ADDRESS: []byte(data.ContractAddress),
+		DATA_ACTIVE_ADDRESS: []byte(data.ContractAddress),
 	}
 
 	// Write active data

common/vouchers_test.go

@@ -1,20 +1,20 @@
-package utils
+package common
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/alecthomas/assert/v2"
 	"github.com/stretchr/testify/require"
 
 	"git.grassecon.net/urdt/ussd/internal/storage"
-	"git.grassecon.net/urdt/ussd/common"
 	memdb "git.defalsify.org/vise.git/db/mem"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
 // InitializeTestDb sets up and returns an in-memory database and store.
-func InitializeTestDb(t *testing.T) (context.Context, *common.UserDataStore) {
+func InitializeTestDb(t *testing.T) (context.Context, *UserDataStore) {
 	ctx := context.Background()
 
 	// Initialize memDb
@@ -22,8 +22,8 @@ func InitializeTestDb(t *testing.T) (context.Context, *common.UserDataStore) {
 	err := db.Connect(ctx, "")
 	require.NoError(t, err, "Failed to connect to memDb")
 
-	// Create common.UserDataStore with memDb
+	// Create UserDataStore with memDb
-	store := &common.UserDataStore{Db: db}
+	store := &UserDataStore{Db: db}
 
 	t.Cleanup(func() {
 		db.Close() // Ensure the DB is closed after each test
@@ -127,18 +127,11 @@ func TestStoreTemporaryVoucher(t *testing.T) {
 	require.NoError(t, err)
 
 	// Verify stored data
-	expectedEntries := map[common.DataTyp][]byte{
+	expectedData := fmt.Sprintf("%s,%s,%s,%s", "SRF", "200", "6", "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9")
-		common.DATA_TEMPORARY_SYM:     []byte("SRF"),
-		common.DATA_TEMPORARY_BAL:     []byte("200"),
-		common.DATA_TEMPORARY_DECIMAL: []byte("6"),
-		common.DATA_TEMPORARY_ADDRESS: []byte("0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9"),
-	}
 
-	for key, expectedValue := range expectedEntries {
+	storedValue, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
-		storedValue, err := store.ReadEntry(ctx, sessionId, key)
+	require.NoError(t, err)
-		require.NoError(t, err)
+	require.Equal(t, expectedData, string(storedValue), "Mismatch for key %v", DATA_TEMPORARY_VALUE)
-		require.Equal(t, expectedValue, storedValue, "Mismatch for key %v", key)
-	}
 }
 
 func TestGetTemporaryVoucherData(t *testing.T) {
@@ -189,11 +182,11 @@ func TestUpdateVoucherData(t *testing.T) {
 	require.NoError(t, err)
 
 	// Verify active data was stored correctly
-	activeEntries := map[common.DataTyp][]byte{
+	activeEntries := map[DataTyp][]byte{
-		common.DATA_ACTIVE_SYM:     []byte(newData.TokenSymbol),
+		DATA_ACTIVE_SYM:     []byte(newData.TokenSymbol),
-		common.DATA_ACTIVE_BAL:     []byte(newData.Balance),
+		DATA_ACTIVE_BAL:     []byte(newData.Balance),
-		common.DATA_ACTIVE_DECIMAL: []byte(newData.TokenDecimals),
+		DATA_ACTIVE_DECIMAL: []byte(newData.TokenDecimals),
-		common.DATA_ACTIVE_ADDRESS: []byte(newData.ContractAddress),
+		DATA_ACTIVE_ADDRESS: []byte(newData.ContractAddress),
 	}
 
 	for key, expectedValue := range activeEntries {

internal/handlers/ussd/menuhandler.go

@@ -19,9 +19,9 @@ import (
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/urdt/ussd/internal/utils"
 	"git.grassecon.net/urdt/ussd/common"
 	"git.grassecon.net/urdt/ussd/remote"
+	"git.grassecon.net/urdt/ussd/internal/utils"
 	"gopkg.in/leonelquinteros/gotext.v1"
 
 	"git.grassecon.net/urdt/ussd/internal/storage"
@@ -33,7 +33,6 @@ var (
 	translationDir = path.Join(scriptDir, "locale")
 	okResponse     *api.OKResponse
 	errResponse    *api.ErrResponse
-	backOption     = []byte("0")
 )
 
 // FlagManager handles centralized flag management
@@ -222,7 +221,7 @@ func (h *Handlers) VerifyNewPin(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }
 
-// SaveTemporaryPin saves the valid PIN input to the DATA_TEMPORARY_PIN
+// SaveTemporaryPin saves the valid PIN input to the DATA_TEMPORARY_VALUE
 // during the account creation process
 // and during the change PIN process
 func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@@ -247,7 +246,7 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
 
 	store := h.userdataStore
-	err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_PIN, []byte(accountPIN))
+	err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(accountPIN))
 	if err != nil {
 		return res, err
 	}
@@ -264,7 +263,7 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	flag_pin_mismatch, _ := h.flagManager.GetFlag("flag_pin_mismatch")
 
 	store := h.userdataStore
-	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_PIN)
+	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 	if err != nil {
 		return res, err
 	}
@@ -295,7 +294,7 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_PIN)
+	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 	if err != nil {
 		return res, err
 	}
@@ -334,13 +333,18 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if len(input) > 0 {
+	firstName := string(input)
-		if bytes.Equal(input, backOption) {
+	store := h.userdataStore
-			return res, nil
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+	if allowUpdate {
+		temporaryFirstName, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+		err = store.WriteEntry(ctx, sessionId, common.DATA_FIRST_NAME, []byte(temporaryFirstName))
+		if err != nil {
+			return res, err
 		}
-		firstName := string(input)
+	} else {
-		store := h.userdataStore
+		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(firstName))
-		err = store.WriteEntry(ctx, sessionId, common.DATA_FIRST_NAME, []byte(firstName))
 		if err != nil {
 			return res, err
 		}
@@ -357,20 +361,25 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if len(input) > 0 {
+
-		if bytes.Equal(input, backOption) {
+	store := h.userdataStore
-			return res, nil
+	familyName := string(input)
-		}
+
-		familyName := string(input)
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
-		store := h.userdataStore
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
-		err = store.WriteEntry(ctx, sessionId, common.DATA_FAMILY_NAME, []byte(familyName))
+
+	if allowUpdate {
+		temporaryFamilyName, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+		err = store.WriteEntry(ctx, sessionId, common.DATA_FAMILY_NAME, []byte(temporaryFamilyName))
 		if err != nil {
 			return res, err
 		}
 	} else {
-		return res, fmt.Errorf("a family name cannot be less than one character")
+		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(familyName))
+		if err != nil {
+			return res, err
+		}
 	}
-
 	return res, nil
 }
 
@@ -382,10 +391,19 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if len(input) == 4 {
+	yob := string(input)
-		yob := string(input)
+	store := h.userdataStore
-		store := h.userdataStore
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
-		err = store.WriteEntry(ctx, sessionId, common.DATA_YOB, []byte(yob))
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+
+	if allowUpdate {
+		temporaryYob, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+		err = store.WriteEntry(ctx, sessionId, common.DATA_YOB, []byte(temporaryYob))
+		if err != nil {
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(yob))
 		if err != nil {
 			return res, err
 		}
@@ -402,13 +420,20 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if len(input) > 0 {
+	location := string(input)
-		if bytes.Equal(input, backOption) {
+	store := h.userdataStore
-			return res, nil
+
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+
+	if allowUpdate {
+		temporaryLocation, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+		err = store.WriteEntry(ctx, sessionId, common.DATA_LOCATION, []byte(temporaryLocation))
+		if err != nil {
+			return res, err
 		}
-		location := string(input)
+	} else {
-		store := h.userdataStore
+		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(location))
-		err = store.WriteEntry(ctx, sessionId, common.DATA_LOCATION, []byte(location))
 		if err != nil {
 			return res, err
 		}
@@ -426,14 +451,22 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if bytes.Equal(input, backOption) {
-		return res, nil
-	}
 	gender := strings.Split(symbol, "_")[1]
 	store := h.userdataStore
-	err = store.WriteEntry(ctx, sessionId, common.DATA_GENDER, []byte(gender))
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
-	if err != nil {
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
-		return res, nil
+
+	if allowUpdate {
+		temporaryGender, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+		err = store.WriteEntry(ctx, sessionId, common.DATA_GENDER, []byte(temporaryGender))
+		if err != nil {
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(gender))
+		if err != nil {
+			return res, err
+		}
 	}
 
 	return res, nil
@@ -447,12 +480,23 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if len(input) > 0 {
+
-		offerings := string(input)
+	offerings := string(input)
-		store := h.userdataStore
+	store := h.userdataStore
-		err = store.WriteEntry(ctx, sessionId, common.DATA_OFFERINGS, []byte(offerings))
+
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+
+	if allowUpdate {
+		temporaryOfferings, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+		err = store.WriteEntry(ctx, sessionId, common.DATA_OFFERINGS, []byte(temporaryOfferings))
 		if err != nil {
-			return res, nil
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(offerings))
+		if err != nil {
+			return res, err
 		}
 	}
 
@@ -1117,7 +1161,7 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}
 
-	data := utils.ProcessVouchers(vouchersResp)
+	data := common.ProcessVouchers(vouchersResp)
 
 	// Store all voucher data
 	dataMap := map[string]string{
@@ -1167,7 +1211,7 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
 		return res, nil
 	}
 
-	metadata, err := utils.GetVoucherData(ctx, h.prefixDb, inputStr)
+	metadata, err := common.GetVoucherData(ctx, h.prefixDb, inputStr)
 	if err != nil {
 		return res, fmt.Errorf("failed to retrieve voucher data: %v", err)
 	}
@@ -1177,7 +1221,7 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
 		return res, nil
 	}
 
-	if err := utils.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
+	if err := common.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
 		return res, err
 	}
 
@@ -1198,13 +1242,13 @@ func (h *Handlers) SetVoucher(ctx context.Context, sym string, input []byte) (re
 
 
 	// Get temporary data
-	tempData, err := utils.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
+	tempData, err := common.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
 		return res, err
 	}
 
 	// Set as active and clear temporary data
-	if err := utils.UpdateVoucherData(ctx, h.userdataStore, sessionId, tempData); err != nil {
+	if err := common.UpdateVoucherData(ctx, h.userdataStore, sessionId, tempData); err != nil {
 		return res, err
 	}
 

internal/handlers/ussd/menuhandler_test.go

@@ -168,8 +168,11 @@ func TestWithPersister_PanicWhenAlreadySet(t *testing.T) {
 }
 
 func TestSaveFirstname(t *testing.T) {
-	// Create a new instance of MockMyDataStore
+	// Create new mocks
 	mockStore := new(mocks.MockUserDataStore)
+	mockState := state.NewState(16)
+
+	fm, err := NewFlagManager(flagsPath)
 
 	// Define test data
 	sessionId := "session123"
@@ -177,11 +180,13 @@ func TestSaveFirstname(t *testing.T) {
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	// Set up the expected behavior of the mock
-	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_FIRST_NAME, []byte(firstName)).Return(nil)
+	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(firstName)).Return(nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		flagManager:   fm.parser,
+		st:            mockState,
 	}
 
 	// Call the method
@@ -198,6 +203,9 @@ func TestSaveFirstname(t *testing.T) {
 func TestSaveFamilyname(t *testing.T) {
 	// Create a new instance of UserDataStore
 	mockStore := new(mocks.MockUserDataStore)
+	mockState := state.NewState(16)
+
+	fm, err := NewFlagManager(flagsPath)
 
 	// Define test data
 	sessionId := "session123"
@@ -205,11 +213,13 @@ func TestSaveFamilyname(t *testing.T) {
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	// Set up the expected behavior of the mock
-	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_FAMILY_NAME, []byte(familyName)).Return(nil)
+	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(familyName)).Return(nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		st:            mockState,
+		flagManager:   fm.parser,
 	}
 
 	// Call the method
@@ -265,7 +275,7 @@ func TestSaveTemporaryPin(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 
 			// Set up the expected behavior of the mock
-			mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_PIN, []byte(tt.input)).Return(nil)
+			mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(tt.input)).Return(nil)
 
 			// Call the method
 			res, err := h.SaveTemporaryPin(ctx, "save_pin", tt.input)
@@ -282,8 +292,11 @@ func TestSaveTemporaryPin(t *testing.T) {
 }
 
 func TestSaveYoB(t *testing.T) {
-	// Create a new instance of MockMyDataStore
+	// Create  new instances
 	mockStore := new(mocks.MockUserDataStore)
+	mockState := state.NewState(16)
+
+	fm, err := NewFlagManager(flagsPath)
 
 	// Define test data
 	sessionId := "session123"
@@ -291,11 +304,13 @@ func TestSaveYoB(t *testing.T) {
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	// Set up the expected behavior of the mock
-	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_YOB, []byte(yob)).Return(nil)
+	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(yob)).Return(nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		st:            mockState,
+		flagManager:   fm.parser,
 	}
 
 	// Call the method
@@ -312,6 +327,9 @@ func TestSaveYoB(t *testing.T) {
 func TestSaveLocation(t *testing.T) {
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)
+	mockState := state.NewState(16)
+
+	fm, err := NewFlagManager(flagsPath)
 
 	// Define test data
 	sessionId := "session123"
@@ -319,11 +337,13 @@ func TestSaveLocation(t *testing.T) {
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	// Set up the expected behavior of the mock
-	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_LOCATION, []byte(yob)).Return(nil)
+	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(yob)).Return(nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		st:            mockState,
+		flagManager:   fm.parser,
 	}
 
 	// Call the method
@@ -340,6 +360,9 @@ func TestSaveLocation(t *testing.T) {
 func TestSaveOfferings(t *testing.T) {
 	// Create a new instance of MockUserDataStore
 	mockStore := new(mocks.MockUserDataStore)
+	mockState := state.NewState(16)
+
+	fm, err := NewFlagManager(flagsPath)
 
 	// Define test data
 	sessionId := "session123"
@@ -347,11 +370,13 @@ func TestSaveOfferings(t *testing.T) {
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	// Set up the expected behavior of the mock
-	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_OFFERINGS, []byte(offerings)).Return(nil)
+	mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(offerings)).Return(nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		st:            mockState,
+		flagManager:   fm.parser,
 	}
 
 	// Call the method
@@ -366,10 +391,12 @@ func TestSaveOfferings(t *testing.T) {
 }
 
 func TestSaveGender(t *testing.T) {
-	// Create a new instance of MockMyDataStore
+	// Create a new mock instances
 	mockStore := new(mocks.MockUserDataStore)
 	mockState := state.NewState(16)
 
+	fm, _ := NewFlagManager(flagsPath)
+
 	// Define the session ID and context
 	sessionId := "session123"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
@@ -409,16 +436,17 @@ func TestSaveGender(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Set up expectations for the mock database
 			if tt.expectCall {
-				expectedKey := common.DATA_GENDER
+				expectedKey := common.DATA_TEMPORARY_VALUE
 				mockStore.On("WriteEntry", ctx, sessionId, expectedKey, []byte(tt.expectedGender)).Return(nil)
 			} else {
-				mockStore.On("WriteEntry", ctx, sessionId, common.DATA_GENDER, []byte(tt.expectedGender)).Return(nil)
+				mockStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(tt.expectedGender)).Return(nil)
 			}
 			mockState.ExecPath = append(mockState.ExecPath, tt.executingSymbol)
 			// Create the Handlers instance with the mock store
 			h := &Handlers{
 				userdataStore: mockStore,
 				st:            mockState,
+				flagManager:   fm.parser,
 			}
 
 			// Call the method
@@ -429,9 +457,9 @@ func TestSaveGender(t *testing.T) {
 
 			// Verify expectations
 			if tt.expectCall {
-				mockStore.AssertCalled(t, "WriteEntry", ctx, sessionId, common.DATA_GENDER, []byte(tt.expectedGender))
+				mockStore.AssertCalled(t, "WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(tt.expectedGender))
 			} else {
-				mockStore.AssertNotCalled(t, "WriteEntry", ctx, sessionId, common.DATA_GENDER, []byte(tt.expectedGender))
+				mockStore.AssertNotCalled(t, "WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(tt.expectedGender))
 			}
 		})
 	}
@@ -1006,7 +1034,7 @@ func TestVerifyCreatePin(t *testing.T) {
 		},
 	}
 
-	typ := common.DATA_TEMPORARY_PIN
+	typ := common.DATA_TEMPORARY_VALUE
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1746,7 +1774,7 @@ func TestConfirmPin(t *testing.T) {
 			// Set up the expected behavior of the mock
 			mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_PIN, []byte(tt.temporarypin)).Return(nil)
 
-			mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_TEMPORARY_PIN).Return(tt.temporarypin, nil)
+			mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE).Return(tt.temporarypin, nil)
 
 			//Call the function under test
 			res, _ := h.ConfirmPinChange(ctx, "confirm_pin_change", tt.temporarypin)
@@ -1984,16 +2012,9 @@ func TestViewVoucher(t *testing.T) {
 	}
 
 	// Set up expectations for mockDataStore
-	expectedData := map[common.DataTyp]string{
+	expectedData := fmt.Sprintf("%s,%s,%s,%s", "SRF", "100", "6", "0xd4c288865Ce")
-		common.DATA_TEMPORARY_SYM:     "SRF",
-		common.DATA_TEMPORARY_BAL:     "100",
-		common.DATA_TEMPORARY_DECIMAL: "6",
-		common.DATA_TEMPORARY_ADDRESS: "0xd4c288865Ce",
-	}
 
-	for dataType, dataValue := range expectedData {
+	mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(expectedData)).Return(nil)
-		mockDataStore.On("WriteEntry", ctx, sessionId, dataType, []byte(dataValue)).Return(nil)
-	}
 
 	res, err := h.ViewVoucher(ctx, "view_voucher", []byte("1"))
 	assert.NoError(t, err)
@@ -2017,6 +2038,8 @@ func TestSetVoucher(t *testing.T) {
 		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
 	}
 
+	expectedData := fmt.Sprintf("%s,%s,%s,%s", "SRF", "200", "6", "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9")
+
 	// Define the expected active entries
 	activeEntries := map[common.DataTyp][]byte{
 		common.DATA_ACTIVE_SYM:     []byte(tempData.TokenSymbol),
@@ -2025,30 +2048,14 @@ func TestSetVoucher(t *testing.T) {
 		common.DATA_ACTIVE_ADDRESS: []byte(tempData.ContractAddress),
 	}
 
-	// Define the temporary entries to be cleared
-	tempEntries := map[common.DataTyp][]byte{
-		common.DATA_TEMPORARY_SYM:     []byte(""),
-		common.DATA_TEMPORARY_BAL:     []byte(""),
-		common.DATA_TEMPORARY_DECIMAL: []byte(""),
-		common.DATA_TEMPORARY_ADDRESS: []byte(""),
-	}
-
 	// Mocking ReadEntry calls for temporary data retrieval
-	mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_TEMPORARY_SYM).Return([]byte(tempData.TokenSymbol), nil)
+	mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_TEMPORARY_VALUE).Return([]byte(expectedData), nil)
-	mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_TEMPORARY_BAL).Return([]byte(tempData.Balance), nil)
-	mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_TEMPORARY_DECIMAL).Return([]byte(tempData.TokenDecimals), nil)
-	mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_TEMPORARY_ADDRESS).Return([]byte(tempData.ContractAddress), nil)
 
 	// Mocking WriteEntry calls for setting active data
 	for key, value := range activeEntries {
 		mockDataStore.On("WriteEntry", ctx, sessionId, key, value).Return(nil)
 	}
 
-	// Mocking WriteEntry calls for clearing temporary data
-	for key, value := range tempEntries {
-		mockDataStore.On("WriteEntry", ctx, sessionId, key, value).Return(nil)
-	}
-
 	h := &Handlers{
 		userdataStore: mockDataStore,
 	}

services/registration/enter_familyname.vis

@@ -1,5 +1,5 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_familyname flag_allow_update 1
 MOUT back 0
 HALT
 LOAD save_familyname 0

services/registration/enter_location.vis

@@ -1,5 +1,5 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_location flag_allow_update 1
 MOUT back 0
 HALT
 LOAD save_location 0

services/registration/enter_name.vis

@@ -1,5 +1,5 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_firstname flag_allow_update 1
 MOUT back 0
 HALT
 LOAD save_firstname 0

services/registration/enter_offerings.vis

@@ -1,5 +1,5 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_offerings flag_allow_update 1
 LOAD save_offerings 0
 MOUT back 0
 HALT

services/registration/enter_yob.vis

@@ -1,10 +1,10 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_yob flag_allow_update 1
-LOAD save_yob 0
 MOUT back 0
 HALT
 LOAD verify_yob 0
 CATCH incorrect_date_format flag_incorrect_date_format 1
+LOAD save_yob 0
 RELOAD save_yob
 INCMP _ 0
 INCMP pin_entry *

services/registration/set_female.vis

@@ -1,4 +1,4 @@
 LOAD save_gender 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_gender flag_allow_update 1
 MOVE pin_entry

services/registration/set_male.vis

@@ -1,4 +1,4 @@
 LOAD save_gender 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_gender flag_allow_update 1
 MOVE pin_entry

services/registration/set_unspecified.vis

@@ -1,4 +1,4 @@
 LOAD save_gender 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_gender flag_allow_update 1
 MOVE pin_entry

services/registration/update_age

@@ -0,0 +1,2 @@
+RELOAD save_yob
+CATCH profile_update_success flag_allow_update 1

services/registration/update_familyname.vis

@@ -0,0 +1,2 @@
+RELOAD save_familyname
+CATCH profile_update_success flag_allow_update 1

services/registration/update_firstname.vis

@@ -0,0 +1,2 @@
+RELOAD save_firstname
+CATCH profile_update_success flag_allow_update 1

services/registration/update_gender.vis

@@ -0,0 +1,2 @@
+RELOAD save_gender
+CATCH profile_update_success flag_allow_update 1

services/registration/update_location.vis

@@ -0,0 +1,2 @@
+RELOAD save_location
+CATCH profile_update_success flag_allow_update 1

services/registration/update_offerings.vis

@@ -0,0 +1,2 @@
+RELOAD save_offerings
+CATCH profile_update_success flag_allow_update 1

services/registration/update_yob.vis

@@ -0,0 +1,2 @@
+RELOAD save_yob
+CATCH profile_update_success flag_allow_update 1