diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index 5c1caff..ba82b47 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -152,7 +152,8 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r code := strings.Split(symbol, "_")[1] if !utils.IsValidISO639(code) { - return res, nil + //Fallback to english instead? + code = "eng" } res.FlagSet = append(res.FlagSet, state.FLAG_LANG) res.Content = code @@ -761,12 +762,11 @@ func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (res return res, nil } - if len(date) == 4 { + if utils.IsValidYOb(date) { res.FlagReset = append(res.FlagReset, flag_incorrect_date_format) } else { res.FlagSet = append(res.FlagSet, flag_incorrect_date_format) } - return res, nil } @@ -815,7 +815,17 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) ( return res, err } - res.Content = l.Get("Balance: %s\n", fmt.Sprintf("%s %s", activeBal, activeSym)) + // Convert activeBal from []byte to float64 + balFloat, err := strconv.ParseFloat(string(activeBal), 64) + 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) + + res.Content = l.Get("Balance: %s\n", balStr) return res, nil } @@ -1392,14 +1402,7 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) offerings := getEntryOrDefault(store.ReadEntry(ctx, sessionId, common.DATA_OFFERINGS)) // Construct the full name - name := defaultValue - if familyName != defaultValue { - if firstName == defaultValue { - name = familyName - } else { - name = firstName + " " + familyName - } - } + name := utils.ConstructName(firstName, familyName, defaultValue) // Calculate age from year of birth age := defaultValue @@ -1614,6 +1617,10 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r return res, fmt.Errorf("missing session") } + code := codeFromCtx(ctx) + l := gotext.NewLocale(translationDir, code) + l.AddDomain("default") + flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher") inputStr := string(input) @@ -1638,7 +1645,7 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r } res.FlagReset = append(res.FlagReset, flag_incorrect_voucher) - res.Content = fmt.Sprintf("%s\n%s", metadata.TokenSymbol, metadata.Balance) + res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance) return res, nil } diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index 6f1d57a..d7cd855 100644 --- a/internal/handlers/ussd/menuhandler_test.go +++ b/internal/handlers/ussd/menuhandler_test.go @@ -1498,10 +1498,10 @@ func TestValidateRecipient(t *testing.T) { }{ { name: "Test with invalid recepient", - input: []byte("9234adf5"), + input: []byte("7?1234"), expectedResult: resource.Result{ FlagSet: []uint32{flag_invalid_recipient}, - Content: "9234adf5", + Content: "7?1234", }, }, { @@ -1517,22 +1517,40 @@ func TestValidateRecipient(t *testing.T) { input: []byte("0711223344"), expectedResult: resource.Result{}, }, + { + name: "Test with address", + input: []byte("0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9"), + expectedResult: resource.Result{}, + }, + { + name: "Test with alias recepient", + input: []byte("alias123"), + expectedResult: resource.Result{}, + }, } // store a public key for the valid recipient - err = store.WriteEntry(ctx, "0711223344", common.DATA_PUBLIC_KEY, []byte(publicKey)) + err = store.WriteEntry(ctx, "+254711223344", common.DATA_PUBLIC_KEY, []byte(publicKey)) if err != nil { t.Fatal(err) } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { + mockAccountService := new(mocks.MockAccountService) // Create the Handlers instance h := &Handlers{ - flagManager: fm.parser, - userdataStore: store, + flagManager: fm.parser, + userdataStore: store, + accountService: mockAccountService, } + aliasResponse := &dataserviceapi.AliasAddress{ + Address: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9", + } + + mockAccountService.On("CheckAliasAddress", string(tt.input)).Return(aliasResponse, nil) + // Call the method res, err := h.ValidateRecipient(ctx, "validate_recepient", tt.input) @@ -1564,7 +1582,7 @@ func TestCheckBalance(t *testing.T) { publicKey: "0X98765432109", activeSym: "ETH", activeBal: "1.5", - expectedResult: resource.Result{Content: "Balance: 1.5 ETH\n"}, + expectedResult: resource.Result{Content: "Balance: 1.50 ETH\n"}, expectError: false, }, } @@ -1990,7 +2008,7 @@ func TestViewVoucher(t *testing.T) { res, err := h.ViewVoucher(ctx, "view_voucher", []byte("1")) assert.NoError(t, err) - assert.Equal(t, res.Content, "SRF\n100") + assert.Equal(t, res.Content, "Symbol: SRF\nBalance: 100") } func TestSetVoucher(t *testing.T) { diff --git a/internal/testutil/mocks/servicemock.go b/internal/testutil/mocks/servicemock.go index 521cfa0..59d7205 100644 --- a/internal/testutil/mocks/servicemock.go +++ b/internal/testutil/mocks/servicemock.go @@ -49,6 +49,6 @@ func (m *MockAccountService) TokenTransfer(ctx context.Context, amount, from, to } func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) { - args := m.Called() + args := m.Called(alias) return args.Get(0).(*dataserviceapi.AliasAddress), args.Error(1) } diff --git a/internal/utils/age.go b/internal/utils/age.go index 6b040e7..59056a8 100644 --- a/internal/utils/age.go +++ b/internal/utils/age.go @@ -1,6 +1,9 @@ package utils -import "time" +import ( + "strconv" + "time" +) // CalculateAge calculates the age based on a given birthdate and the current date in the format dd/mm/yy // It adjusts for cases where the current date is before the birthday in the current year. @@ -25,11 +28,29 @@ func CalculateAge(birthdate, today time.Time) int { // It subtracts the YOB from the current year to determine the age. // // Parameters: -// yob: The year of birth as an integer. +// +// yob: The year of birth as an integer. // // Returns: -// The calculated age as an integer. +// +// The calculated age as an integer. func CalculateAgeWithYOB(yob int) int { - currentYear := time.Now().Year() - return currentYear - yob -} \ No newline at end of file + currentYear := time.Now().Year() + return currentYear - yob +} + + +//IsValidYob checks if the provided yob can be considered valid +func IsValidYOb(yob string) bool { + currentYear := time.Now().Year() + yearOfBirth, err := strconv.ParseInt(yob, 10, 64) + if err != nil { + return false + } + if yearOfBirth >= 1900 && int(yearOfBirth) <= currentYear { + return true + } else { + return false + } + +} diff --git a/internal/utils/name.go b/internal/utils/name.go new file mode 100644 index 0000000..ea403d5 --- /dev/null +++ b/internal/utils/name.go @@ -0,0 +1,17 @@ +package utils + +func ConstructName(firstName, familyName, defaultValue string) string { + name := defaultValue + if familyName != defaultValue { + if firstName != defaultValue { + name = firstName + " " + familyName + } else { + name = familyName + } + } else { + if firstName != defaultValue { + name = firstName + } + } + return name +} diff --git a/menutraversal_test/group_test.json b/menutraversal_test/group_test.json index 52fab59..7985b22 100644 --- a/menutraversal_test/group_test.json +++ b/menutraversal_test/group_test.json @@ -54,7 +54,7 @@ }, { "input": "1235", - "expectedContent": "Incorrect pin\n1:Retry\n9:Quit" + "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit" }, { "input": "1", @@ -62,7 +62,7 @@ }, { "input": "1234", - "expectedContent": "Select language:\n0:english\n1:kiswahili" + "expectedContent": "Select language:\n0:English\n1:Kiswahili" }, { "input": "0", @@ -95,7 +95,7 @@ }, { "input": "1235", - "expectedContent": "Incorrect pin\n1:Retry\n9:Quit" + "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit" }, { "input": "1", @@ -141,7 +141,7 @@ }, { "input": "1235", - "expectedContent": "Incorrect pin\n1:Retry\n9:Quit" + "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit" }, { "input": "1", diff --git a/menutraversal_test/test_setup.json b/menutraversal_test/test_setup.json index 4d8414f..1f9d61d 100644 --- a/menutraversal_test/test_setup.json +++ b/menutraversal_test/test_setup.json @@ -7,11 +7,11 @@ "steps": [ { "input": "", - "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili" + "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili" }, { "input": "0", - "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no" + "expectedContent": "Do you agree to terms and conditions?\n0:Yes\n1:No" }, { "input": "0", @@ -40,11 +40,11 @@ "steps": [ { "input": "", - "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili" + "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili" }, { "input": "0", - "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no" + "expectedContent": "Do you agree to terms and conditions?\n0:Yes\n1:No" }, { "input": "1", diff --git a/services/registration/_catch_swa b/services/registration/_catch_swa new file mode 100644 index 0000000..3affebd --- /dev/null +++ b/services/registration/_catch_swa @@ -0,0 +1 @@ +Tatizo la kimtambo limetokea,tafadhali jaribu tena baadaye. \ No newline at end of file diff --git a/services/registration/english_menu b/services/registration/english_menu new file mode 100644 index 0000000..3d38949 --- /dev/null +++ b/services/registration/english_menu @@ -0,0 +1 @@ +English \ No newline at end of file diff --git a/services/registration/incorrect_pin b/services/registration/incorrect_pin index d11ab54..7fcf610 100644 --- a/services/registration/incorrect_pin +++ b/services/registration/incorrect_pin @@ -1 +1 @@ -Incorrect pin \ No newline at end of file +Incorrect PIN \ No newline at end of file diff --git a/services/registration/invalid_pin_swa b/services/registration/invalid_pin_swa index 1817570..7512242 100644 --- a/services/registration/invalid_pin_swa +++ b/services/registration/invalid_pin_swa @@ -1 +1 @@ -PIN mpya na udhibitisho wa pin mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885. +PIN mpya na udhibitisho wa PIN mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885. diff --git a/services/registration/kiswahili_menu b/services/registration/kiswahili_menu new file mode 100644 index 0000000..e4d88a5 --- /dev/null +++ b/services/registration/kiswahili_menu @@ -0,0 +1 @@ +Kiswahili \ No newline at end of file diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po index aa033b5..4bf876b 100644 --- a/services/registration/locale/swa/default.po +++ b/services/registration/locale/swa/default.po @@ -13,7 +13,7 @@ msgstr "Kwa usaidizi zaidi,piga: 0757628885" msgid "Balance: %s\n" msgstr "Salio: %s\n" -msid "Your invite request for %s to Sarafu Network failed. Please try again later." +msgid "Your invite request for %s to Sarafu Network failed. Please try again later." msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu halikufaulu. Tafadhali jaribu tena baadaye." msgid "Your invitation to %s to join Sarafu Network has been sent." @@ -23,4 +23,7 @@ msgid "Your request failed. Please try again later." msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye." msgid "Community Balance: 0.00" -msgid "Salio la Kikundi: 0.00" +msgstr "Salio la Kikundi: 0.00" + +msgid "Symbol: %s\nBalance: %s" +msgstr "Sarafu: %s\nSalio: %s" diff --git a/services/registration/main.vis b/services/registration/main.vis index beb2d7c..2982f47 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -2,9 +2,9 @@ LOAD set_default_voucher 8 RELOAD set_default_voucher LOAD check_vouchers 10 RELOAD check_vouchers -LOAD check_balance 64 +LOAD check_balance 128 RELOAD check_balance -CATCH api_failure flag_api_call_error 1 +CATCH api_failure flag_api_call_error 1 MAP check_balance MOUT send 1 MOUT vouchers 2 diff --git a/services/registration/my_balance_swa b/services/registration/my_balance_swa index 9c3a7c7..afae8c1 100644 --- a/services/registration/my_balance_swa +++ b/services/registration/my_balance_swa @@ -1 +1 @@ -Salio lako ni: 0.00 SRF \ No newline at end of file +{{.check_balance}} \ No newline at end of file diff --git a/services/registration/next_menu b/services/registration/next_menu new file mode 100644 index 0000000..e2e838e --- /dev/null +++ b/services/registration/next_menu @@ -0,0 +1 @@ +Next \ No newline at end of file diff --git a/services/registration/next_menu_swa b/services/registration/next_menu_swa new file mode 100644 index 0000000..6511e40 --- /dev/null +++ b/services/registration/next_menu_swa @@ -0,0 +1 @@ +Mbele \ No newline at end of file diff --git a/services/registration/no_menu b/services/registration/no_menu index 54299a4..289cc91 100644 --- a/services/registration/no_menu +++ b/services/registration/no_menu @@ -1 +1 @@ -no \ No newline at end of file +No \ No newline at end of file diff --git a/services/registration/no_menu_swa b/services/registration/no_menu_swa index 3e6885e..a9d6b8d 100644 --- a/services/registration/no_menu_swa +++ b/services/registration/no_menu_swa @@ -1 +1 @@ -la \ No newline at end of file +La \ No newline at end of file diff --git a/services/registration/prev_menu b/services/registration/prev_menu new file mode 100644 index 0000000..72d90d8 --- /dev/null +++ b/services/registration/prev_menu @@ -0,0 +1 @@ +Prev \ No newline at end of file diff --git a/services/registration/prev_menu_swa b/services/registration/prev_menu_swa new file mode 100644 index 0000000..e5a3e45 --- /dev/null +++ b/services/registration/prev_menu_swa @@ -0,0 +1 @@ +Nyuma \ No newline at end of file diff --git a/services/registration/set_eng.vis b/services/registration/set_eng.vis index 662fd2d..b66a1b7 100644 --- a/services/registration/set_eng.vis +++ b/services/registration/set_eng.vis @@ -1,3 +1,4 @@ LOAD set_language 6 +RELOAD set_language CATCH terms flag_account_created 0 MOVE language_changed diff --git a/services/registration/set_swa.vis b/services/registration/set_swa.vis index 662fd2d..b66a1b7 100644 --- a/services/registration/set_swa.vis +++ b/services/registration/set_swa.vis @@ -1,3 +1,4 @@ LOAD set_language 6 +RELOAD set_language CATCH terms flag_account_created 0 MOVE language_changed diff --git a/services/registration/yes_menu b/services/registration/yes_menu index 396a0ba..3fdfb3d 100644 --- a/services/registration/yes_menu +++ b/services/registration/yes_menu @@ -1 +1 @@ -yes \ No newline at end of file +Yes \ No newline at end of file diff --git a/services/registration/yes_menu_swa b/services/registration/yes_menu_swa index c5231fb..542d3c3 100644 --- a/services/registration/yes_menu_swa +++ b/services/registration/yes_menu_swa @@ -1 +1 @@ -ndio \ No newline at end of file +Ndio \ No newline at end of file