From 03eccdadeb1b12a2418a4192fd9deed460d2aa83 Mon Sep 17 00:00:00 2001 From: Mark Bailey Date: Sun, 24 Nov 2024 07:19:05 -0500 Subject: [PATCH] refactor: move packages into a more sensible structure --- app/controller/controller.go | 2 +- app/routing/router.go | 2 +- app/routing/routes.go | 1 + app/session/cookieprovider.go | 1 + {lib/session/memory => app/session}/memprovider.go | 10 ++++------ {lib => app}/session/session.go | 0 cmd/main.go | 6 +++--- handlers/admin/index.go | 2 +- handlers/shared/homepage.go | 2 +- handlers/shared/user.go | 2 +- lib/middleware/middleware.go | 2 +- lib/session/memory/cookieprovider.go | 1 - 12 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 app/session/cookieprovider.go rename {lib/session/memory => app/session}/memprovider.go (90%) rename {lib => app}/session/session.go (100%) delete mode 100644 lib/session/memory/cookieprovider.go diff --git a/app/controller/controller.go b/app/controller/controller.go index d82b83b..04467b6 100644 --- a/app/controller/controller.go +++ b/app/controller/controller.go @@ -1,12 +1,12 @@ package controller import ( + "git.markbailey.dev/cerbervs/ptpp/app/session" "git.markbailey.dev/cerbervs/ptpp/lib/logger" "net/http" "git.markbailey.dev/cerbervs/ptpp/lib/database" werror "git.markbailey.dev/cerbervs/ptpp/lib/error" - "git.markbailey.dev/cerbervs/ptpp/lib/session" ) type IController interface { diff --git a/app/routing/router.go b/app/routing/router.go index 6f16e23..aeb589f 100644 --- a/app/routing/router.go +++ b/app/routing/router.go @@ -3,11 +3,11 @@ package routing import ( "git.markbailey.dev/cerbervs/ptpp/app/controller" "git.markbailey.dev/cerbervs/ptpp/app/handler" + "git.markbailey.dev/cerbervs/ptpp/app/session" "git.markbailey.dev/cerbervs/ptpp/lib/database" werror "git.markbailey.dev/cerbervs/ptpp/lib/error" "git.markbailey.dev/cerbervs/ptpp/lib/logger" "git.markbailey.dev/cerbervs/ptpp/lib/middleware" - "git.markbailey.dev/cerbervs/ptpp/lib/session" "git.markbailey.dev/cerbervs/ptpp/util" "log" "net/http" diff --git a/app/routing/routes.go b/app/routing/routes.go index 0f7a2a8..9481137 100644 --- a/app/routing/routes.go +++ b/app/routing/routes.go @@ -29,4 +29,5 @@ var AppRouter = Router{ Middleware: &[]middleware.Func{middleware.WithAuth}, }, }, + Middleware: &[]middleware.Func{middleware.WithLogger, middleware.WithUsername}, } diff --git a/app/session/cookieprovider.go b/app/session/cookieprovider.go new file mode 100644 index 0000000..ab87616 --- /dev/null +++ b/app/session/cookieprovider.go @@ -0,0 +1 @@ +package session diff --git a/lib/session/memory/memprovider.go b/app/session/memprovider.go similarity index 90% rename from lib/session/memory/memprovider.go rename to app/session/memprovider.go index 5ead1b8..d2a2de9 100644 --- a/lib/session/memory/memprovider.go +++ b/app/session/memprovider.go @@ -1,11 +1,9 @@ -package memory +package session import ( "container/list" "sync" "time" - - "git.markbailey.dev/cerbervs/ptpp/lib/session" ) var prov = &Provider{list: list.New()} @@ -58,7 +56,7 @@ type Provider struct { lock sync.Mutex } -func (p *Provider) SessionInit(sid string) (session.ISession, error) { +func (p *Provider) SessionInit(sid string) (ISession, error) { prov.lock.Lock() defer prov.lock.Unlock() v := make(map[interface{}]interface{}, 0) @@ -68,7 +66,7 @@ func (p *Provider) SessionInit(sid string) (session.ISession, error) { return newSess, nil } -func (p *Provider) SessionRead(sid string) (session.ISession, error) { +func (p *Provider) SessionRead(sid string) (ISession, error) { if element, ok := prov.sessions[sid]; ok { return element.Value.(*MemSessionStore), nil } @@ -119,5 +117,5 @@ func (p *Provider) SessionUpdate(sid string) error { func init() { prov.sessions = make(map[string]*list.Element, 0) - session.Register("memory", prov) + Register("memory", prov) } diff --git a/lib/session/session.go b/app/session/session.go similarity index 100% rename from lib/session/session.go rename to app/session/session.go diff --git a/cmd/main.go b/cmd/main.go index 7e3f01f..f7be0d7 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -3,13 +3,13 @@ package main import ( "git.markbailey.dev/cerbervs/ptpp/app" "git.markbailey.dev/cerbervs/ptpp/app/routing" - main2 "git.markbailey.dev/cerbervs/ptpp/app/server" + "git.markbailey.dev/cerbervs/ptpp/app/server" "net/http" "os" "strconv" "time" - _ "git.markbailey.dev/cerbervs/ptpp/lib/session/memory" + _ "git.markbailey.dev/cerbervs/ptpp/app/session" ) func main() { @@ -31,7 +31,7 @@ func main() { port = devPort } - s := main2.Server{ + s := server.Server{ Addr: addr, Server: http.Server{ Addr: addr + ":" + strconv.Itoa(port), diff --git a/handlers/admin/index.go b/handlers/admin/index.go index 6d6c4c9..002aa48 100644 --- a/handlers/admin/index.go +++ b/handlers/admin/index.go @@ -4,9 +4,9 @@ import ( "context" "errors" "git.markbailey.dev/cerbervs/ptpp/app/controller" + "git.markbailey.dev/cerbervs/ptpp/app/session" "git.markbailey.dev/cerbervs/ptpp/lib/database" "git.markbailey.dev/cerbervs/ptpp/lib/logger" - "git.markbailey.dev/cerbervs/ptpp/lib/session" "git.markbailey.dev/cerbervs/ptpp/view/layout" "net/http" diff --git a/handlers/shared/homepage.go b/handlers/shared/homepage.go index 0ca0556..f8d7b6f 100644 --- a/handlers/shared/homepage.go +++ b/handlers/shared/homepage.go @@ -3,9 +3,9 @@ package shared import ( "context" "git.markbailey.dev/cerbervs/ptpp/app/controller" + "git.markbailey.dev/cerbervs/ptpp/app/session" "git.markbailey.dev/cerbervs/ptpp/lib/database" "git.markbailey.dev/cerbervs/ptpp/lib/logger" - "git.markbailey.dev/cerbervs/ptpp/lib/session" "git.markbailey.dev/cerbervs/ptpp/view/layout" "net/http" "os" diff --git a/handlers/shared/user.go b/handlers/shared/user.go index d62da7e..37ccc32 100644 --- a/handlers/shared/user.go +++ b/handlers/shared/user.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" "git.markbailey.dev/cerbervs/ptpp/app/controller" + "git.markbailey.dev/cerbervs/ptpp/app/session" "git.markbailey.dev/cerbervs/ptpp/lib/database" "git.markbailey.dev/cerbervs/ptpp/lib/database/dto" "git.markbailey.dev/cerbervs/ptpp/lib/logger" - "git.markbailey.dev/cerbervs/ptpp/lib/session" "git.markbailey.dev/cerbervs/ptpp/util" "net/http" "time" diff --git a/lib/middleware/middleware.go b/lib/middleware/middleware.go index f2c1e23..c210e87 100644 --- a/lib/middleware/middleware.go +++ b/lib/middleware/middleware.go @@ -2,12 +2,12 @@ package middleware import ( "fmt" + "git.markbailey.dev/cerbervs/ptpp/app/session" "git.markbailey.dev/cerbervs/ptpp/util" "net/http" "os" "git.markbailey.dev/cerbervs/ptpp/lib/logger" - "git.markbailey.dev/cerbervs/ptpp/lib/session" ) type Func func(http.Handler) http.Handler diff --git a/lib/session/memory/cookieprovider.go b/lib/session/memory/cookieprovider.go deleted file mode 100644 index 05af74b..0000000 --- a/lib/session/memory/cookieprovider.go +++ /dev/null @@ -1 +0,0 @@ -package memory