Merge pull request 'menu-primary-selectors' (#237 ) from menu-primary-selectors into master

Reviewed-on: urdt/ussd#237 Reviewed-by: lash <accounts-grassrootseconomics@holbrook.no>
update tests
2025-01-02 15:50:42 +01:00 · 2025-01-02 17:42:03 +03:00 · 2025-01-02 17:37:26 +03:00 · 2025-01-02 12:17:28 +03:00 · 2025-01-02 12:15:57 +03:00 · 2025-01-02 12:12:52 +03:00
16 changed files with 42 additions and 36 deletions
--- a/debug/db_debug.go
+++ b/debug/db_debug.go
@@ -11,13 +11,9 @@ import (
 func init() {
 	DebugCap |= 1
 	dbTypStr[db.DATATYPE_STATE] = "internal state"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT] = "account"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_CREATED] = "account created"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TRACKING_ID] = "tracking id"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_PUBLIC_KEY] = "public key"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_CUSTODIAL_ID] = "custodial id"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_PIN] = "account pin"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_STATUS] = "account status"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_FIRST_NAME] = "first name"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_FAMILY_NAME] = "family name"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_YOB] = "year of birth"
--- a/devtools/store/main.go
+++ b/devtools/store/main.go
@@ -11,6 +11,7 @@ import (
 	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 	"git.grassecon.net/urdt/ussd/debug"
+	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/logging"
 )

@@ -47,13 +48,14 @@ func main() {

 	store, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
+		fmt.Fprintf(os.Stderr, "get userdata db: %v\n", err.Error())
 		os.Exit(1)
 	}
+	store.SetPrefix(db.DATATYPE_USERDATA)

 	d, err := store.Dump(ctx, []byte(sessionId))
 	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
+		fmt.Fprintf(os.Stderr, "store dump fail: %v\n", err.Error())
 		os.Exit(1)
 	}

@@ -67,7 +69,7 @@ func main() {
 			fmt.Fprintf(os.Stderr, err.Error())
 			os.Exit(1)
 		}
-		fmt.Printf("%vValue: %v\n\n", o, v)
+		fmt.Printf("%vValue: %v\n\n", o, string(v))
 	}

 	err = store.Close()
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module git.grassecon.net/urdt/ussd
 go 1.23.0

 require (
-	git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80
+	git.defalsify.org/vise.git v0.2.3-0.20241231085136-8582c7e157d9
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80 h1:GYUVXRUtMpA40T4COeAduoay6CIgXjD5cfDYZOTFIKw=
-git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.3-0.20241231085136-8582c7e157d9 h1:O3m+NgWDWtJm8OculT99c4bDMAO4xLe2c8hpCKpsd9g=
+git.defalsify.org/vise.git v0.2.3-0.20241231085136-8582c7e157d9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -1798,7 +1798,7 @@ func TestGetProfile(t *testing.T) {
 			result: resource.Result{
 				Content: fmt.Sprintf(
 					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-					"John Doee", "Male", "48", "Kilifi", "Bananas",
+					"John Doee", "Male", "49", "Kilifi", "Bananas",
 				),
 			},
 		},
@@ -1810,7 +1810,7 @@ func TestGetProfile(t *testing.T) {
 			result: resource.Result{
 				Content: fmt.Sprintf(
 					"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
-					"John Doee", "Male", "48", "Kilifi", "Bananas",
+					"John Doee", "Male", "49", "Kilifi", "Bananas",
 				),
 			},
 		},
@@ -1822,7 +1822,7 @@ func TestGetProfile(t *testing.T) {
 			result: resource.Result{
 				Content: fmt.Sprintf(
 					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-					"John Doee", "Male", "48", "Kilifi", "Bananas",
+					"John Doee", "Male", "49", "Kilifi", "Bananas",
 				),
 			},
 		},
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@@ -62,10 +62,10 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Select language:\n0:English\n1:Kiswahili"
+                    "expectedContent": "Select language:\n1:English\n2:Kiswahili"
                },
                {
-                    "input": "0",
+                    "input": "1",
                    "expectedContent": "Your language change request was successful.\n0:Back\n9:Quit"
                },
                {
@@ -430,7 +430,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 79\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back"
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@@ -7,14 +7,14 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n1:English\n2:Kiswahili"
                    },
                    {
-                        "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n0:Yes\n1:No"
+                        "input": "1",
+                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n1:Yes\n2:No"
                    },
                    {
-                        "input": "0",
+                        "input": "1",
                        "expectedContent": "Please enter a new four number PIN for your account:\n0:Exit"
                    },
                    {
@@ -40,14 +40,14 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n0:Yes\n1:No"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n1:English\n2:Kiswahili"
                    },
                    {
                        "input": "1",
+                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n1:Yes\n2:No"
+                    },
+                    {
+                        "input": "2",
                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
                    }
                ]
