cmd/africastalking/main.go

@@ -131,7 +131,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(ctx,pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {
@@ -139,12 +139,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = lhs.AdminStore.Seed()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

cmd/async/main.go

@@ -104,15 +104,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-
-	err = lhs.AdminStore.Seed()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
 	accountService := server.AccountService{}
 
 	hl, err := lhs.GetHandler(&accountService)

cmd/http/main.go

@@ -92,20 +92,13 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(ctx,pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-
-	err = lhs.AdminStore.Seed()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

cmd/main.go

@@ -15,6 +15,7 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/internal/utils"
 )
 
 var (
@@ -48,6 +49,9 @@ func main() {
 	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
 
+	as, _ := utils.NewAdminStore(ctx, "admin_numbers")
+	as.Seed()
+
 	cfg := engine.Config{
 		Root:       "root",
 		SessionId:  sessionId,
@@ -88,8 +92,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdatastore)
+	lhs.SetAdminStore(as)
 	lhs.SetPersister(pe)
 
 	if err != nil {
@@ -97,12 +102,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = lhs.AdminStore.Seed()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

internal/handlers/handlerservice.go

@@ -1,8 +1,6 @@
 package handlers
 
 import (
-	"context"
-
 	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
@@ -36,19 +34,14 @@ type LocalHandlerService struct {
 	Rs            resource.Resource
 }
 
-func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
+func NewLocalHandlerService(fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
 	parser, err := getParser(fp, debug)
 	if err != nil {
 		return nil, err
 	}
-	adminstore, err := utils.NewAdminStore(ctx, "admin_numbers")
-	if err != nil {
-		return nil, err
-	}
 	return &LocalHandlerService{
 		Parser: parser,
 		DbRs:   dbResource,
-		AdminStore: adminstore,
 		Cfg:    cfg,
 		Rs:     rs,
 	}, nil

internal/testutil/TestEngine.go

@@ -73,7 +73,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userDataStore)
 	lhs.SetPersister(pe)