Merge pull request 'add-space-after-colon' (#211) from add-space-after-colon into master

Reviewed-on: urdt/ussd#211

cmd/africastalking/main.go

@@ -29,10 +29,10 @@ import (
 )
 
 var (
-	logg      = logging.NewVanilla()
+	logg          = logging.NewVanilla()
-	scriptDir = path.Join("services", "registration")
+	scriptDir     = path.Join("services", "registration")
-
+	build         = "dev"
-	build = "dev"
+	menuSeparator = ": "
 )
 
 func init() {
@@ -130,9 +130,10 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:       "root",
+		Root:          "root",
-		OutputSize: uint32(size),
+		OutputSize:    uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/async/main.go

@@ -23,6 +23,7 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
+	menuSeparator = ": "
 )
 
 func init() {
@@ -70,9 +71,10 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:       "root",
+		Root:          "root",
-		OutputSize: uint32(size),
+		OutputSize:    uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/http/main.go

@@ -26,6 +26,7 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
+	menuSeparator = ": "
 )
 
 func init() {
@@ -58,9 +59,10 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:       "root",
+		Root:          "root",
-		OutputSize: uint32(size),
+		OutputSize:    uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/main.go

@@ -18,8 +18,9 @@ import (
 )
 
 var (
-	logg      = logging.NewVanilla()
+	logg          = logging.NewVanilla()
-	scriptDir = path.Join("services", "registration")
+	scriptDir     = path.Join("services", "registration")
+	menuSeparator = ": "
 )
 
 func init() {
@@ -49,10 +50,11 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:       "root",
+		Root:          "root",
-		SessionId:  sessionId,
+		SessionId:     sessionId,
-		OutputSize: uint32(size),
+		OutputSize:    uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	resourceDir := scriptDir

common/transfer_statements.go

@@ -84,18 +84,18 @@ func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string,
 
 	// Adjust for 0-based indexing
 	i := index - 1
-	transactionType := "received"
+	transactionType := "Received"
-	party := fmt.Sprintf("from: %s", strings.TrimSpace(senders[i]))
+	party := fmt.Sprintf("From: %s", strings.TrimSpace(senders[i]))
 	if strings.TrimSpace(senders[i]) == publicKey {
-		transactionType = "sent"
+		transactionType = "Sent"
-		party = fmt.Sprintf("to: %s", strings.TrimSpace(recipients[i]))
+		party = fmt.Sprintf("To: %s", strings.TrimSpace(recipients[i]))
 	}
 
 	formattedDate := formatDate(strings.TrimSpace(dates[i]))
 
 	// Build the full transaction detail
 	detail := fmt.Sprintf(
-		"%s %s %s\n%s\ncontract address: %s\ntxhash: %s\ndate: %s",
+		"%s %s %s\n%s\nContract address: %s\nTxhash: %s\nDate: %s",
 		transactionType,
 		strings.TrimSpace(values[i]),
 		strings.TrimSpace(syms[i]),

internal/handlers/handlerservice.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"context"
+	"strings"
 
 	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
@@ -64,7 +65,11 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 }
 
 func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService)
+	replaceSeparatorFunc := func(input string) string {
+		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
+	}
+
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}

internal/handlers/ussd/menuhandler.go

@@ -69,18 +69,19 @@ func (fm *FlagManager) GetFlag(label string) (uint32, error) {
 }
 
 type Handlers struct {
-	pe             *persist.Persister
+	pe               *persist.Persister
-	st             *state.State
+	st               *state.State
-	ca             cache.Memory
+	ca               cache.Memory
-	userdataStore  common.DataStore
+	userdataStore    common.DataStore
-	adminstore     *utils.AdminStore
+	adminstore       *utils.AdminStore
-	flagManager    *asm.FlagParser
+	flagManager      *asm.FlagParser
-	accountService remote.AccountServiceInterface
+	accountService   remote.AccountServiceInterface
-	prefixDb       storage.PrefixDb
+	prefixDb         storage.PrefixDb
-	profile        *models.Profile
+	profile          *models.Profile
+	ReplaceSeparatorFunc func(string) string
 }
 
-func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *utils.AdminStore, accountService remote.AccountServiceInterface) (*Handlers, error) {
+func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *utils.AdminStore, accountService remote.AccountServiceInterface, replaceSeparatorFunc func(string) string) (*Handlers, error) {
 	if userdataStore == nil {
 		return nil, fmt.Errorf("cannot create handler with nil userdata store")
 	}
@@ -93,12 +94,13 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *util
 	prefixDb := storage.NewSubPrefixDb(userdataStore, prefix)
 
 	h := &Handlers{
-		userdataStore:  userDb,
+		userdataStore:    userDb,
-		flagManager:    appFlags,
+		flagManager:      appFlags,
-		adminstore:     adminstore,
+		adminstore:       adminstore,
-		accountService: accountService,
+		accountService:   accountService,
-		prefixDb:       prefixDb,
+		prefixDb:         prefixDb,
-		profile:        &models.Profile{Max: 6},
+		profile:          &models.Profile{Max: 6},
+		ReplaceSeparatorFunc: replaceSeparatorFunc,
 	}
 	return h, nil
 }
@@ -1683,7 +1685,9 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
 		return res, err
 	}
 
-	res.Content = string(voucherData)
+	formattedData := h.ReplaceSeparatorFunc(string(voucherData))
+
+	res.Content = string(formattedData)
 
 	return res, nil
 }
