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

fix-repeated-nodes #81

Merged
lash merged 10 commits from fix-repeated-nodes into master 2024-09-25 01:48:34 +02:00
Conversation 1 Commits 10 Files Changed 9 +69 -52
19 changed files with 69 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a38b40eaf - Show all commits

4
cmd/async/main.go
View File

@ -138,22 +138,26 @@ func main() {
for true { for true {
rqs, err = sh.Process(rqs) rqs, err = sh.Process(rqs)
if err != nil { if err != nil {
logg.ErrorCtxf(ctx, "error in process: %v", "err", err)
fmt.Errorf("error in process: %v", err) fmt.Errorf("error in process: %v", err)
os.Exit(1) os.Exit(1)
} }
rqs, err = sh.Output(rqs) rqs, err = sh.Output(rqs)
if err != nil { if err != nil {
logg.ErrorCtxf(ctx, "error in output: %v", "err", err)
fmt.Errorf("error in output: %v", err) fmt.Errorf("error in output: %v", err)
os.Exit(1) os.Exit(1)
} }
rqs, err = sh.Reset(rqs) rqs, err = sh.Reset(rqs)
if err != nil { if err != nil {
logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
fmt.Errorf("error in reset: %v", err) fmt.Errorf("error in reset: %v", err)
os.Exit(1) os.Exit(1)
} }
fmt.Println("") fmt.Println("")
_, err = fmt.Scanln(&rqs.Input) _, err = fmt.Scanln(&rqs.Input)
if err != nil { if err != nil {
logg.ErrorCtxf(ctx, "error in input", "err", err)
fmt.Errorf("error in input: %v", err) fmt.Errorf("error in input: %v", err)
os.Exit(1) os.Exit(1)
} }

5
go.mod
View File

@ -3,15 +3,12 @@ module git.grassecon.net/urdt/ussd
go 1.22.6 go 1.22.6
require ( require (
git.defalsify.org/vise.git v0.1.0-rc.3.0.20240922152136-7ea16f9137b4 git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb
github.com/alecthomas/assert/v2 v2.2.2 github.com/alecthomas/assert/v2 v2.2.2
github.com/peteole/testdata-loader v0.3.0 github.com/peteole/testdata-loader v0.3.0
golang.org/x/crypto v0.17.0
gopkg.in/leonelquinteros/gotext.v1 v1.3.1 gopkg.in/leonelquinteros/gotext.v1 v1.3.1
) )
require golang.org/x/sys v0.15.0 // indirect
require ( require (
github.com/alecthomas/participle/v2 v2.0.0 // indirect github.com/alecthomas/participle/v2 v2.0.0 // indirect
github.com/alecthomas/repr v0.2.0 // indirect github.com/alecthomas/repr v0.2.0 // indirect

10
go.sum
View File

@ -1,5 +1,5 @@
git.defalsify.org/vise.git v0.1.0-rc.3.0.20240922152136-7ea16f9137b4 h1:IMVUK9OkZ/QtYZPHgTZ+XUs5VQ4eIewIaTyVSCF/nAY= git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb h1:6P4kxihcwMjDKzvUFC6t2zGNb7MDW+l/ACGlSAN1N8Y=
git.defalsify.org/vise.git v0.1.0-rc.3.0.20240922152136-7ea16f9137b4/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M= git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= 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/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g= github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
@ -28,12 +28,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc= gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=

2
internal/handlers/base.go
View File

@ -46,7 +46,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
var err error var err error
var ok bool var ok bool
logg.InfoCtxf(rqs.Ctx, "new request", rqs) logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
rqs.Storage, err = f.provider.Get(rqs.Config.SessionId) rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
if err != nil { if err != nil {

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

@ -356,7 +356,6 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
if !ok { if !ok {
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
if len(input) > 0 { if len(input) > 0 {
firstName := string(input) firstName := string(input)
store := h.userdataStore store := h.userdataStore
@ -640,7 +639,6 @@ func (h *Handlers) QuitWithHelp(ctx context.Context, sym string, input []byte) (
return res, nil return res, nil
} }
// VerifyYob verifies the length of the given input // VerifyYob verifies the length of the given input
func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result var res resource.Result

1
services/registration/edit_familyname_menu Normal file
View File

@ -0,0 +1 @@
Edit family name

1
services/registration/edit_familyname_menu_swa Normal file
View File

@ -0,0 +1 @@
Weka jina la familia

24
services/registration/edit_profile.vis
View File

@ -2,19 +2,21 @@ LOAD reset_account_authorized 16
LOAD reset_allow_update 0 LOAD reset_allow_update 0
RELOAD reset_allow_update RELOAD reset_allow_update
MOUT edit_name 1 MOUT edit_name 1
MOUT edit_gender 2 MOUT edit_familyname 2
MOUT edit_yob 3 MOUT edit_gender 3
MOUT edit_location 4 MOUT edit_yob 4
MOUT edit_offerings 5 MOUT edit_location 5
MOUT view 6 MOUT edit_offerings 6
MOUT view 7
MOUT back 0 MOUT back 0
HALT HALT
INCMP _ 0 INCMP my_account 0
LOAD set_reset_single_edit 0 LOAD set_reset_single_edit 0
RELOAD set_reset_single_edit RELOAD set_reset_single_edit
INCMP enter_name 1 INCMP enter_name 1
INCMP select_gender 2 INCMP enter_familyname 2
INCMP enter_yob 3 INCMP select_gender 3
INCMP enter_location 4 INCMP enter_yob 4
INCMP enter_offerings 5 INCMP enter_location 5
INCMP view_profile 6 INCMP enter_offerings 6
INCMP view_profile 7

8
services/registration/enter_familyname.vis
View File

@ -1,5 +1,9 @@
LOAD save_firstname 0 CATCH incorrect_pin flag_incorrect_pin 1
CATCH profile_update_success flag_allow_update 1
LOAD save_familyname 0
RELOAD save_familyname
MOUT back 0 MOUT back 0
HALT HALT
RELOAD save_familyname
INCMP _ 0 INCMP _ 0
INCMP select_gender * INCMP pin_entry *

1
services/registration/enter_familyname_swa
View File

@ -0,0 +1 @@
Weka jina la familia

11
services/registration/enter_location.vis
View File

@ -1,9 +1,8 @@
CATCH incorrect_date_format flag_incorrect_date_format 1 CATCH incorrect_pin flag_incorrect_pin 1
LOAD save_yob 0 CATCH profile_update_success flag_allow_update 1
CATCH update_success flag_allow_update 1 LOAD save_location 0
MOUT back 0 MOUT back 0
HALT HALT
RELOAD save_location
INCMP _ 0 INCMP _ 0
LOAD save_location 0 INCMP pin_entry *
CATCH pin_entry flag_single_edit 1
INCMP enter_offerings *

10
services/registration/enter_name.vis
View File

@ -1,4 +1,12 @@
CATCH incorrect_pin flag_incorrect_pin 1
CATCH profile_update_success flag_allow_update 1
LOAD save_firstname 0
RELOAD save_firstname
MOUT back 0 MOUT back 0
HALT HALT
RELOAD save_firstname
INCMP _ 0 INCMP _ 0
INCMP enter_familyname * INCMP pin_entry *

6
services/registration/enter_offerings.vis
View File

@ -1,8 +1,8 @@
LOAD save_location 0
CATCH incorrect_pin flag_incorrect_pin 1 CATCH incorrect_pin flag_incorrect_pin 1
CATCH update_success flag_allow_update 1 CATCH profile_update_success flag_allow_update 1
LOAD save_offerings 0
MOUT back 0 MOUT back 0
HALT HALT
LOAD save_offerings 0 RELOAD save_offerings
INCMP _ 0 INCMP _ 0
INCMP pin_entry * INCMP pin_entry *

13
services/registration/enter_yob.vis
View File

@ -1,9 +1,10 @@
LOAD save_gender 0 CATCH incorrect_pin flag_incorrect_pin 1
CATCH update_success flag_allow_update 1 CATCH profile_update_success flag_allow_update 1
LOAD save_yob 0
MOUT back 0 MOUT back 0
HALT HALT
LOAD verify_yob 0
CATCH incorrect_date_format flag_incorrect_date_format 1
RELOAD save_yob
INCMP _ 0 INCMP _ 0
LOAD verify_yob 8 INCMP pin_entry *
LOAD save_yob 0
CATCH pin_entry flag_single_edit 1
INCMP enter_location *

2
services/registration/my_account.vis
View File

@ -7,7 +7,7 @@ MOUT pin_options 5
MOUT my_address 6 MOUT my_address 6
MOUT back 0 MOUT back 0
HALT HALT
INCMP _ 0 INCMP main 0
INCMP edit_profile 1 INCMP edit_profile 1
INCMP change_language 2 INCMP change_language 2
INCMP balances 3 INCMP balances 3

1
services/registration/profile_update_success Normal file
View File

@ -0,0 +1 @@
Profile updated successfully

5
services/registration/profile_update_success.vis Normal file
View File

@ -0,0 +1,5 @@
MOUT back 0
MOUT quit 9
HALT
INCMP edit_profile 0
INCMP quit 9

1
services/registration/profile_update_success_swa Normal file
View File

@ -0,0 +1 @@
Ombi la Kuweka wasifu limefanikiwa

14
services/registration/select_gender.vis
View File

@ -1,13 +1,13 @@
LOAD save_familyname 0 CATCH incorrect_pin flag_incorrect_pin 1
CATCH update_success flag_allow_update 1 CATCH profile_update_success flag_allow_update 1
LOAD save_gender 0
MOUT male 1 MOUT male 1
MOUT female 2 MOUT female 2
MOUT unspecified 3 MOUT unspecified 3
MOUT back 0 MOUT back 0
HALT HALT
LOAD save_gender 0 RELOAD save_gender
CATCH pin_entry flag_single_edit 1
INCMP _ 0 INCMP _ 0
INCMP enter_yob 1 INCMP pin_entry *
INCMP enter_yob 2
INCMP enter_yob 3