add a db flag to specify the database of choice

cmd/africastalking/main.go

@@ -14,6 +14,7 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
+	testdataloader "github.com/peteole/testdata-loader"
 
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
@@ -26,13 +27,14 @@ import (
 
 var (
 	logg          = logging.NewVanilla().WithDomain("AfricasTalking").WithContextKey("at-session-id")
+	baseDir       = testdataloader.GetBasePath()
 	scriptDir     = path.Join("services", "registration")
 	build         = "dev"
 	menuSeparator = ": "
 )
 
 func init() {
-	initializers.LoadEnvVariables()
+	initializers.LoadEnvVariables(baseDir)
 }
 func main() {
 	config.LoadConfig()

cmd/async/main.go

@@ -12,6 +12,7 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
+	testdataloader "github.com/peteole/testdata-loader"
 
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
@@ -22,12 +23,13 @@ import (
 
 var (
 	logg          = logging.NewVanilla()
+	baseDir       = testdataloader.GetBasePath()
 	scriptDir     = path.Join("services", "registration")
 	menuSeparator = ": "
 )
 
 func init() {
-	initializers.LoadEnvVariables()
+	initializers.LoadEnvVariables(baseDir)
 }
 
 type asyncRequestParser struct {

cmd/http/main.go

@@ -14,6 +14,7 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
+	testdataloader "github.com/peteole/testdata-loader"
 
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
@@ -24,13 +25,14 @@ import (
 )
 
 var (
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join("services", "registration")
+	logg          = logging.NewVanilla()
+	baseDir       = testdataloader.GetBasePath()
+	scriptDir     = path.Join("services", "registration")
 	menuSeparator = ": "
 )
 
 func init() {
-	initializers.LoadEnvVariables()
+	initializers.LoadEnvVariables(baseDir)
 }
 
 func main() {

cmd/main.go

@@ -15,16 +15,18 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 	"git.grassecon.net/urdt/ussd/remote"
+	testdataloader "github.com/peteole/testdata-loader"
 )
 
 var (
 	logg          = logging.NewVanilla()
+	baseDir       = testdataloader.GetBasePath()
 	scriptDir     = path.Join("services", "registration")
 	menuSeparator = ": "
 )
 
 func init() {
-	initializers.LoadEnvVariables()
+	initializers.LoadEnvVariables(baseDir)
 }
 
 func main() {

devtools/gen/main.go

@@ -9,22 +9,23 @@ import (
 	"path"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/common"
+	"git.grassecon.net/urdt/ussd/config"
+	"git.grassecon.net/urdt/ussd/initializers"
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	testdataloader "github.com/peteole/testdata-loader"
 )
 
 var (
 	logg      = logging.NewVanilla()
+	baseDir   = testdataloader.GetBasePath()
 	scriptDir = path.Join("services", "registration")
 )
 
 func init() {
-	initializers.LoadEnvVariables()
+	initializers.LoadEnvVariables(baseDir)
 }
 
-
 func main() {
 	config.LoadConfig()
 
@@ -75,5 +76,4 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	
 }

devtools/store/main.go

@@ -7,24 +7,25 @@ import (
 	"os"
 	"path"
 
-	"git.grassecon.net/urdt/ussd/config"
-	"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"
+	"git.grassecon.net/urdt/ussd/config"
+	"git.grassecon.net/urdt/ussd/debug"
+	"git.grassecon.net/urdt/ussd/initializers"
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	testdataloader "github.com/peteole/testdata-loader"
 )
 
 var (
 	logg      = logging.NewVanilla()
+	baseDir   = testdataloader.GetBasePath()
 	scriptDir = path.Join("services", "registration")
 )
 
 func init() {
-	initializers.LoadEnvVariables()
+	initializers.LoadEnvVariables(baseDir)
 }
 
-
 func main() {
 	config.LoadConfig()
 

initializers/load.go

@@ -3,24 +3,26 @@ package initializers
 import (
 	"log"
 	"os"
+	"path"
 	"strconv"
 
 	"github.com/joho/godotenv"
 )
 
-func LoadEnvVariables() {
-	err := godotenv.Load()
+func LoadEnvVariables(baseDir string) {
+	envDir := path.Join(baseDir, ".env")
+	err := godotenv.Load(envDir)
 	if err != nil {
-		log.Fatal("Error loading .env file")
+		log.Fatal("Error loading .env file", err)
 	}
 }
 
 // Helper to get environment variables with a default fallback
 func GetEnv(key, defaultVal string) string {
-  if value, exists := os.LookupEnv(key); exists {
-   	return value
+	if value, exists := os.LookupEnv(key); exists {
+		return value
 	}
-  return defaultVal
+	return defaultVal
 }
 
 // Helper to safely convert environment variables to uint

internal/testutil/TestEngine.go

@@ -10,24 +10,35 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
+	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 	"git.grassecon.net/urdt/ussd/internal/testutil/testservice"
 	"git.grassecon.net/urdt/ussd/internal/testutil/testtag"
-	testdataloader "github.com/peteole/testdata-loader"
 	"git.grassecon.net/urdt/ussd/remote"
+	testdataloader "github.com/peteole/testdata-loader"
 )
 
 var (
-	baseDir   = testdataloader.GetBasePath()
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join(baseDir, "services", "registration")
+	baseDir          = testdataloader.GetBasePath()
+	logg             = logging.NewVanilla()
+	scriptDir        = path.Join(baseDir, "services", "registration")
+	selectedDatabase = ""
 )
 
+func init() {
+	initializers.LoadEnvVariables(baseDir)
+}
+
+// SetDatabase updates the database used by TestEngine
+func SetDatabase(dbType string) {
+	selectedDatabase = dbType
+}
+
 func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", "gdbm")
+	ctx = context.WithValue(ctx, "Database", selectedDatabase)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	var eventChannel = make(chan bool)

menutraversal_test/menu_traversal_test.go

@@ -24,6 +24,7 @@ var (
 )
 
 var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
+var database = flag.String("db", "gdbm", "Specify the database (gdbm or postgres)")
 
 func GenerateSessionId() string {
 	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
@@ -79,12 +80,18 @@ func extractSendAmount(response []byte) string {
 }
 
 func TestMain(m *testing.M) {
+	// Parse the flags
+	flag.Parse()
+
 	sessionID = GenerateSessionId()
 	defer func() {
 		if err := os.RemoveAll(testStore); err != nil {
 			log.Fatalf("Failed to delete state store %s: %v", testStore, err)
 		}
 	}()
+
+	// Set the selected database
+	testutil.SetDatabase(*database)
 	m.Run()
 }
 
@@ -121,7 +128,6 @@ func TestAccountCreationSuccessful(t *testing.T) {
 		}
 	}
 	<-eventChannel
-
 }
 
 func TestAccountRegistrationRejectTerms(t *testing.T) {