Merge branch 'master' into lash/update-dump

devtools/admin/admin_numbers.json

@@ -1,7 +0,0 @@
-{
-  "admins": [
-    {
-      "phonenumber" : "<replace with any admin number to test with >"
-    }
-   ]
-}

devtools/admin/commands/seed.go

@@ -1,47 +0,0 @@
-package commands
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("adminstore")
-)
-
-type Admin struct {
-	PhoneNumber string `json:"phonenumber"`
-}
-
-type Config struct {
-	Admins []Admin `json:"admins"`
-}
-
-func Seed(ctx context.Context) error {
-	var config Config
-	adminstore, err := store.NewAdminStore(ctx, "../admin_numbers")
-	store := adminstore.FsStore
-	if err != nil {
-		return err
-	}
-	defer store.Close()
-	data, err := os.ReadFile("admin_numbers.json")
-	if err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &config); err != nil {
-		return err
-	}
-	for _, admin := range config.Admins {
-		err := store.Put(ctx, []byte(admin.PhoneNumber), []byte("1"))
-		if err != nil {
-			logg.Printf(logging.LVL_DEBUG, "Failed to insert admin number", admin.PhoneNumber)
-			return err
-		}
-	}
-	return nil
-}

devtools/admin/main.go

@@ -2,16 +2,72 @@ package main
 
 import (
 	"context"
-	"log"
+	"flag"
+	"fmt"
+	"os"
+	"path"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/devtools/admin/commands"
+	"git.defalsify.org/vise.git/logging"
+
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+)
+
+var (
+	logg = logging.NewVanilla().WithContextKey("SessionId")
+	scriptDir     = path.Join("services", "registration")
 )
 
 func main() {
-	ctx := context.Background()
-	err := commands.Seed(ctx)
+	config.LoadConfig()
+
+	var sessionId string
+	var connStr string
+
+	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
+	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.Parse()
+
+
+	if connStr == "" {
+		connStr = config.DbConn()
+	}
+	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		log.Fatalf("Failed to initialize a list of admins with error %s", err)
+		fmt.Fprintf(os.Stderr, "connstr err: %v\n", err)
+		os.Exit(1)
+	}
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+
+	pfp := path.Join(scriptDir, "pp.csv")
+	flagParser, err := application.NewFlagManager(pfp)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "flagparser fail: %v\n", err)
+		os.Exit(1)
+	}
+
+	x := cmd.NewCmd(connData, sessionId, flagParser)
+	err = x.Parse(flag.Args())
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "cmd parse fail: %v\n", err)
+		os.Exit(1)
+	}
+
+	logg.Infof("start command", "conn", connData, "subcmd", x)
+
+	menuStorageService := storage.NewMenuStorageService(connData, "")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
+		os.Exit(1)
+	}
+
+	err = x.Exec(ctx, menuStorageService)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "cmd exec error: %v\n", err)
+		os.Exit(1)
 	}
 
 }