From 9cf1cbe4250f93ed77eacd58558101a3d21c70fa Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 20 Nov 2024 16:36:18 +0300 Subject: [PATCH 01/33] add swahili translation for catch node --- services/registration/_catch_swa | 1 + 1 file changed, 1 insertion(+) create mode 100644 services/registration/_catch_swa 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 From d20700ca7411cc9a9eaf88f40d92c56ec8d3551c Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 20 Nov 2024 16:39:50 +0300 Subject: [PATCH 02/33] fix size limit error --- services/registration/main.vis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/registration/main.vis b/services/registration/main.vis index 7e1c9bf..7a27808 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -1,6 +1,6 @@ LOAD set_default_voucher 8 RELOAD set_default_voucher -LOAD check_balance 64 +LOAD check_balance 128 RELOAD check_balance LOAD check_vouchers 10 RELOAD check_vouchers From 451b15fb6b19fd27cc754f8509f2ef72ace38f9c Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 20 Nov 2024 17:13:14 +0300 Subject: [PATCH 03/33] explicit set_language reload --- services/registration/set_eng.vis | 1 + services/registration/set_swa.vis | 1 + 2 files changed, 2 insertions(+) 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 From 7880294c6f9589bcad2da618945e786e7d42c35a Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 20 Nov 2024 17:14:25 +0300 Subject: [PATCH 04/33] set eng as default language --- internal/handlers/ussd/menuhandler.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index d8e6fa0..a58e344 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -154,7 +154,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 From 9b89462797be98f0477f1d7ea316a092cdd4791b Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Thu, 21 Nov 2024 11:21:16 +0300 Subject: [PATCH 05/33] add function to check validity of provided yob --- internal/utils/age.go | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) 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 + } + +} From 8925e26c4c85aec07702322925cefb608609228d Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Thu, 21 Nov 2024 11:25:47 +0300 Subject: [PATCH 06/33] refactor check for valid yob --- internal/handlers/ussd/menuhandler.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index a58e344..eeca3fd 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -154,7 +154,7 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r code := strings.Split(symbol, "_")[1] if !utils.IsValidISO639(code) { - //Fallback to english instead? + //Fallback to english instead? code = "eng" } res.FlagSet = append(res.FlagSet, state.FLAG_LANG) @@ -764,12 +764,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 } From 07df450b3c66e71caba203476e2678f880e57916 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 21 Nov 2024 15:15:15 +0300 Subject: [PATCH 07/33] include labels to define the symbol and balance while selecting a voucher --- internal/handlers/ussd/menuhandler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index eeca3fd..bb63209 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -1570,7 +1570,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 = fmt.Sprintf("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance) return res, nil } From b9ff467c0cb12b539c472c42a778e510a7570508 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 21 Nov 2024 15:51:04 +0300 Subject: [PATCH 08/33] use the correct balance --- services/registration/my_balance_swa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e30bc177e96f0cba203c72c03065e854eb93a753 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 21 Nov 2024 15:52:07 +0300 Subject: [PATCH 09/33] fixed typo and added a new translation --- services/registration/locale/swa/default.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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" From 7ce50398d1b829535f59a6f0e60c5c1c1c822c2b Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 21 Nov 2024 15:54:00 +0300 Subject: [PATCH 10/33] use the language translation instead of hardcoded eng --- internal/handlers/ussd/menuhandler.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index bb63209..98baf9d 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -817,7 +817,8 @@ 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)) + balStr := fmt.Sprintf("%s %s", activeBal, activeSym) + res.Content = l.Get("Balance: %s\n", balStr) return res, nil } @@ -1546,6 +1547,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) @@ -1570,7 +1575,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("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance) + res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance) return res, nil } From 9847433e0ad64cc33d216df5830e7fd925334ca7 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 22 Nov 2024 11:30:13 +0300 Subject: [PATCH 11/33] use _ for back navigation --- services/registration/edit_profile.vis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis index af20e0f..cca6be6 100644 --- a/services/registration/edit_profile.vis +++ b/services/registration/edit_profile.vis @@ -11,7 +11,7 @@ MOUT edit_offerings 6 MOUT view 7 MOUT back 0 HALT -INCMP my_account 0 +INCMP _ 0 INCMP edit_first_name 1 INCMP edit_family_name 2 INCMP select_gender 3 From 00c0445eed5e0e437907d90d125702194fbf2c92 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Thu, 28 Nov 2024 11:28:00 +0300 Subject: [PATCH 12/33] show name without depending on family name being set --- internal/handlers/ussd/menuhandler.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index a0b7bd1..dfd046d 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -1391,10 +1391,14 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) // Construct the full name name := defaultValue if familyName != defaultValue { - if firstName == defaultValue { - name = familyName - } else { + if firstName != defaultValue { name = firstName + " " + familyName + } else { + name = familyName + } + } else { + if firstName != defaultValue { + name = firstName } } From c46f41e25f1a213e4d9ef0c0abcee2ee20f0256c Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Fri, 29 Nov 2024 14:47:22 +0300 Subject: [PATCH 13/33] Format the balance to 2 decimal places --- internal/handlers/ussd/menuhandler.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index dfd046d..bb0c9d8 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -811,7 +811,16 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) ( return res, err } - balStr := 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 From aab6660edd2ac4b6004f50aeb1ee19d788c8e58b Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Fri, 29 Nov 2024 15:39:27 +0300 Subject: [PATCH 14/33] Capitalize menu items --- menutraversal_test/group_test.json | 8 ++++---- menutraversal_test/test_setup.json | 8 ++++---- services/registration/english_menu | 1 + services/registration/incorrect_pin | 2 +- services/registration/invalid_pin_swa | 2 +- services/registration/kiswahili_menu | 1 + services/registration/next_menu | 1 + services/registration/next_menu_swa | 1 + services/registration/no_menu | 2 +- services/registration/no_menu_swa | 2 +- services/registration/prev_menu | 1 + services/registration/prev_menu_swa | 1 + services/registration/yes_menu | 2 +- services/registration/yes_menu_swa | 2 +- 14 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 services/registration/english_menu create mode 100644 services/registration/kiswahili_menu create mode 100644 services/registration/next_menu create mode 100644 services/registration/next_menu_swa create mode 100644 services/registration/prev_menu create mode 100644 services/registration/prev_menu_swa 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/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/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/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 From 0091fbcabbc5d9e6e6d91bdbb6218e888d542496 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Mon, 2 Dec 2024 08:55:24 +0300 Subject: [PATCH 15/33] fix: looped navigation --- services/registration/edit_profile.vis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis index cca6be6..af20e0f 100644 --- a/services/registration/edit_profile.vis +++ b/services/registration/edit_profile.vis @@ -11,7 +11,7 @@ MOUT edit_offerings 6 MOUT view 7 MOUT back 0 HALT -INCMP _ 0 +INCMP my_account 0 INCMP edit_first_name 1 INCMP edit_family_name 2 INCMP select_gender 3 From ff3f049226b45d395c1d6976909d299b3427aee9 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Tue, 3 Dec 2024 13:31:30 +0300 Subject: [PATCH 16/33] updated the CheckAliasAddress mock --- internal/testutil/mocks/servicemock.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) } From e979742424f8b5526c7669a87f1ea8622d37110e Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Tue, 3 Dec 2024 13:32:18 +0300 Subject: [PATCH 17/33] resolved error in the TestValidateRecipient --- internal/handlers/ussd/menuhandler_test.go | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index 6f1d57a..c2629c4 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) From 10586baf0d514692ffa3d3db0d5a7b6d23ef5b7c Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Tue, 3 Dec 2024 13:35:14 +0300 Subject: [PATCH 18/33] resolved error in the TestCheckBalance --- internal/handlers/ussd/menuhandler_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index c2629c4..6dfdcb8 100644 --- a/internal/handlers/ussd/menuhandler_test.go +++ b/internal/handlers/ussd/menuhandler_test.go @@ -1582,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, }, } From 0f21b0181358dc718ed619bd9d3505a32690d627 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Tue, 3 Dec 2024 13:37:00 +0300 Subject: [PATCH 19/33] resolved error in the TestViewVoucher --- internal/handlers/ussd/menuhandler_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index 6dfdcb8..d7cd855 100644 --- a/internal/handlers/ussd/menuhandler_test.go +++ b/internal/handlers/ussd/menuhandler_test.go @@ -2008,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) { From ba430a5849030c3fd4581c6596c8947ecff160e0 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Tue, 3 Dec 2024 14:10:05 +0300 Subject: [PATCH 20/33] add a separate function to handle ConstructName --- internal/handlers/ussd/menuhandler.go | 13 +------------ internal/utils/name.go | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 internal/utils/name.go diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index 6bc00ec..acd3dd4 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -1398,18 +1398,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 = firstName + " " + familyName - } else { - name = familyName - } - } else { - if firstName != defaultValue { - name = firstName - } - } + name := utils.ConstructName(firstName, familyName, defaultValue) // Calculate age from year of birth age := defaultValue diff --git a/internal/utils/name.go b/internal/utils/name.go new file mode 100644 index 0000000..4665d02 --- /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 +} \ No newline at end of file From d40a4a171ff1bb84b7cc299e13f3b04836cdb9bd Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Tue, 3 Dec 2024 14:12:47 +0300 Subject: [PATCH 21/33] formatted code --- internal/utils/name.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/utils/name.go b/internal/utils/name.go index 4665d02..ea403d5 100644 --- a/internal/utils/name.go +++ b/internal/utils/name.go @@ -1,17 +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 -} \ No newline at end of file + name := defaultValue + if familyName != defaultValue { + if firstName != defaultValue { + name = firstName + " " + familyName + } else { + name = familyName + } + } else { + if firstName != defaultValue { + name = firstName + } + } + return name +} From d516584d905292df237a153d41de8182c6c599ce Mon Sep 17 00:00:00 2001 From: lash Date: Tue, 3 Dec 2024 16:16:46 +0000 Subject: [PATCH 22/33] Clear persister from handler in outer code aswell --- internal/handlers/base.go | 3 +++ internal/handlers/ussd/menuhandler.go | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/handlers/base.go b/internal/handlers/base.go index 4d2aa4c..755cca4 100644 --- a/internal/handlers/base.go +++ b/internal/handlers/base.go @@ -55,6 +55,9 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error) } f.hn = f.hn.WithPersister(rqs.Storage.Persister) + defer func() { + f.hn.Exit() + }() eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister) en, ok := eni.(*engine.DefaultEngine) if !ok { diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index a79d054..5c1caff 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -113,7 +113,7 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource return r, nil } defer func() { - h.pe = nil + h.Exit() }() h.st = h.pe.GetState() @@ -140,6 +140,10 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource return r, nil } +func (h *Handlers) Exit() { + h.pe = nil +} + // SetLanguage sets the language across the menu func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) { var res resource.Result From 4ecfc9de38ac602a632eaab4b95010ea1f72d47d Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 4 Dec 2024 20:38:52 +0300 Subject: [PATCH 23/33] removed DATATYPE_USERSUB and replaced with DATATYPE_USERDATA --- internal/storage/db.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/storage/db.go b/internal/storage/db.go index 8c9ff35..457af78 100644 --- a/internal/storage/db.go +++ b/internal/storage/db.go @@ -6,10 +6,6 @@ import ( "git.defalsify.org/vise.git/db" ) -const ( - DATATYPE_USERSUB = 64 -) - // PrefixDb interface abstracts the database operations. type PrefixDb interface { Get(ctx context.Context, key []byte) ([]byte, error) @@ -35,13 +31,13 @@ func (s *SubPrefixDb) toKey(k []byte) []byte { } func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) { - s.store.SetPrefix(DATATYPE_USERSUB) + s.store.SetPrefix(db.DATATYPE_USERDATA) key = s.toKey(key) return s.store.Get(ctx, key) } func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error { - s.store.SetPrefix(DATATYPE_USERSUB) + s.store.SetPrefix(db.DATATYPE_USERDATA) key = s.toKey(key) return s.store.Put(ctx, key, val) } From 93c44861e04c426be2069bc8993b4b2d4b084692 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 4 Dec 2024 20:42:47 +0300 Subject: [PATCH 24/33] Use numeric prefixes --- common/db.go | 20 ++++++++++++- common/transfer_statements.go | 20 ++++++------- common/vouchers.go | 18 +++++++----- internal/handlers/ussd/menuhandler.go | 42 +++++++++++++-------------- 4 files changed, 60 insertions(+), 40 deletions(-) diff --git a/common/db.go b/common/db.go index e90fd47..1454a84 100644 --- a/common/db.go +++ b/common/db.go @@ -32,7 +32,18 @@ const ( DATA_PUBLIC_KEY_REVERSE DATA_ACTIVE_DECIMAL DATA_ACTIVE_ADDRESS - DATA_TRANSACTIONS + DATA_PREFIX_SYMBOLS + DATA_PREFIX_BALANCES + DATA_PREFIX_DECIMALS + DATA_PREFIX_ADDRESSES + DATA_PREFIX_TX_SENDERS + DATA_PREFIX_TX_RECIPIENTS + DATA_PREFIX_TX_VALUES + DATA_PREFIX_TX_ADDRESSES + DATA_PREFIX_TX_HASHES + DATA_PREFIX_TX_DATES + DATA_PREFIX_TX_SYMBOLS + DATA_PREFIX_TX_DECIMALS ) var ( @@ -69,3 +80,10 @@ func StringToDataTyp(str string) (DataTyp, error) { return 0, errors.New("invalid DataTyp string") } } + +// Convert DataTyp to []byte +func (d DataTyp) ToBytes() []byte { + bytes := make([]byte, 2) + binary.BigEndian.PutUint16(bytes, uint16(d)) + return bytes +} diff --git a/common/transfer_statements.go b/common/transfer_statements.go index 4dd409c..adbdeaf 100644 --- a/common/transfer_statements.go +++ b/common/transfer_statements.go @@ -57,11 +57,11 @@ func ProcessTransfers(transfers []dataserviceapi.Last10TxResponse) TransferMetad // GetTransferData retrieves and matches transfer data // returns a formatted string of the full transaction/statement func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, index int) (string, error) { - keys := []string{"txfrom", "txto", "txval", "txaddr", "txhash", "txdate", "txsym"} - data := make(map[string]string) + keys := []DataTyp{DATA_PREFIX_TX_SENDERS, DATA_PREFIX_TX_RECIPIENTS, DATA_PREFIX_TX_VALUES, DATA_PREFIX_TX_ADDRESSES, DATA_PREFIX_TX_HASHES, DATA_PREFIX_TX_DATES, DATA_PREFIX_TX_SYMBOLS} + data := make(map[DataTyp]string) for _, key := range keys { - value, err := db.Get(ctx, []byte(key)) + value, err := db.Get(ctx, key.ToBytes()) if err != nil { return "", fmt.Errorf("failed to get %s: %v", key, err) } @@ -69,13 +69,13 @@ func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, } // Split the data - senders := strings.Split(string(data["txfrom"]), "\n") - recipients := strings.Split(string(data["txto"]), "\n") - values := strings.Split(string(data["txval"]), "\n") - addresses := strings.Split(string(data["txaddr"]), "\n") - hashes := strings.Split(string(data["txhash"]), "\n") - dates := strings.Split(string(data["txdate"]), "\n") - syms := strings.Split(string(data["txsym"]), "\n") + senders := strings.Split(string(data[DATA_PREFIX_TX_SENDERS]), "\n") + recipients := strings.Split(string(data[DATA_PREFIX_TX_RECIPIENTS]), "\n") + values := strings.Split(string(data[DATA_PREFIX_TX_VALUES]), "\n") + addresses := strings.Split(string(data[DATA_PREFIX_TX_ADDRESSES]), "\n") + hashes := strings.Split(string(data[DATA_PREFIX_TX_HASHES]), "\n") + dates := strings.Split(string(data[DATA_PREFIX_TX_DATES]), "\n") + syms := strings.Split(string(data[DATA_PREFIX_TX_SYMBOLS]), "\n") // Check if index is within range if index < 1 || index > len(senders) { diff --git a/common/vouchers.go b/common/vouchers.go index c542084..5863c46 100644 --- a/common/vouchers.go +++ b/common/vouchers.go @@ -64,22 +64,24 @@ func ScaleDownBalance(balance, decimals string) string { // GetVoucherData retrieves and matches voucher data func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) { - keys := []string{"sym", "bal", "deci", "addr"} - data := make(map[string]string) + keys := []DataTyp{DATA_PREFIX_SYMBOLS, DATA_PREFIX_BALANCES, DATA_PREFIX_DECIMALS, DATA_PREFIX_ADDRESSES} + data := make(map[DataTyp]string) for _, key := range keys { - value, err := db.Get(ctx, []byte(key)) + value, err := db.Get(ctx, key.ToBytes()) if err != nil { - return nil, fmt.Errorf("failed to get %s: %v", key, err) + fmt.Printf("failed to get %v: %v\n", key, err) + continue } data[key] = string(value) } symbol, balance, decimal, address := MatchVoucher(input, - data["sym"], - data["bal"], - data["deci"], - data["addr"]) + data[DATA_PREFIX_SYMBOLS], + data[DATA_PREFIX_BALANCES], + data[DATA_PREFIX_DECIMALS], + data[DATA_PREFIX_ADDRESSES], + ) if symbol == "" { return nil, nil diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index a79d054..2d5691f 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -1569,15 +1569,15 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte) data := common.ProcessVouchers(vouchersResp) // Store all voucher data - dataMap := map[string]string{ - "sym": data.Symbols, - "bal": data.Balances, - "deci": data.Decimals, - "addr": data.Addresses, + dataMap := map[common.DataTyp]string{ + common.DATA_PREFIX_SYMBOLS: data.Symbols, + common.DATA_PREFIX_BALANCES: data.Balances, + common.DATA_PREFIX_DECIMALS: data.Decimals, + common.DATA_PREFIX_ADDRESSES: data.Addresses, } for key, value := range dataMap { - if err := h.prefixDb.Put(ctx, []byte(key), []byte(value)); err != nil { + if err := h.prefixDb.Put(ctx, []byte(key.ToBytes()), []byte(value)); err != nil { return res, nil } } @@ -1590,7 +1590,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) var res resource.Result // Read vouchers from the store - voucherData, err := h.prefixDb.Get(ctx, []byte("sym")) + voucherData, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes()) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err) return res, err @@ -1732,19 +1732,19 @@ func (h *Handlers) CheckTransactions(ctx context.Context, sym string, input []by data := common.ProcessTransfers(transactionsResp) // Store all transaction data - dataMap := map[string]string{ - "txfrom": data.Senders, - "txto": data.Recipients, - "txval": data.TransferValues, - "txaddr": data.Addresses, - "txhash": data.TxHashes, - "txdate": data.Dates, - "txsym": data.Symbols, - "txdeci": data.Decimals, + dataMap := map[common.DataTyp]string{ + common.DATA_PREFIX_TX_SENDERS: data.Senders, + common.DATA_PREFIX_TX_RECIPIENTS: data.Recipients, + common.DATA_PREFIX_TX_VALUES: data.TransferValues, + common.DATA_PREFIX_TX_ADDRESSES: data.Addresses, + common.DATA_PREFIX_TX_HASHES: data.TxHashes, + common.DATA_PREFIX_TX_DATES: data.Dates, + common.DATA_PREFIX_TX_SYMBOLS: data.Symbols, + common.DATA_PREFIX_TX_DECIMALS: data.Decimals, } for key, value := range dataMap { - if err := h.prefixDb.Put(ctx, []byte(key), []byte(value)); err != nil { + if err := h.prefixDb.Put(ctx, []byte(key.ToBytes()), []byte(value)); err != nil { logg.ErrorCtxf(ctx, "failed to write to prefixDb", "error", err) return res, err } @@ -1770,22 +1770,22 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input [] } // Read transactions from the store and format them - TransactionSenders, err := h.prefixDb.Get(ctx, []byte("txfrom")) + TransactionSenders, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_SENDERS.ToBytes()) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionSenders from prefixDb", "error", err) return res, err } - TransactionSyms, err := h.prefixDb.Get(ctx, []byte("txsym")) + TransactionSyms, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_SYMBOLS.ToBytes()) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionSyms from prefixDb", "error", err) return res, err } - TransactionValues, err := h.prefixDb.Get(ctx, []byte("txval")) + TransactionValues, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_VALUES.ToBytes()) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionValues from prefixDb", "error", err) return res, err } - TransactionDates, err := h.prefixDb.Get(ctx, []byte("txdate")) + TransactionDates, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_DATES.ToBytes()) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionDates from prefixDb", "error", err) return res, err From bc0e536d3da41c0cac3212bc9816be16c390aa44 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 4 Dec 2024 20:55:03 +0300 Subject: [PATCH 25/33] updated failing tests --- common/transfer_statements.go | 2 +- common/vouchers_test.go | 12 ++++++------ internal/handlers/ussd/menuhandler_test.go | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/transfer_statements.go b/common/transfer_statements.go index adbdeaf..dd8324a 100644 --- a/common/transfer_statements.go +++ b/common/transfer_statements.go @@ -63,7 +63,7 @@ func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, for _, key := range keys { value, err := db.Get(ctx, key.ToBytes()) if err != nil { - return "", fmt.Errorf("failed to get %s: %v", key, err) + return "", fmt.Errorf("failed to get %s: %v", key.ToBytes(), err) } data[key] = string(value) } diff --git a/common/vouchers_test.go b/common/vouchers_test.go index 9f5bf85..9ba7cbc 100644 --- a/common/vouchers_test.go +++ b/common/vouchers_test.go @@ -86,16 +86,16 @@ func TestGetVoucherData(t *testing.T) { spdb := storage.NewSubPrefixDb(db, []byte("vouchers")) // Test voucher data - mockData := map[string][]byte{ - "sym": []byte("1:SRF\n2:MILO"), - "bal": []byte("1:100\n2:200"), - "deci": []byte("1:6\n2:4"), - "addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), + mockData := map[DataTyp][]byte{ + DATA_PREFIX_SYMBOLS: []byte("1:SRF\n2:MILO"), + DATA_PREFIX_BALANCES: []byte("1:100\n2:200"), + DATA_PREFIX_DECIMALS: []byte("1:6\n2:4"), + DATA_PREFIX_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), } // Put the data for key, value := range mockData { - err = spdb.Put(ctx, []byte(key), []byte(value)) + err = spdb.Put(ctx, []byte(key.ToBytes()), []byte(value)) if err != nil { t.Fatal(err) } diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index d7cd855..4e53228 100644 --- a/internal/handlers/ussd/menuhandler_test.go +++ b/internal/handlers/ussd/menuhandler_test.go @@ -1937,7 +1937,7 @@ func TestCheckVouchers(t *testing.T) { assert.NoError(t, err) // Read voucher sym data from the store - voucherData, err := spdb.Get(ctx, []byte("sym")) + voucherData, err := spdb.Get(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes()) if err != nil { t.Fatal(err) } @@ -1961,7 +1961,7 @@ func TestGetVoucherList(t *testing.T) { expectedSym := []byte("1:SRF\n2:MILO") // Put voucher sym data from the store - err := spdb.Put(ctx, []byte("sym"), expectedSym) + err := spdb.Put(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes(), expectedSym) if err != nil { t.Fatal(err) } @@ -1991,16 +1991,16 @@ func TestViewVoucher(t *testing.T) { } // Define mock voucher data - mockData := map[string][]byte{ - "sym": []byte("1:SRF\n2:MILO"), - "bal": []byte("1:100\n2:200"), - "deci": []byte("1:6\n2:4"), - "addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), + mockData := map[common.DataTyp][]byte{ + common.DATA_PREFIX_SYMBOLS: []byte("1:SRF\n2:MILO"), + common.DATA_PREFIX_BALANCES: []byte("1:100\n2:200"), + common.DATA_PREFIX_DECIMALS: []byte("1:6\n2:4"), + common.DATA_PREFIX_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), } // Put the data for key, value := range mockData { - err = spdb.Put(ctx, []byte(key), []byte(value)) + err = spdb.Put(ctx, []byte(key.ToBytes()), []byte(value)) if err != nil { t.Fatal(err) } From 862830e9dedf20d2d9cf25c3ff738eb1428c3203 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 4 Dec 2024 20:59:46 +0300 Subject: [PATCH 26/33] renamed internal/storage/db.go -> internal/storage/sub_prefix_db.go for clarity --- internal/storage/{db.go => sub_prefix_db.go} | 0 internal/storage/{db_test.go => sub_prefix_db_test.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename internal/storage/{db.go => sub_prefix_db.go} (100%) rename internal/storage/{db_test.go => sub_prefix_db_test.go} (100%) diff --git a/internal/storage/db.go b/internal/storage/sub_prefix_db.go similarity index 100% rename from internal/storage/db.go rename to internal/storage/sub_prefix_db.go diff --git a/internal/storage/db_test.go b/internal/storage/sub_prefix_db_test.go similarity index 100% rename from internal/storage/db_test.go rename to internal/storage/sub_prefix_db_test.go From 7a9de79aae67ee37369195899770a475f5cd8d55 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 4 Dec 2024 21:07:11 +0300 Subject: [PATCH 27/33] return nil with error --- common/vouchers.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/vouchers.go b/common/vouchers.go index 5863c46..e3cc134 100644 --- a/common/vouchers.go +++ b/common/vouchers.go @@ -70,8 +70,7 @@ func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*da for _, key := range keys { value, err := db.Get(ctx, key.ToBytes()) if err != nil { - fmt.Printf("failed to get %v: %v\n", key, err) - continue + return nil, fmt.Errorf("failed to get %s: %v", key.ToBytes(), err) } data[key] = string(value) } From 18423fcd9c91a392f54d7c8ec5fdc0dc7d966d60 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 5 Dec 2024 16:26:56 +0300 Subject: [PATCH 28/33] updated the name of the voucher related data --- common/db.go | 8 ++++---- common/vouchers.go | 12 ++++++------ common/vouchers_test.go | 10 +++++----- internal/handlers/ussd/menuhandler.go | 10 +++++----- internal/handlers/ussd/menuhandler_test.go | 12 ++++++------ 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/common/db.go b/common/db.go index 1454a84..6abfcb5 100644 --- a/common/db.go +++ b/common/db.go @@ -32,10 +32,10 @@ const ( DATA_PUBLIC_KEY_REVERSE DATA_ACTIVE_DECIMAL DATA_ACTIVE_ADDRESS - DATA_PREFIX_SYMBOLS - DATA_PREFIX_BALANCES - DATA_PREFIX_DECIMALS - DATA_PREFIX_ADDRESSES + DATA_VOUCHER_SYMBOLS + DATA_VOUCHER_BALANCES + DATA_VOUCHER_DECIMALS + DATA_VOUCHER_ADDRESSES DATA_PREFIX_TX_SENDERS DATA_PREFIX_TX_RECIPIENTS DATA_PREFIX_TX_VALUES diff --git a/common/vouchers.go b/common/vouchers.go index e3cc134..ab0e099 100644 --- a/common/vouchers.go +++ b/common/vouchers.go @@ -64,22 +64,22 @@ func ScaleDownBalance(balance, decimals string) string { // GetVoucherData retrieves and matches voucher data func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) { - keys := []DataTyp{DATA_PREFIX_SYMBOLS, DATA_PREFIX_BALANCES, DATA_PREFIX_DECIMALS, DATA_PREFIX_ADDRESSES} + keys := []DataTyp{DATA_VOUCHER_SYMBOLS, DATA_VOUCHER_BALANCES, DATA_VOUCHER_DECIMALS, DATA_VOUCHER_ADDRESSES} data := make(map[DataTyp]string) for _, key := range keys { value, err := db.Get(ctx, key.ToBytes()) if err != nil { - return nil, fmt.Errorf("failed to get %s: %v", key.ToBytes(), err) + return nil, fmt.Errorf("failed to get %s: %v", key.ToBytes(), err) } data[key] = string(value) } symbol, balance, decimal, address := MatchVoucher(input, - data[DATA_PREFIX_SYMBOLS], - data[DATA_PREFIX_BALANCES], - data[DATA_PREFIX_DECIMALS], - data[DATA_PREFIX_ADDRESSES], + data[DATA_VOUCHER_SYMBOLS], + data[DATA_VOUCHER_BALANCES], + data[DATA_VOUCHER_DECIMALS], + data[DATA_VOUCHER_ADDRESSES], ) if symbol == "" { diff --git a/common/vouchers_test.go b/common/vouchers_test.go index 9ba7cbc..e6f449d 100644 --- a/common/vouchers_test.go +++ b/common/vouchers_test.go @@ -8,8 +8,8 @@ import ( "github.com/alecthomas/assert/v2" "github.com/stretchr/testify/require" - "git.grassecon.net/urdt/ussd/internal/storage" memdb "git.defalsify.org/vise.git/db/mem" + "git.grassecon.net/urdt/ussd/internal/storage" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" ) @@ -87,10 +87,10 @@ func TestGetVoucherData(t *testing.T) { // Test voucher data mockData := map[DataTyp][]byte{ - DATA_PREFIX_SYMBOLS: []byte("1:SRF\n2:MILO"), - DATA_PREFIX_BALANCES: []byte("1:100\n2:200"), - DATA_PREFIX_DECIMALS: []byte("1:6\n2:4"), - DATA_PREFIX_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), + DATA_VOUCHER_SYMBOLS: []byte("1:SRF\n2:MILO"), + DATA_VOUCHER_BALANCES: []byte("1:100\n2:200"), + DATA_VOUCHER_DECIMALS: []byte("1:6\n2:4"), + DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), } // Put the data diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index df3c9ae..14cfc50 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -1577,10 +1577,10 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte) // Store all voucher data dataMap := map[common.DataTyp]string{ - common.DATA_PREFIX_SYMBOLS: data.Symbols, - common.DATA_PREFIX_BALANCES: data.Balances, - common.DATA_PREFIX_DECIMALS: data.Decimals, - common.DATA_PREFIX_ADDRESSES: data.Addresses, + common.DATA_VOUCHER_SYMBOLS: data.Symbols, + common.DATA_VOUCHER_BALANCES: data.Balances, + common.DATA_VOUCHER_DECIMALS: data.Decimals, + common.DATA_VOUCHER_ADDRESSES: data.Addresses, } for key, value := range dataMap { @@ -1597,7 +1597,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) var res resource.Result // Read vouchers from the store - voucherData, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes()) + voucherData, err := h.prefixDb.Get(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes()) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err) return res, err diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index 4e53228..9fabe97 100644 --- a/internal/handlers/ussd/menuhandler_test.go +++ b/internal/handlers/ussd/menuhandler_test.go @@ -1937,7 +1937,7 @@ func TestCheckVouchers(t *testing.T) { assert.NoError(t, err) // Read voucher sym data from the store - voucherData, err := spdb.Get(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes()) + voucherData, err := spdb.Get(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes()) if err != nil { t.Fatal(err) } @@ -1961,7 +1961,7 @@ func TestGetVoucherList(t *testing.T) { expectedSym := []byte("1:SRF\n2:MILO") // Put voucher sym data from the store - err := spdb.Put(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes(), expectedSym) + err := spdb.Put(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes(), expectedSym) if err != nil { t.Fatal(err) } @@ -1992,10 +1992,10 @@ func TestViewVoucher(t *testing.T) { // Define mock voucher data mockData := map[common.DataTyp][]byte{ - common.DATA_PREFIX_SYMBOLS: []byte("1:SRF\n2:MILO"), - common.DATA_PREFIX_BALANCES: []byte("1:100\n2:200"), - common.DATA_PREFIX_DECIMALS: []byte("1:6\n2:4"), - common.DATA_PREFIX_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), + common.DATA_VOUCHER_SYMBOLS: []byte("1:SRF\n2:MILO"), + common.DATA_VOUCHER_BALANCES: []byte("1:100\n2:200"), + common.DATA_VOUCHER_DECIMALS: []byte("1:6\n2:4"), + common.DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), } // Put the data From f733fe563601b6fd8bb19e297147664a69938d31 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 5 Dec 2024 16:31:47 +0300 Subject: [PATCH 29/33] Start the sub prefix data at 256 (0x0100) --- common/db.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/db.go b/common/db.go index 6abfcb5..b1d67fd 100644 --- a/common/db.go +++ b/common/db.go @@ -32,7 +32,8 @@ const ( DATA_PUBLIC_KEY_REVERSE DATA_ACTIVE_DECIMAL DATA_ACTIVE_ADDRESS - DATA_VOUCHER_SYMBOLS + // Start the sub prefix data at 256 (0x0100) + DATA_VOUCHER_SYMBOLS DataTyp = 256 + iota DATA_VOUCHER_BALANCES DATA_VOUCHER_DECIMALS DATA_VOUCHER_ADDRESSES From a659fb06fa463c42dfd290ee32d1ba8693972dd4 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 5 Dec 2024 16:58:03 +0300 Subject: [PATCH 30/33] Added a function to convert int to []byte --- common/db.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/db.go b/common/db.go index b1d67fd..80757e9 100644 --- a/common/db.go +++ b/common/db.go @@ -88,3 +88,10 @@ func (d DataTyp) ToBytes() []byte { binary.BigEndian.PutUint16(bytes, uint16(d)) return bytes } + +// Convert int to []byte +func IntToBytes(value int) []byte { + bytes := make([]byte, 2) + binary.BigEndian.PutUint16(bytes, uint16(value)) + return bytes +} From 589a94216b93dd8592645953c89c6af3a80ab549 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 5 Dec 2024 17:02:26 +0300 Subject: [PATCH 31/33] Use the DATATYPE_USERDATA as the prefix for the NewSubPrefixDb func --- common/vouchers_test.go | 5 ++++- internal/handlers/ussd/menuhandler.go | 6 ++++-- internal/handlers/ussd/menuhandler_test.go | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/vouchers_test.go b/common/vouchers_test.go index e6f449d..560fb5b 100644 --- a/common/vouchers_test.go +++ b/common/vouchers_test.go @@ -8,6 +8,7 @@ import ( "github.com/alecthomas/assert/v2" "github.com/stretchr/testify/require" + visedb "git.defalsify.org/vise.git/db" memdb "git.defalsify.org/vise.git/db/mem" "git.grassecon.net/urdt/ussd/internal/storage" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" @@ -83,7 +84,9 @@ func TestGetVoucherData(t *testing.T) { if err != nil { t.Fatal(err) } - spdb := storage.NewSubPrefixDb(db, []byte("vouchers")) + + prefix := IntToBytes(visedb.DATATYPE_USERDATA) + spdb := storage.NewSubPrefixDb(db, prefix) // Test voucher data mockData := map[DataTyp][]byte{ diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index 14cfc50..812c897 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -85,8 +85,10 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *util userDb := &common.UserDataStore{ Db: userdataStore, } - // Instantiate the SubPrefixDb with "vouchers" prefix - prefixDb := storage.NewSubPrefixDb(userdataStore, []byte("vouchers")) + + // Instantiate the SubPrefixDb with "DATATYPE_USERDATA" prefix + prefix := common.IntToBytes(db.DATATYPE_USERDATA) + prefixDb := storage.NewSubPrefixDb(userdataStore, prefix) h := &Handlers{ userdataStore: userDb, diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index 9fabe97..1aa7c28 100644 --- a/internal/handlers/ussd/menuhandler_test.go +++ b/internal/handlers/ussd/menuhandler_test.go @@ -22,6 +22,7 @@ import ( testdataloader "github.com/peteole/testdata-loader" "github.com/stretchr/testify/require" + visedb "git.defalsify.org/vise.git/db" memdb "git.defalsify.org/vise.git/db/mem" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" ) @@ -56,7 +57,8 @@ func InitializeTestSubPrefixDb(t *testing.T, ctx context.Context) *storage.SubPr if err != nil { t.Fatal(err) } - spdb := storage.NewSubPrefixDb(db, []byte("vouchers")) + prefix := common.IntToBytes(visedb.DATATYPE_USERDATA) + spdb := storage.NewSubPrefixDb(db, prefix) return spdb } From caff27b43da33c015eb13ef0fe10483bd88078e6 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 5 Dec 2024 17:50:40 +0300 Subject: [PATCH 32/33] Replace IntToBytes(value int) and ToBytes() with a single ToBytes() function --- common/db.go | 11 ++--------- common/transfer_statements.go | 4 ++-- common/vouchers.go | 4 ++-- common/vouchers_test.go | 4 ++-- internal/handlers/ussd/menuhandler.go | 16 ++++++++-------- internal/handlers/ussd/menuhandler_test.go | 8 ++++---- 6 files changed, 20 insertions(+), 27 deletions(-) diff --git a/common/db.go b/common/db.go index 80757e9..b8fdb51 100644 --- a/common/db.go +++ b/common/db.go @@ -82,15 +82,8 @@ func StringToDataTyp(str string) (DataTyp, error) { } } -// Convert DataTyp to []byte -func (d DataTyp) ToBytes() []byte { - bytes := make([]byte, 2) - binary.BigEndian.PutUint16(bytes, uint16(d)) - return bytes -} - -// Convert int to []byte -func IntToBytes(value int) []byte { +// ToBytes converts DataTyp or int to a byte slice +func ToBytes[T ~uint16 | int](value T) []byte { bytes := make([]byte, 2) binary.BigEndian.PutUint16(bytes, uint16(value)) return bytes diff --git a/common/transfer_statements.go b/common/transfer_statements.go index dd8324a..8567557 100644 --- a/common/transfer_statements.go +++ b/common/transfer_statements.go @@ -61,9 +61,9 @@ func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, data := make(map[DataTyp]string) for _, key := range keys { - value, err := db.Get(ctx, key.ToBytes()) + value, err := db.Get(ctx, ToBytes(key)) if err != nil { - return "", fmt.Errorf("failed to get %s: %v", key.ToBytes(), err) + return "", fmt.Errorf("failed to get %s: %v", ToBytes(key), err) } data[key] = string(value) } diff --git a/common/vouchers.go b/common/vouchers.go index ab0e099..6cff91d 100644 --- a/common/vouchers.go +++ b/common/vouchers.go @@ -68,9 +68,9 @@ func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*da data := make(map[DataTyp]string) for _, key := range keys { - value, err := db.Get(ctx, key.ToBytes()) + value, err := db.Get(ctx, ToBytes(key)) if err != nil { - return nil, fmt.Errorf("failed to get %s: %v", key.ToBytes(), err) + return nil, fmt.Errorf("failed to get %s: %v", ToBytes(key), err) } data[key] = string(value) } diff --git a/common/vouchers_test.go b/common/vouchers_test.go index 560fb5b..ba6cd60 100644 --- a/common/vouchers_test.go +++ b/common/vouchers_test.go @@ -85,7 +85,7 @@ func TestGetVoucherData(t *testing.T) { t.Fatal(err) } - prefix := IntToBytes(visedb.DATATYPE_USERDATA) + prefix := ToBytes(visedb.DATATYPE_USERDATA) spdb := storage.NewSubPrefixDb(db, prefix) // Test voucher data @@ -98,7 +98,7 @@ func TestGetVoucherData(t *testing.T) { // Put the data for key, value := range mockData { - err = spdb.Put(ctx, []byte(key.ToBytes()), []byte(value)) + err = spdb.Put(ctx, []byte(ToBytes(key)), []byte(value)) if err != nil { t.Fatal(err) } diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index 812c897..c860771 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -87,7 +87,7 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *util } // Instantiate the SubPrefixDb with "DATATYPE_USERDATA" prefix - prefix := common.IntToBytes(db.DATATYPE_USERDATA) + prefix := common.ToBytes(db.DATATYPE_USERDATA) prefixDb := storage.NewSubPrefixDb(userdataStore, prefix) h := &Handlers{ @@ -1586,7 +1586,7 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte) } for key, value := range dataMap { - if err := h.prefixDb.Put(ctx, []byte(key.ToBytes()), []byte(value)); err != nil { + if err := h.prefixDb.Put(ctx, []byte(common.ToBytes(key)), []byte(value)); err != nil { return res, nil } } @@ -1599,7 +1599,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) var res resource.Result // Read vouchers from the store - voucherData, err := h.prefixDb.Get(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes()) + voucherData, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err) return res, err @@ -1757,7 +1757,7 @@ func (h *Handlers) CheckTransactions(ctx context.Context, sym string, input []by } for key, value := range dataMap { - if err := h.prefixDb.Put(ctx, []byte(key.ToBytes()), []byte(value)); err != nil { + if err := h.prefixDb.Put(ctx, []byte(common.ToBytes(key)), []byte(value)); err != nil { logg.ErrorCtxf(ctx, "failed to write to prefixDb", "error", err) return res, err } @@ -1783,22 +1783,22 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input [] } // Read transactions from the store and format them - TransactionSenders, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_SENDERS.ToBytes()) + TransactionSenders, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_SENDERS)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionSenders from prefixDb", "error", err) return res, err } - TransactionSyms, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_SYMBOLS.ToBytes()) + TransactionSyms, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_SYMBOLS)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionSyms from prefixDb", "error", err) return res, err } - TransactionValues, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_VALUES.ToBytes()) + TransactionValues, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_VALUES)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionValues from prefixDb", "error", err) return res, err } - TransactionDates, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_TX_DATES.ToBytes()) + TransactionDates, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_DATES)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionDates from prefixDb", "error", err) return res, err diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go index 1aa7c28..fac95a1 100644 --- a/internal/handlers/ussd/menuhandler_test.go +++ b/internal/handlers/ussd/menuhandler_test.go @@ -57,7 +57,7 @@ func InitializeTestSubPrefixDb(t *testing.T, ctx context.Context) *storage.SubPr if err != nil { t.Fatal(err) } - prefix := common.IntToBytes(visedb.DATATYPE_USERDATA) + prefix := common.ToBytes(visedb.DATATYPE_USERDATA) spdb := storage.NewSubPrefixDb(db, prefix) return spdb @@ -1939,7 +1939,7 @@ func TestCheckVouchers(t *testing.T) { assert.NoError(t, err) // Read voucher sym data from the store - voucherData, err := spdb.Get(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes()) + voucherData, err := spdb.Get(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS)) if err != nil { t.Fatal(err) } @@ -1963,7 +1963,7 @@ func TestGetVoucherList(t *testing.T) { expectedSym := []byte("1:SRF\n2:MILO") // Put voucher sym data from the store - err := spdb.Put(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes(), expectedSym) + err := spdb.Put(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS), expectedSym) if err != nil { t.Fatal(err) } @@ -2002,7 +2002,7 @@ func TestViewVoucher(t *testing.T) { // Put the data for key, value := range mockData { - err = spdb.Put(ctx, []byte(key.ToBytes()), []byte(value)) + err = spdb.Put(ctx, []byte(common.ToBytes(key)), []byte(value)) if err != nil { t.Fatal(err) } From 14737b5f1254fc5ee9ada948ab6e6811baf9d0f9 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Thu, 5 Dec 2024 17:58:51 +0300 Subject: [PATCH 33/33] Removed redundant naming of transfer related data --- common/db.go | 16 ++++++++-------- common/transfer_statements.go | 16 ++++++++-------- internal/handlers/ussd/menuhandler.go | 24 ++++++++++++------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/db.go b/common/db.go index b8fdb51..5532dc9 100644 --- a/common/db.go +++ b/common/db.go @@ -37,14 +37,14 @@ const ( DATA_VOUCHER_BALANCES DATA_VOUCHER_DECIMALS DATA_VOUCHER_ADDRESSES - DATA_PREFIX_TX_SENDERS - DATA_PREFIX_TX_RECIPIENTS - DATA_PREFIX_TX_VALUES - DATA_PREFIX_TX_ADDRESSES - DATA_PREFIX_TX_HASHES - DATA_PREFIX_TX_DATES - DATA_PREFIX_TX_SYMBOLS - DATA_PREFIX_TX_DECIMALS + DATA_TX_SENDERS + DATA_TX_RECIPIENTS + DATA_TX_VALUES + DATA_TX_ADDRESSES + DATA_TX_HASHES + DATA_TX_DATES + DATA_TX_SYMBOLS + DATA_TX_DECIMALS ) var ( diff --git a/common/transfer_statements.go b/common/transfer_statements.go index 8567557..4e6f66b 100644 --- a/common/transfer_statements.go +++ b/common/transfer_statements.go @@ -57,7 +57,7 @@ func ProcessTransfers(transfers []dataserviceapi.Last10TxResponse) TransferMetad // GetTransferData retrieves and matches transfer data // returns a formatted string of the full transaction/statement func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, index int) (string, error) { - keys := []DataTyp{DATA_PREFIX_TX_SENDERS, DATA_PREFIX_TX_RECIPIENTS, DATA_PREFIX_TX_VALUES, DATA_PREFIX_TX_ADDRESSES, DATA_PREFIX_TX_HASHES, DATA_PREFIX_TX_DATES, DATA_PREFIX_TX_SYMBOLS} + keys := []DataTyp{DATA_TX_SENDERS, DATA_TX_RECIPIENTS, DATA_TX_VALUES, DATA_TX_ADDRESSES, DATA_TX_HASHES, DATA_TX_DATES, DATA_TX_SYMBOLS} data := make(map[DataTyp]string) for _, key := range keys { @@ -69,13 +69,13 @@ func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, } // Split the data - senders := strings.Split(string(data[DATA_PREFIX_TX_SENDERS]), "\n") - recipients := strings.Split(string(data[DATA_PREFIX_TX_RECIPIENTS]), "\n") - values := strings.Split(string(data[DATA_PREFIX_TX_VALUES]), "\n") - addresses := strings.Split(string(data[DATA_PREFIX_TX_ADDRESSES]), "\n") - hashes := strings.Split(string(data[DATA_PREFIX_TX_HASHES]), "\n") - dates := strings.Split(string(data[DATA_PREFIX_TX_DATES]), "\n") - syms := strings.Split(string(data[DATA_PREFIX_TX_SYMBOLS]), "\n") + senders := strings.Split(string(data[DATA_TX_SENDERS]), "\n") + recipients := strings.Split(string(data[DATA_TX_RECIPIENTS]), "\n") + values := strings.Split(string(data[DATA_TX_VALUES]), "\n") + addresses := strings.Split(string(data[DATA_TX_ADDRESSES]), "\n") + hashes := strings.Split(string(data[DATA_TX_HASHES]), "\n") + dates := strings.Split(string(data[DATA_TX_DATES]), "\n") + syms := strings.Split(string(data[DATA_TX_SYMBOLS]), "\n") // Check if index is within range if index < 1 || index > len(senders) { diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go index c860771..b47e31f 100644 --- a/internal/handlers/ussd/menuhandler.go +++ b/internal/handlers/ussd/menuhandler.go @@ -1746,14 +1746,14 @@ func (h *Handlers) CheckTransactions(ctx context.Context, sym string, input []by // Store all transaction data dataMap := map[common.DataTyp]string{ - common.DATA_PREFIX_TX_SENDERS: data.Senders, - common.DATA_PREFIX_TX_RECIPIENTS: data.Recipients, - common.DATA_PREFIX_TX_VALUES: data.TransferValues, - common.DATA_PREFIX_TX_ADDRESSES: data.Addresses, - common.DATA_PREFIX_TX_HASHES: data.TxHashes, - common.DATA_PREFIX_TX_DATES: data.Dates, - common.DATA_PREFIX_TX_SYMBOLS: data.Symbols, - common.DATA_PREFIX_TX_DECIMALS: data.Decimals, + common.DATA_TX_SENDERS: data.Senders, + common.DATA_TX_RECIPIENTS: data.Recipients, + common.DATA_TX_VALUES: data.TransferValues, + common.DATA_TX_ADDRESSES: data.Addresses, + common.DATA_TX_HASHES: data.TxHashes, + common.DATA_TX_DATES: data.Dates, + common.DATA_TX_SYMBOLS: data.Symbols, + common.DATA_TX_DECIMALS: data.Decimals, } for key, value := range dataMap { @@ -1783,22 +1783,22 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input [] } // Read transactions from the store and format them - TransactionSenders, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_SENDERS)) + TransactionSenders, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_SENDERS)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionSenders from prefixDb", "error", err) return res, err } - TransactionSyms, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_SYMBOLS)) + TransactionSyms, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_SYMBOLS)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionSyms from prefixDb", "error", err) return res, err } - TransactionValues, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_VALUES)) + TransactionValues, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_VALUES)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionValues from prefixDb", "error", err) return res, err } - TransactionDates, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_PREFIX_TX_DATES)) + TransactionDates, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_DATES)) if err != nil { logg.ErrorCtxf(ctx, "Failed to read the TransactionDates from prefixDb", "error", err) return res, err