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

pin-reset #139

Merged
lash merged 61 commits from pin-reset into pre-mock-remove 2024-11-02 14:54:20 +01:00
Conversation 0 Commits 61 Files Changed 37 +30 -9
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5abe9b78cc - Show all commits

8
cmd/africastalking/main.go
View File

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

9
cmd/async/main.go
View File

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

9
cmd/http/main.go
View File

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

13
cmd/main.go
View File

@ -15,7 +15,6 @@ import (
"git.grassecon.net/urdt/ussd/internal/handlers" "git.grassecon.net/urdt/ussd/internal/handlers"
"git.grassecon.net/urdt/ussd/internal/handlers/server" "git.grassecon.net/urdt/ussd/internal/handlers/server"
"git.grassecon.net/urdt/ussd/internal/storage" "git.grassecon.net/urdt/ussd/internal/storage"
"git.grassecon.net/urdt/ussd/internal/utils"
) )
var ( var (
@ -49,9 +48,6 @@ func main() {
ctx = context.WithValue(ctx, "Database", database) ctx = context.WithValue(ctx, "Database", database)
pfp := path.Join(scriptDir, "pp.csv") pfp := path.Join(scriptDir, "pp.csv")
as, _ := utils.NewAdminStore(ctx, "admin_numbers")
as.Seed()
cfg := engine.Config{ cfg := engine.Config{
Root: "root", Root: "root",
lash commented 2024-10-31 12:08:20 +01:00
Outdated
Review
Copy Link

We are going to need all executables. Should this be instantiated somewhere else, since the path is known?

We are going to need all executables. Should this be instantiated somewhere else, since the path is known?
carlos commented 2024-10-31 18:19:45 +01:00
Outdated
Review
Copy Link

Sure,we can define it in the LocalHandlerService , then instantiate it in the NewHandlerService,consider: 12825ae08a ,will this work?

Sure,we can define it in the LocalHandlerService , then instantiate it in the NewHandlerService,consider: 12825ae08a268db47ce105271c41807d1130913a ,will this work?
SessionId: sessionId, SessionId: sessionId,
@ -92,9 +88,8 @@ func main() {
os.Exit(1) os.Exit(1)
} }
lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs) lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
lhs.SetDataStore(&userdatastore) lhs.SetDataStore(&userdatastore)
lhs.SetAdminStore(as)
lhs.SetPersister(pe) lhs.SetPersister(pe)
if err != nil { if err != nil {
@ -102,6 +97,12 @@ func main() {
os.Exit(1) os.Exit(1)
} }
err = lhs.AdminStore.Seed()
if err != nil {
fmt.Fprintf(os.Stderr, err.Error())
os.Exit(1)
}
accountService := server.AccountService{} accountService := server.AccountService{}
hl, err := lhs.GetHandler(&accountService) hl, err := lhs.GetHandler(&accountService)
if err != nil { if err != nil {