urdt/ussd
5
0
Fork 1
Code Issues 69 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

add-space-after-colon #211

Merged
lash merged 20 commits from add-space-after-colon into master 2024-12-19 11:35:14 +01:00
Conversation 0 Commits 20 Files Changed 8 +22 -28
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fda68231ea - Show all commits

50
internal/handlers/ussd/menuhandler.go
View File

@ -69,18 +69,19 @@ func (fm *FlagManager) GetFlag(label string) (uint32, error) {
}
type Handlers struct {
pe *persist.Persister
st *state.State
ca cache.Memory
userdataStore common.DataStore
adminstore *utils.AdminStore
flagManager *asm.FlagParser
accountService remote.AccountServiceInterface
prefixDb storage.PrefixDb
profile *models.Profile
pe *persist.Persister
st *state.State
ca cache.Memory
userdataStore common.DataStore
adminstore *utils.AdminStore
flagManager *asm.FlagParser
accountService remote.AccountServiceInterface
prefixDb storage.PrefixDb
profile *models.Profile
ReplaceSeparator 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, replaceSeparator 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,
flagManager: appFlags,
adminstore: adminstore,
accountService: accountService,
prefixDb: prefixDb,
profile: &models.Profile{Max: 6},
userdataStore: userDb,
flagManager: appFlags,
adminstore: adminstore,
accountService: accountService,
prefixDb: prefixDb,
profile: &models.Profile{Max: 6},
ReplaceSeparator: replaceSeparator,
lash commented 2024-12-19 09:40:45 +01:00
Outdated
Review
Copy Link

Let's name it ReplaceSeparatorFunc

Let's name it `ReplaceSeparatorFunc`
Alfred-mk commented 2024-12-19 11:33:13 +01:00
Outdated
Review
Copy Link

This has been done

This has been done
}
return h, nil
}
@ -1676,11 +1678,6 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result
lash commented 2024-12-13 09:51:43 +01:00
Outdated
Review
Copy Link

why wouldnt this be set directly as a property in the handler?

why wouldnt this be set directly as a property in the handler?
Alfred-mk commented 2024-12-13 11:19:54 +01:00
Outdated
Review
Copy Link

It would be easier setting it in the context for use by downstream functions, similar to how the database is set.

Also. it won't be used by most of the handler functions. It's only usable by functions that generate custom menu items (such as the voucher list and transfers list)

It would be easier setting it in the context for use by downstream functions, similar to how the database is set. Also. it won't be used by most of the handler functions. It's only usable by functions that generate custom menu items (such as the voucher list and transfers list)
lash commented 2024-12-13 16:23:46 +01:00
Outdated
Review
Copy Link

ref phone conversation, let store a function pointer in the handlers that does the translation with the separator selected :)

ref phone conversation, let store a function pointer in the handlers that does the translation with the separator selected :)
Alfred-mk commented 2024-12-18 20:35:04 +01:00
Outdated
Review
Copy Link

This has been done. The function is passed from the LocalHandlerService to the Handlers

This has been done. The function is passed from the LocalHandlerService to the Handlers
menuSeparator, ok := ctx.Value("MenuSeparator").(string)
if !ok {
return res, fmt.Errorf("missing menu Separator")
}
// Read vouchers from the store
voucherData, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS))
if err != nil {
@ -1688,7 +1685,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
return res, err
}
formattedData := strings.ReplaceAll(string(voucherData), ":", menuSeparator)
formattedData := h.ReplaceSeparator(string(voucherData))
res.Content = string(formattedData)
@ -1861,11 +1858,6 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input []
return res, fmt.Errorf("missing session")
}
menuSeparator, ok := ctx.Value("MenuSeparator").(string)
if !ok {
return res, fmt.Errorf("missing menu Separator")
}
store := h.userdataStore
publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
if err != nil {
@ -1913,7 +1905,9 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input []
status = "Sent"
}
formattedTransactions = append(formattedTransactions, fmt.Sprintf("%d%s%s %s %s %s", i+1, menuSeparator, status, value, sym, date))
// Use the ReplaceSeparator function for the menu separator
transactionLine := fmt.Sprintf("%d%s%s %s %s %s", i+1, h.ReplaceSeparator(":"), status, value, sym, date)
formattedTransactions = append(formattedTransactions, transactionLine)
}
res.Content = strings.Join(formattedTransactions, "\n")