Merge remote-tracking branch 'remotes/origin/lash/thread-gdbm' into wip-menu-select-fix

.env.example

@@ -1,17 +0,0 @@
-#Serve Http
-PORT=7123
-HOST=127.0.0.1
-
-#PostgreSQL
-DB_HOST=localhost
-DB_USER=postgres
-DB_PASSWORD=strongpass
-DB_NAME=urdt_ussd
-DB_PORT=5432
-DB_SSLMODE=disable
-DB_TIMEZONE=Africa/Nairobi
-
-#External API Calls
-CREATE_ACCOUNT_URL="https://custodial.sarafu.africa/api/account/create"
-TRACK_STATUS_URL="https://custodial.sarafu.africa/api/track/"
-BALANCE_URL="https://custodial.sarafu.africa/api/account/status/"

.gitignore

@@ -4,5 +4,3 @@ go.work*
 **/*/*.bin
 **/*/.state/
 cmd/.state/
-id_*
-*.gdbm

cmd/africastalking/main.go

@@ -19,9 +19,6 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
-
-	"git.grassecon.net/urdt/ussd/initializers"
-	"github.com/joho/godotenv"
 )
 
 var (
@@ -29,18 +26,6 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
-	initializers.ConnectToDb()
-	initializers.SyncDatabase()
-
-	err := godotenv.Load()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}
-
 type atRequestParser struct{}
 
 func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