@@ -1846,13 +1850,14 @@ func (h *Handlers) CheckTransactions(ctx context.Context, sym string, input []by
 	return res, nil
 }
 
-// GetTransactionsList fetches the list of transactions and formats them
+// GetTransactionsList reads the list of transactions from the db and formats them
 func (h *Handlers) GetTransactionsList(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")
 	}
+
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 	if err != nil {
@@ -1895,12 +1900,14 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input []
 		value := strings.TrimSpace(values[i])
 		date := strings.Split(strings.TrimSpace(dates[i]), " ")[0]
 
-		status := "received"
+		status := "Received"
 		if sender == string(publicKey) {
-			status = "sent"
+			status = "Sent"
 		}
 
-		formattedTransactions = append(formattedTransactions, fmt.Sprintf("%d:%s %s %s %s", i+1, status, value, sym, date))
+		// Use the ReplaceSeparator function for the menu separator
+		transactionLine := fmt.Sprintf("%d%s%s %s %s %s", i+1, h.ReplaceSeparatorFunc(":"), status, value, sym, date)
+		formattedTransactions = append(formattedTransactions, transactionLine)
 	}
 
 	res.Content = strings.Join(formattedTransactions, "\n")

internal/handlers/ussd/menuhandler_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"path"
+	"strings"
 	"testing"
 
 	"git.defalsify.org/vise.git/lang"
@@ -32,6 +33,11 @@ var (
 	flagsPath = path.Join(baseDir, "services", "registration", "pp.csv")
 )
 
+// mockReplaceSeparator function
+var mockReplaceSeparator = func(input string) string {
+	return strings.ReplaceAll(input, ":", ": ")
+}
+
 // InitializeTestStore sets up and returns an in-memory database and store.
 func InitializeTestStore(t *testing.T) (context.Context, *common.UserDataStore) {
 	ctx := context.Background()
@@ -67,12 +73,15 @@ func TestNewHandlers(t *testing.T) {
 	_, store := InitializeTestStore(t)
 
 	fm, err := NewFlagManager(flagsPath)
-	accountService := testservice.TestAccountService{}
 	if err != nil {
-		t.Logf(err.Error())
+		log.Fatal(err)
 	}
+
+	accountService := testservice.TestAccountService{}
+
+	// Test case for valid UserDataStore
 	t.Run("Valid UserDataStore", func(t *testing.T) {
-		handlers, err := NewHandlers(fm.parser, store, nil, &accountService)
+		handlers, err := NewHandlers(fm.parser, store, nil, &accountService, mockReplaceSeparator)
 		if err != nil {
 			t.Fatalf("expected no error, got %v", err)
 		}
@@ -82,19 +91,30 @@ func TestNewHandlers(t *testing.T) {
 		if handlers.userdataStore == nil {
 			t.Fatal("expected userdataStore to be set in handlers")
 		}
+		if handlers.ReplaceSeparatorFunc == nil {
+			t.Fatal("expected ReplaceSeparatorFunc to be set in handlers")
+		}
+
+		// Test ReplaceSeparatorFunc functionality
+		input := "1:Menu item"
+		expectedOutput := "1: Menu item"
+		if handlers.ReplaceSeparatorFunc(input) != expectedOutput {
+			t.Fatalf("ReplaceSeparatorFunc function did not return expected output: got %v, want %v", handlers.ReplaceSeparatorFunc(input), expectedOutput)
+		}
 	})
 
-	// Test case for nil userdataStore
+	// Test case for nil UserDataStore
 	t.Run("Nil UserDataStore", func(t *testing.T) {
-		handlers, err := NewHandlers(fm.parser, nil, nil, &accountService)
+		handlers, err := NewHandlers(fm.parser, nil, nil, &accountService, mockReplaceSeparator)
 		if err == nil {
 			t.Fatal("expected an error, got none")
 		}
 		if handlers != nil {
 			t.Fatal("expected handlers to be nil")
 		}
-		if err.Error() != "cannot create handler with nil userdata store" {
+		expectedError := "cannot create handler with nil userdata store"
-			t.Fatalf("expected specific error, got %v", err)
+		if err.Error() != expectedError {
+			t.Fatalf("expected error '%s', got '%v'", expectedError, err)
 		}
 	})
 }
@@ -1982,26 +2002,31 @@ func TestCheckVouchers(t *testing.T) {
 
 func TestGetVoucherList(t *testing.T) {
 	sessionId := "session123"
+
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	spdb := InitializeTestSubPrefixDb(t, ctx)
 
+	// Initialize Handlers
 	h := &Handlers{
-		prefixDb: spdb,
+		prefixDb:             spdb,
+		ReplaceSeparatorFunc: mockReplaceSeparator,
 	}
 
-	expectedSym := []byte("1:SRF\n2:MILO")
+	mockSyms := []byte("1:SRF\n2:MILO")
 
 	// Put voucher sym data from the store
-	err := spdb.Put(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS), expectedSym)
+	err := spdb.Put(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS), mockSyms)
 	if err != nil {
 		t.Fatal(err)
 	}
 
+	expectedSyms := []byte("1: SRF\n2: MILO")
+
 	res, err := h.GetVoucherList(ctx, "", []byte(""))
 
 	assert.NoError(t, err)
-	assert.Equal(t, res.Content, string(expectedSym))
+	assert.Equal(t, res.Content, string(expectedSyms))
 }
 
 func TestViewVoucher(t *testing.T) {