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

Merge branch 'master' into send-menu-update

Browse Source
This commit is contained in:
Alfred Kamanda 2024-10-24 15:58:59 +03:00
commit ec4e44a27c
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,6 +650,10 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
code := codeFromCtx(ctx)
l := gotext.NewLocale(translationDir, code)
l.AddDomain("default")
store := h.userdataStore store := h.userdataStore
publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY) publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
if err != nil { if err != nil {
@ -666,7 +670,8 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
} }
res.FlagReset = append(res.FlagReset, flag_api_error) res.FlagReset = append(res.FlagReset, flag_api_error)
balance := balanceResponse.Result.Balance balance := balanceResponse.Result.Balance
res.Content = balance
res.Content = l.Get("Balance: %s\n", balance)
return res, nil return res, nil
} }

7
internal/handlers/ussd/menuhandler_test.go
View File

@ -1614,7 +1614,6 @@ func TestValidateRecipient(t *testing.T) {
} }
func TestCheckBalance(t *testing.T) { func TestCheckBalance(t *testing.T) {
sessionId := "session123" sessionId := "session123"
publicKey := "0X13242618721" publicKey := "0X13242618721"
fm, _ := NewFlagManager(flagsPath) fm, _ := NewFlagManager(flagsPath)
@ -1644,7 +1643,7 @@ func TestCheckBalance(t *testing.T) {
}, },
}, },
{ {
name: "Test when checking a balance is a success", name: "Test when checking a balance is a success",
balanceResonse: &models.BalanceResponse{ balanceResonse: &models.BalanceResponse{
Ok: true, Ok: true,
Result: struct { Result: struct {
@ -1656,7 +1655,7 @@ func TestCheckBalance(t *testing.T) {
}, },
}, },
expectedResult: resource.Result{ expectedResult: resource.Result{
Content: "0.003 CELO", Content: "Balance: 0.003 CELO\n",
FlagReset: []uint32{flag_api_error}, FlagReset: []uint32{flag_api_error},
}, },
}, },
@ -1689,10 +1688,8 @@ func TestCheckBalance(t *testing.T) {
//Assert that the result set to content is what was expected //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") assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
}) })
} }
} }
func TestGetProfile(t *testing.T) { func TestGetProfile(t *testing.T) {

4
services/registration/locale/swa/default.po
View File

@ -7,6 +7,8 @@ msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
msgid "Thank you for using Sarafu. Goodbye!" msgid "Thank you for using Sarafu. Goodbye!"
msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!" msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
msgid "For more help,please call: 0757628885" msgid "For more help,please call: 0757628885"
msgstr "Kwa usaidizi zaidi,piga: 0757628885" msgstr "Kwa usaidizi zaidi,piga: 0757628885"
msgid "Balance: %s\n"
msgstr "Salio: %s\n"

2
services/registration/main
View File

@ -1 +1 @@
Balance: {{.check_balance}} {{.check_balance}}

2
services/registration/main_swa
View File

@ -1 +1 @@
Salio: {{.check_balance}} {{.check_balance}}