@@ -84,11 +69,13 @@ func main() {
 	var resourceDir string
 	var size uint
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", "127.0.0.1", "http host")
 	flag.UintVar(&port, "p", 7123, "http port")
@@ -104,7 +91,9 @@ func main() {
 		OutputSize: uint32(size),
 		FlagCount:  uint32(16),
 	}
-
+	if stateDebug {
+		cfg.StateDebug = true
+	}
 	if engineDebug {
 		cfg.EngineDebug = true
 	}

cmd/async/main.go

@@ -15,9 +15,6 @@ import (
 
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/storage"
-
-	"git.grassecon.net/urdt/ussd/initializers"
-	"github.com/joho/godotenv"
 )
 
 var (
@@ -25,18 +22,6 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
-	initializers.ConnectToDb()
-	initializers.SyncDatabase()
-
-	err := godotenv.Load()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}
-
 type asyncRequestParser struct {
 	sessionId string
 	input     []byte
@@ -56,12 +41,14 @@ func main() {
 	var resourceDir string
 	var size uint
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", "127.0.0.1", "http host")
 	flag.UintVar(&port, "p", 7123, "http port")
@@ -77,7 +64,9 @@ func main() {
 		OutputSize: uint32(size),
 		FlagCount:  uint32(16),
 	}
-
+	if stateDebug {
+		cfg.StateDebug = true
+	}
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
@@ -149,26 +138,22 @@ func main() {
 	for true {
 		rqs, err = sh.Process(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in process: %v", "err", err)
 			fmt.Errorf("error in process: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Output(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in output: %v", "err", err)
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Reset(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)
 			os.Exit(1)
 		}
 		fmt.Println("")
 		_, err = fmt.Scanln(&rqs.Input)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in input", "err", err)
 			fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}

cmd/http/main.go

@@ -18,9 +18,6 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
-
-	"github.com/joho/godotenv"
-	"git.grassecon.net/urdt/ussd/initializers"
 )
 
 var (
@@ -28,28 +25,18 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
-	initializers.ConnectToDb()
-	initializers.SyncDatabase()
-
-	err := godotenv.Load()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}
-
 func main() {
 	var dbDir string
 	var resourceDir string
 	var size uint
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", "127.0.0.1", "http host")
 	flag.UintVar(&port, "p", 7123, "http port")
@@ -65,7 +52,9 @@ func main() {
 		OutputSize: uint32(size),
 		FlagCount:  uint32(16),
 	}
-
+	if stateDebug {
+		cfg.StateDebug = true
+	}
 	if engineDebug {
 		cfg.EngineDebug = true
 	}

cmd/main.go

@@ -12,9 +12,6 @@ import (
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/storage"
-
-	"github.com/joho/godotenv"
-	"git.grassecon.net/urdt/ussd/initializers"
 )
 
 var (
@@ -22,26 +19,14 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
-	initializers.ConnectToDb()
-	initializers.SyncDatabase()
-
-	err := godotenv.Load()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}
-
 func main() {
 	var dbDir string
 	var size uint
 	var sessionId string
-	var engineDebug bool
+	var debug bool
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&debug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.Parse()
 
@@ -108,7 +93,7 @@ func main() {
 
 	en := lhs.GetEngine()
 	en = en.WithFirst(hl.Init)
-	if engineDebug {
+	if debug {
 		en = en.WithDebug(nil)
 	}
 

go.mod

@@ -3,24 +3,14 @@ module git.grassecon.net/urdt/ussd
 go 1.22.6
 
 require (
-	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb
+	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240922152136-7ea16f9137b4
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/peteole/testdata-loader v0.3.0
+	golang.org/x/crypto v0.17.0
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
 )
 
-require (
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.6.0 // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	gorm.io/gorm v1.25.12 // indirect
-)
+require golang.org/x/sys v0.15.0 // indirect
 
 require (
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
@@ -28,15 +18,12 @@ require (
 	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
-	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
-	github.com/joho/godotenv v1.5.1
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.9.0
 	github.com/x448/float16 v0.8.4 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/driver/postgres v1.5.9
 )

go.sum

@@ -1,5 +1,5 @@
-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.20240923162317-c20d557a3dbb/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
+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.20240922152136-7ea16f9137b4/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
 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=
@@ -8,62 +8,35 @@ github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk
 github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
-github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY=
-github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw=
-github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
-github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
 github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
 github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 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/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/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+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/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/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8=
-gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
-gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s=
-gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
-gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
-gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=

initializers/connectToDb.go

@@ -1,35 +0,0 @@
-package initializers
-
-import (
-	"os"
-
-	"github.com/joho/godotenv"
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-)
-
-var DB *gorm.DB
-
-func ConnectToDb() {
-	var err error
-
-	// Load the .env file
-	err = godotenv.Load()
-	if err != nil {
-		panic("Error loading .env file")
-	}
-
-	dsn := "host=" + os.Getenv("DB_HOST") +
-		" user=" + os.Getenv("DB_USER") +
-		" password=" + os.Getenv("DB_PASSWORD") +
-		" dbname=" + os.Getenv("DB_NAME") +
-		" port=" + os.Getenv("DB_PORT") +
-		" sslmode=" + os.Getenv("DB_SSLMODE") +
-		" TimeZone=" + os.Getenv("DB_TIMEZONE")
-
-	DB, err = gorm.Open(postgres.Open(dsn), &gorm.Config{})
-
-	if err != nil {
-		panic("Failed to connect to DB")
-	}
-}

initializers/loadEnvVariables.go

@@ -1,14 +0,0 @@
-package initializers
-
-import (
-    "log"
-
-    "github.com/joho/godotenv"
-)
-
-func LoadEnvVariables() {
-  err := godotenv.Load()
-  if err != nil {
-    log.Fatal("Error loading .env file")
-  }
-}

initializers/syncDatabase.go

@@ -1,10 +0,0 @@
-package initializers
-
-import "git.grassecon.net/urdt/ussd/internal/models"
-
-func SyncDatabase() {
-	DB.AutoMigrate(&models.User{})
-	DB.AutoMigrate(&models.ActiveVoucher{})
-	DB.AutoMigrate(&models.Voucher{})
-	DB.AutoMigrate(&models.Transaction{})
-}

internal/handlers/base.go

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

internal/handlers/handlerservice.go

@@ -88,6 +88,7 @@ func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
 	ls.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
 	ls.DbRs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
+	ls.DbRs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	ls.DbRs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
 	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
 	ls.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)

internal/handlers/ussd/menuhandler.go

@@ -276,6 +276,17 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	return res, nil
 }
 
+// SetResetSingleEdit sets and resets  flags to allow gradual editing of profile information.
+func (h *Handlers) SetResetSingleEdit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_single_edit, err := h.flagManager.GetFlag("flag_single_edit")
+	if err != nil {
+		return res, err
+	}
+	res.FlagReset = append(res.FlagReset, flag_single_edit)
+	return res, nil
+}
+
 // VerifyPin checks whether the confirmation PIN is similar to the account PIN
 // If similar, it sets the USERFLAG_PIN_SET flag allowing the user
 // to access the main menu
@@ -290,8 +301,6 @@ func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (res
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
-	//AccountPin, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_ACCOUNT_PIN)
 	store := h.userdataStore
 	AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
 	if err != nil {
@@ -327,6 +336,13 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
+
+	res.FlagReset = append(res.FlagReset, flag_allow_update)
+	res.FlagSet = append(res.FlagSet, flag_single_edit)
+
 	if len(input) > 0 {
 		firstName := string(input)
 		store := h.userdataStore
@@ -347,7 +363,6 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) > 0 {
 		familyName := string(input)
 		store := h.userdataStore
@@ -370,7 +385,6 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) == 4 {
 		yob := string(input)
 		store := h.userdataStore
@@ -391,7 +405,6 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) > 0 {
 		location := string(input)
 		store := h.userdataStore
@@ -406,19 +419,41 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 
 // SaveGender updates the gender in the gdbm with the provided input.
 func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	symbol, _ := h.st.Where()
 	var res resource.Result
 	var err error
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	code := codeFromCtx(ctx)
+	if len(input) > 0 {
+		gender := string(input)
+		switch gender {
+		case "1":
+			if code == "swa" {
+				gender = "Mwanaume"
+			} else {
+				gender = "Male"
+			}
+		case "2":
+			if code == "swa" {
+				gender = "Mwanamke"
+			} else {
+				gender = "Female"
+			}
+		case "3":
+			if code == "swa" {
+				gender = "Haijabainishwa"
+			} else {
+				gender = "Unspecified"
+			}
 
-	gender := strings.Split(symbol, "_")[1]
-	store := h.userdataStore
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
-	if err != nil {
-		return res, nil
+		}
+		store := h.userdataStore
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
+		if err != nil {
+			return res, nil
+		}
 	}
 
 	return res, nil
@@ -948,13 +983,20 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 // GetProfileInfo retrieves and formats the profile information of a user from a Gdbm backed storage.
 func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+	var defaultValue string
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 
+	code := h.st.Language.Code
+
 	// Default value when an entry is not found
-	defaultValue := "Not Provided"
+	if code == "swa" {
+		defaultValue = "Haipo"
+	} else {
+		defaultValue = "Not Provided"
+	}
 
 	// Helper function to handle nil byte slices and convert them to string
 	getEntryOrDefault := func(entry []byte, err error) string {
@@ -991,12 +1033,22 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 			return res, fmt.Errorf("invalid year of birth: %v", err)
 		}
 	}
-
-	// Format the result
-	res.Content = fmt.Sprintf(
-		"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-		name, gender, age, location, offerings,
-	)
-
+	switch code {
+	case "eng":
+		res.Content = fmt.Sprintf(
+			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+			name, gender, age, location, offerings,
+		)
+	case "swa":
+		res.Content = fmt.Sprintf(
+			"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
+			name, gender, age, location, offerings,
+		)
+	default:
+		res.Content = fmt.Sprintf(
+			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+			name, gender, age, location, offerings,
+		)
+	}
 	return res, nil
 }

internal/handlers/ussd/menuhandler_test.go

@@ -96,26 +96,12 @@ func TestCreateAccount(t *testing.T) {
 	mockDataStore.AssertExpectations(t)
 }
 
-func TestWithPersister(t *testing.T) {
-	// Test case: Setting a persister
-	h := &Handlers{}
-	p := &persist.Persister{}
-
-	result := h.WithPersister(p)
-
-	assert.Equal(t, p, h.pe, "The persister should be set correctly.")
-	assert.Equal(t, h, result, "The returned handler should be the same instance.")
-}
-
-func TestWithPersister_PanicWhenAlreadySet(t *testing.T) {
-	// Test case: Panic on multiple calls
-	h := &Handlers{pe: &persist.Persister{}}
-	require.Panics(t, func() {
-		h.WithPersister(&persist.Persister{})
-	}, "Should panic when trying to set a persister again.")
-}
-
 func TestSaveFirstname(t *testing.T) {
+
+	fm, err := NewFlagManager(flagsPath)
+	if err != nil {
+		t.Fatal(err)
+	}
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)
 
@@ -124,12 +110,16 @@ func TestSaveFirstname(t *testing.T) {
 	firstName := "John"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
+	flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
+	flag_single_edit, _ := fm.parser.GetFlag("flag_single_edit")
+
 	// Set up the expected behavior of the mock
 	mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_FIRST_NAME, []byte(firstName)).Return(nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		flagManager:   fm.parser,
 	}
 
 	// Call the method
@@ -137,7 +127,10 @@ func TestSaveFirstname(t *testing.T) {
 
 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, resource.Result{}, res)
+	assert.Equal(t, resource.Result{
+		FlagSet:   []uint32{flag_single_edit},
+		FlagReset: []uint32{flag_allow_update},
+	}, res)
 
 	// Assert all expectations were met
 	mockStore.AssertExpectations(t)
@@ -316,7 +309,6 @@ func TestSaveOfferings(t *testing.T) {
 func TestSaveGender(t *testing.T) {
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)
-	mockState := state.NewState(16)
 
 	// Define the session ID and context
 	sessionId := "session123"
@@ -324,32 +316,34 @@ func TestSaveGender(t *testing.T) {
 
 	// Define test cases
 	tests := []struct {
-		name            string
-		input           []byte
-		expectedGender  string
-		expectCall      bool
-		executingSymbol string
+		name           string
+		input          []byte
+		expectedGender string
+		expectCall     bool
 	}{
 		{
-			name:            "Valid Male Input",
-			input:           []byte("1"),
-			expectedGender:  "male",
-			executingSymbol: "set_male",
-			expectCall:      true,
+			name:           "Valid Male Input",
+			input:          []byte("1"),
+			expectedGender: "Male",
+			expectCall:     true,
 		},
 		{
-			name:            "Valid Female Input",
-			input:           []byte("2"),
-			expectedGender:  "female",
-			executingSymbol: "set_female",
-			expectCall:      true,
+			name:           "Valid Female Input",
+			input:          []byte("2"),
+			expectedGender: "Female",
+			expectCall:     true,
 		},
 		{
-			name:            "Valid Unspecified Input",
-			input:           []byte("3"),
-			executingSymbol: "set_unspecified",
-			expectedGender:  "unspecified",
-			expectCall:      true,
+			name:           "Valid Unspecified Input",
+			input:          []byte("3"),
+			expectedGender: "Unspecified",
+			expectCall:     true,
+		},
+		{
+			name:           "Empty Input",
+			input:          []byte(""),
+			expectedGender: "",
+			expectCall:     false,
 		},
 	}
 
@@ -362,11 +356,10 @@ func TestSaveGender(t *testing.T) {
 			} else {
 				mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_GENDER, []byte(tt.expectedGender)).Return(nil)
 			}
-			mockState.ExecPath = append(mockState.ExecPath, tt.executingSymbol)
+
 			// Create the Handlers instance with the mock store
 			h := &Handlers{
 				userdataStore: mockStore,
-				st:            mockState,
 			}
 
 			// Call the method
@@ -562,10 +555,12 @@ func TestSetLanguage(t *testing.T) {
 		name           string
 		execPath       []string
 		expectedResult resource.Result
+		symbol         string
 	}{
 		{
 			name:     "Set Default Language (English)",
 			execPath: []string{"set_eng"},
+			symbol:   "set_eng",
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "eng",
@@ -573,6 +568,7 @@ func TestSetLanguage(t *testing.T) {
 		},
 		{
 			name:     "Set Swahili Language",
+			symbol:   "set_swa",
 			execPath: []string{"set_swa"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
@@ -594,7 +590,7 @@ func TestSetLanguage(t *testing.T) {
 			}
 
 			// Call the method
-			res, err := h.SetLanguage(context.Background(), "set_language", nil)
+			res, err := h.SetLanguage(context.Background(), tt.symbol, nil)
 
 			if err != nil {
 				t.Error(err)
@@ -606,6 +602,76 @@ func TestSetLanguage(t *testing.T) {
 		})
 	}
 }
+
+func TestSetResetSingleEdit(t *testing.T) {
+	fm, err := NewFlagManager(flagsPath)
+
+	//flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
+	flag_single_edit, _ := fm.parser.GetFlag("flag_single_edit")
+
+	if err != nil {
+		log.Fatal(err)
+	}
+	// Define test cases
+	tests := []struct {
+		name           string
+		input          []byte
+		expectedResult resource.Result
+	}{
+		// {
+		// 	name:  "Set single Edit",
+		// 	input: []byte("2"),
+		// 	expectedResult: resource.Result{
+		// 		FlagSet:   []uint32{flag_single_edit},
+		// 		FlagReset: []uint32{flag_allow_update},
+		// 	},
+		// },
+		// {
+		// 	name:  "Set single Edit",
+		// 	input: []byte("3"),
+		// 	expectedResult: resource.Result{
+		// 		FlagSet:   []uint32{flag_single_edit},
+		// 		FlagReset: []uint32{flag_allow_update},
+		// 	},
+		// },
+		// {
+		// 	name:  "Set single edit",
+		// 	input: []byte("4"),
+		// 	expectedResult: resource.Result{
+		// 		FlagReset: []uint32{flag_allow_update},
+		// 		FlagSet:   []uint32{flag_single_edit},
+		// 	},
+		// },
+		{
+			name:  "No single edit set",
+			input: []byte("1"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_single_edit},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			// Create the Handlers instance with the mock flag manager
+			h := &Handlers{
+				flagManager: fm.parser,
+			}
+
+			// Call the method
+			res, err := h.SetResetSingleEdit(context.Background(), "set_reset_single_edit", tt.input)
+
+			if err != nil {
+				t.Error(err)
+			}
+			// Assert that the Result FlagSet has the required flags after language switch
+			assert.Equal(t, res, tt.expectedResult, "Flags should match reset edit")
+
+		})
+	}
+}
+
 func TestResetAllowUpdate(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
 
@@ -1045,18 +1111,26 @@ func TestCheckAccountStatus(t *testing.T) {
 				FlagReset: []uint32{flag_account_pending},
 			},
 		},
+		{
+			name:   "Test when account status is not a success",
+			input:  []byte("TrackingId12"),
+			status: "REVERTED",
+			expectedResult: resource.Result{
+				FlagSet:   []uint32{flag_account_success},
+				FlagReset: []uint32{flag_account_pending},
+			},
+		},
 	}
 
 	typ := utils.DATA_TRACKING_ID
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.status, nil)
 
+			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(tt.status)).Return(nil).Maybe()
 			// Define expected interactions with the mock
 			mockDataStore.On("ReadEntry", ctx, sessionId, typ).Return(tt.input, nil)
 
-			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.status, nil)
-			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(tt.status)).Return(nil)
-
 			// Call the method under test
 			res, _ := h.CheckAccountStatus(ctx, "check_status", tt.input)
 
@@ -1574,7 +1648,6 @@ func TestCheckBalance(t *testing.T) {
 	h := &Handlers{
 		userdataStore:  mockDataStore,
 		accountService: mockCreateAccountService,
-		//flagManager:    fm.parser,
 	}
 	//mock call operations
 	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
@@ -1592,23 +1665,51 @@ func TestGetProfile(t *testing.T) {
 
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)
+	mockState := state.NewState(16)
 
 	h := &Handlers{
 		userdataStore:  mockDataStore,
 		accountService: mockCreateAccountService,
+		st:             mockState,
 	}
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	tests := []struct {
-		name        string
-		keys        []utils.DataTyp
-		profileInfo []string
-		result      resource.Result
+		name         string
+		languageCode string
+		keys         []utils.DataTyp
+		profileInfo  []string
+		result       resource.Result
 	}{
 		{
-			name:        "Test with full profile information",
-			keys:        []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
-			profileInfo: []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
+			name:         "Test with full profile information in eng",
+			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
+			profileInfo:  []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
+			languageCode: "eng",
+			result: resource.Result{
+				Content: fmt.Sprintf(
+					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+					"John Doee", "Male", "48", "Kilifi", "Bananas",
+				),
+			},
+		},
+		{
+			name:         "Test with with profile information in swa ",
+			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
+			profileInfo:  []string{"Doee", "John", "Jinsia", "Bananas", "Kilifi", "1976"},
+			languageCode: "swa",
+			result: resource.Result{
+				Content: fmt.Sprintf(
+					"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
+					"John Doee", "Male", "48", "Kilifi", "Bananas",
+				),
+			},
+		},
+		{
+			name:         "Test with with profile information with language that is not yet supported",
+			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
+			profileInfo:  []string{"Doee", "John", "Jinsia", "Bananas", "Kilifi", "1976"},
+			languageCode: "nor",
 			result: resource.Result{
 				Content: fmt.Sprintf(
 					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
@@ -1622,6 +1723,13 @@ func TestGetProfile(t *testing.T) {
 			for index, key := range tt.keys {
 				mockDataStore.On("ReadEntry", ctx, sessionId, key).Return([]byte(tt.profileInfo[index]), nil)
 			}
+
+			err := mockState.SetLanguage(tt.languageCode)
+			if err != nil {
+				t.Fail()
+			}
+			h.st = mockState
+
 			res, _ := h.GetProfileInfo(ctx, "get_profile_info", []byte(""))
 
 			// Assert that expectations were met
@@ -1729,6 +1837,25 @@ func TestSaveTemporaryPIn(t *testing.T) {
 	mockStore.AssertExpectations(t)
 }
 
+func TestWithPersister(t *testing.T) {
+	// Test case: Setting a persister
+	h := &Handlers{}
+	p := &persist.Persister{}
+
+	result := h.WithPersister(p)
+
+	assert.Equal(t, p, h.pe, "The persister should be set correctly.")
+	assert.Equal(t, h, result, "The returned handler should be the same instance.")
+}
+
+func TestWithPersister_PanicWhenAlreadySet(t *testing.T) {
+	// Test case: Panic on multiple calls
+	h := &Handlers{pe: &persist.Persister{}}
+	require.Panics(t, func() {
+		h.WithPersister(&persist.Persister{})
+	}, "Should panic when trying to set a persister again.")
+}
+
 func TestConfirmPin(t *testing.T) {
 	sessionId := "session123"
 

internal/models/ActiveVoucherModel.go

@@ -1,17 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/gofrs/uuid"
-	"gorm.io/gorm"
-)
-
-type ActiveVoucher struct {
-	gorm.Model
-	ID        uuid.UUID `gorm:"type:uuid;primary_key;default:uuid_generate_v4()"`
-	UserID    uuid.UUID
-	VoucherID uuid.UUID
-	CreatedAt time.Time
-	UpdatedAt time.Time
-}

internal/models/TransactionModel.go

@@ -1,21 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/gofrs/uuid"
-	"gorm.io/gorm"
-)
-
-type Transaction struct {
-	gorm.Model
-	ID        uuid.UUID `gorm:"type:uuid;primary_key;default:uuid_generate_v4()"`
-	UserID    uuid.UUID
-	VoucherID uuid.UUID
-	Amount    string
-	Sender    string
-	Receiver  string
-	Status    string
-	CreatedAt time.Time
-	UpdatedAt time.Time
-}

internal/models/UserModel.go

@@ -1,31 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/gofrs/uuid"
-	"gorm.io/gorm"
-)
-
-type User struct {
-	gorm.Model
-	ID             uuid.UUID `gorm:"type:uuid;primary_key;default:uuid_generate_v4()"`
-	SessionID      string    `gorm:"unique"`
-	PublicKey      string
-	CustodialID    string
-	TrackingID     string
-	FirstName      string
-	FamilyName     string
-	Offerings      string
-	Gender         string
-	YOB            string
-	Location       string
-	Status         string
-	AccountPIN     string
-	TemporaryPIN   string
-	ActiveVouchers []ActiveVoucher `gorm:"foreignKey:UserID"`
-	Transactions   []Transaction   `gorm:"foreignKey:UserID"`
-	Vouchers       []Voucher       `gorm:"foreignKey:UserID"`
-	CreatedAt      time.Time
-	UpdatedAt      time.Time
-}

internal/models/VoucherModel.go

@@ -1,22 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/gofrs/uuid"
-	"gorm.io/gorm"
-)
-
-type Voucher struct {
-	gorm.Model
-	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:uuid_generate_v4()"`
-	UserID          uuid.UUID
-	ContractAddress string
-	TokenSymbol     string
-	TokenDecimals   int
-	Balance         float64
-	ActiveVouchers  []ActiveVoucher `gorm:"foreignKey:VoucherID"`
-	Transactions    []Transaction   `gorm:"foreignKey:VoucherID"`
-	CreatedAt       time.Time
-	UpdatedAt       time.Time
-}

services/registration/_catch

@@ -1 +0,0 @@
-Something went wrong.Please try again

services/registration/_catch.vis

@@ -1 +0,0 @@
-HALT

services/registration/amount.vis

@@ -9,5 +9,4 @@ CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64
-LOAD get_amount 12
 INCMP transaction_pin *

services/registration/edit_familyname_menu

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

services/registration/edit_familyname_menu_swa

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

services/registration/edit_profile.vis

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

services/registration/enter_familyname.vis

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

services/registration/enter_familyname_swa

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

services/registration/enter_location.vis

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

services/registration/enter_name.vis

@@ -1,12 +1,4 @@
-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
 HALT
-RELOAD save_firstname
 INCMP _ 0
-INCMP pin_entry *
-
-
-
+INCMP enter_familyname *

services/registration/enter_offerings.vis

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

services/registration/enter_yob.vis

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

services/registration/my_account.vis

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

services/registration/profile_update_success

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

services/registration/profile_update_success.vis

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

services/registration/profile_update_success_swa

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

services/registration/select_gender.vis

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

services/registration/set_female.vis

@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry

services/registration/set_male.vis

@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry

services/registration/set_unspecified.vis

@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry

services/registration/transaction_initiated.vis

@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH _ flag_account_authorized 0
-RELOAD get_amount
+LOAD get_amount 10
 MAP get_amount
 RELOAD get_recipient
 MAP get_recipient

services/registration/transaction_pin

@@ -1,2 +1,2 @@
-{{.get_recipient}} will receive {{.get_amount}} from {{.get_sender}}
+{{.get_recipient}} will receive {{.validate_amount}} from {{.get_sender}}
 Please enter your PIN to confirm:

services/registration/transaction_pin.vis

@@ -1,13 +1,12 @@
-RELOAD get_amount
-MAP get_amount
+MAP validate_amount
 RELOAD get_recipient
 MAP get_recipient
 RELOAD get_sender
 MAP get_sender
 MOUT back 0
 MOUT quit 9
-LOAD authorize_account 6
 HALT
+LOAD authorize_account 6
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0

services/registration/transaction_pin_swa

@@ -1,2 +1,2 @@
-{{.get_recipient}} atapokea {{.get_amount}} kutoka kwa {{.get_sender}}
+{{.get_recipient}} atapokea {{.validate_amount}} kutoka kwa {{.get_sender}}
 Tafadhali weka PIN yako kudhibitisha:

services/registration/update_success_swa

@@ -1 +1 @@
-Akaunti imeupdatiwa
+Ombi lako la kuweka wasifu limefanikiwa

services/registration/view_menu_swa

@@ -0,0 +1 @@
+Angalia Wasifu