--- a/services/registration/balances.vis
+++ b/services/registration/balances.vis
@@ -7,3 +7,4 @@ HALT
 INCMP _ 0
 INCMP my_balance 1
 INCMP community_balance 2
+INCMP . * 
--- a/services/registration/change_language.vis
+++ b/services/registration/change_language.vis
@@ -2,9 +2,9 @@ LOAD reset_account_authorized 0
 LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-MOUT english 0
-MOUT kiswahili 1
+MOUT english 1
+MOUT kiswahili 2
 HALT
-INCMP set_default 0
-INCMP set_swa 1
+INCMP set_default 1
+INCMP set_swa 2
 INCMP . *
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@@ -9,3 +9,4 @@ MOUT quit 9
 HALT
 INCMP _ 0
 INCMP quit 9
+INCMP . * 
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@@ -20,3 +20,4 @@ INCMP edit_yob 4
 INCMP edit_location 5
 INCMP edit_offerings 6
 INCMP view_profile 7
+INCMP . * 
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@@ -14,3 +14,4 @@ INCMP balances 3
 INCMP check_statement 4
 INCMP pin_management 5
 INCMP address 6
+INCMP . *
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@@ -9,3 +9,4 @@ MOUT quit 9
 HALT
 INCMP _ 0
 INCMP quit 9
+INCMP . * 
--- a/services/registration/select_language.vis
+++ b/services/registration/select_language.vis
@@ -1,6 +1,6 @@
-MOUT english 0
-MOUT kiswahili 1
+MOUT english 1
+MOUT kiswahili 2
 HALT
-INCMP set_eng 0
-INCMP set_swa 1
+INCMP set_eng 1
+INCMP set_swa 2
 INCMP . *
--- a/services/registration/terms.vis
+++ b/services/registration/terms.vis
@@ -1,5 +1,5 @@
-MOUT yes 0
-MOUT no 1
+MOUT yes 1
+MOUT no 2
 HALT
-INCMP create_pin 0
+INCMP create_pin 1
 INCMP quit *
--- a/services/registration/view_profile.vis
+++ b/services/registration/view_profile.vis
@@ -4,5 +4,8 @@ LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0
+MOUT quit 9
 HALT
 INCMP _ 0
+INCMP quit 9
+INCMP . *
Author	SHA1	Message	Date
lash	58edfa01a2	Merge pull request 'menu-primary-selectors' (#237 ) from menu-primary-selectors into master Some checks failed release / docker (push) Has been cancelled Details Reviewed-on: urdt/ussd#237 Reviewed-by: lash <accounts-grassrootseconomics@holbrook.no>	2025-01-02 15:50:42 +01:00
Carlosokumu	3830c12a57	update tests	2025-01-02 17:42:03 +03:00
Carlosokumu	f1fd690a7b	update expected content	2025-01-02 17:37:26 +03:00
Carlosokumu	e666c58644	start primary selectors with 1	2025-01-02 12:17:28 +03:00
Carlosokumu	e980586910	chore: repeat same node on invalid menu choice	2025-01-02 12:15:57 +03:00
Carlosokumu	ffd5be1f1f	add quit option on view profile	2025-01-02 12:12:52 +03:00
lash	ed1aeecf7d	Merge pull request 'Legible dumper' (#232 ) from lash/dump-key-prefix into master Some checks failed release / docker (push) Has been cancelled Details Reviewed-on: urdt/ussd#232	2024-12-31 09:56:04 +01:00
lash	3b69f3d38d	Merge branch 'master' into lash/dump-key-prefix	2024-12-31 09:55:40 +01:00
lash	cd58f5ae33	Upgrade govise	2024-12-31 08:55:25 +00:00
alfred-mk	7a535f796a	output the value as a string	2024-12-31 11:41:04 +03:00
lash	7c4c73125e	Merge pull request 'force-restart-state' (#223 ) from force-restart-state into master Reviewed-on: urdt/ussd#223	2024-12-31 09:34:44 +01:00
lash	c7dbe1d88f	Remove obsolete subprefix strings	2024-12-31 08:30:08 +00:00
lash	3bcd48e5a7	Update govise	2024-12-30 19:58:34 +00:00
lash	0e12c0ee4e	Add prefix for dumper, format base dump key for pg	2024-12-30 19:35:45 +00:00