grassrootseconomics/sarafu-vise
8
0
Fork 0
Code Issues 14 Pull Requests 7 Actions Packages Projects Releases Wiki Activity

ens #32

Merged
lash merged 21 commits from ens into master 2025-03-07 06:00:18 +01:00
Conversation 0 Commits 21 Files Changed 32 +37 -31
1 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e97d4be296 - Show all commits

68
handlers/application/menuhandler.go
View File

@ -3,6 +3,7 @@ package application
import (
"bytes"
"context"
"errors"
"fmt"
"path"
"strconv"
@ -1119,7 +1120,6 @@ 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
}
lash commented 2025-02-28 23:12:02 +01:00
Review
Copy Link

is this the correct flag to set?

is this the correct flag to set?
carlos commented 2025-03-03 10:36:43 +01:00
Review
Copy Link

This line of code is actually misplaced. The right flag would have been "flag flag_alias_set" but it is not being utilized or checked in the associated vis file. The commit c2a0b05c84 removes this unnecessary line.

This line of code is actually misplaced. The right flag would have been "flag flag_alias_set" but it is not being utilized or checked in the associated `vis ` file. The commit c2a0b05c84462067456970de472e5240dd6a0cd9 removes this unnecessary line.
res.FlagSet = append(res.FlagSet, flag_offerings_set)
res.Content = string(profileInfo)
default:
break
@ -1438,6 +1438,33 @@ func (h *MenuHandlers) ShowBlockedAccount(ctx context.Context, sym string, input
return res, nil
}
// loadUserContent loads the main user content in the main menu: the alias,balance associated with active voucher
func loadUserContent(ctx context.Context, activeSym string, balance string, alias string) (string, error) {
var content string
code := codeFromCtx(ctx)
l := gotext.NewLocale(translationDir, code)
l.AddDomain("default")
balFloat, err := strconv.ParseFloat(balance, 64)
if err != nil {
//Only exclude ErrSyntax error to avoid returning an error if the active bal is not available yet
if !errors.Is(err, strconv.ErrSyntax) {
logg.ErrorCtxf(ctx, "failed to parse activeBal as float", "value", balance, "error", err)
return "", err
}
balFloat = 0.00
}
// Format to 2 decimal places
balStr := fmt.Sprintf("%.2f %s", balFloat, activeSym)
if alias != "" {
content = l.Get("%s balance: %s\n", alias, balStr)
} else {
content = l.Get("balance: %s\n", balStr)
}
return content, nil
}
// 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) {
@ -1454,10 +1481,6 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
return res, fmt.Errorf("missing session")
}
code := codeFromCtx(ctx)
l := gotext.NewLocale(translationDir, code)
l.AddDomain("default")
store := h.userdataStore
accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
@ -1473,42 +1496,25 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
// get the active sym and active balance
activeSym, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
if err != nil {
if db.IsNotFound(err) {
balance := "0.00"
if alias != "" {
content = l.Get("%s balance: %s\n", alias, balance)
} else {
content = l.Get("balance: %s\n", balance)
}
res.Content = content
return res, nil
if !db.IsNotFound(err) {
logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", storedb.DATA_ACTIVE_SYM, "error", err)
return res, err
}
logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", storedb.DATA_ACTIVE_SYM, "error", err)
return res, err
}
activeBal, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
if err != nil {
logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
return res, err
if !db.IsNotFound(err) {
lash commented 2025-02-28 23:14:14 +01:00
Outdated
Review
Copy Link

DRY?

DRY?
carlos commented 2025-03-03 10:55:30 +01:00
Outdated
Review
Copy Link

Commit: e97d4be296 aims to resolve this. The CheckBalance should possibly be refactored further maybe? Currently it not only loads the balance,but also the user alias if set.

Commit: e97d4be296ee2dd35197b28aabb7487fc3061886 aims to resolve this. The `CheckBalance` should possibly be refactored further maybe? Currently it not only loads the balance,but also the user alias if set.
logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
return res, err
}
}
// Convert activeBal from []byte to float64
balFloat, err := strconv.ParseFloat(string(activeBal), 64)
content, err = loadUserContent(ctx, string(activeSym), string(activeBal), alias)
if err != nil {
logg.ErrorCtxf(ctx, "failed to parse activeBal as float", "value", string(activeBal), "error", err)
return res, err
}
// Format to 2 decimal places
balStr := fmt.Sprintf("%.2f %s", balFloat, activeSym)
if alias != "" {
content = l.Get("%s balance: %s\n", alias, balStr)
} else {
content = l.Get("balance: %s\n", balStr)
}
res.Content = content
return res, nil