From 862ff1ff7b5c14b879bd76d852a1a29f6b93669e Mon Sep 17 00:00:00 2001 From: tijl Date: Thu, 22 Aug 2024 14:58:43 +0200 Subject: [PATCH] updates --- .air.toml | 2 +- internal/middleware/language.go | 1 - internal/middleware/session.go | 1 - internal/oidc/handler.go | 8 ++++---- {modules/database => internal/queries}/db.go | 2 +- {modules/database => internal/queries}/models.go | 2 +- {modules/database => internal/queries}/sessions.sql | 0 {modules/database => internal/queries}/sessions.sql.go | 2 +- {modules/database => internal/queries}/users.sql | 0 {modules/database => internal/queries}/users.sql.go | 2 +- internal/service/main.go | 2 +- internal/user/sessions.go | 10 +++++----- internal/user/users.go | 8 ++++---- {internal => modules}/db/db.go | 6 +++--- sqlc.yaml | 6 +++--- 15 files changed, 25 insertions(+), 27 deletions(-) delete mode 100644 internal/middleware/language.go delete mode 100644 internal/middleware/session.go rename {modules/database => internal/queries}/db.go (97%) rename {modules/database => internal/queries}/models.go (97%) rename {modules/database => internal/queries}/sessions.sql (100%) rename {modules/database => internal/queries}/sessions.sql.go (99%) rename {modules/database => internal/queries}/users.sql (100%) rename {modules/database => internal/queries}/users.sql.go (99%) rename {internal => modules}/db/db.go (91%) diff --git a/.air.toml b/.air.toml index cdf810e..863018f 100644 --- a/.air.toml +++ b/.air.toml @@ -5,7 +5,7 @@ tmp_dir = ".air-tmp" bin = "./tijl.dev" cmd = "just build" delay = 1000 - exclude_dir = ["node_modules","modules/database","web/static"] + exclude_dir = ["node_modules","internal/queries","web/static"] exclude_unchanged = false follow_symlink = false include_ext = ["go", "html", "js", "ts"] diff --git a/internal/middleware/language.go b/internal/middleware/language.go deleted file mode 100644 index c870d7c..0000000 --- a/internal/middleware/language.go +++ /dev/null @@ -1 +0,0 @@ -package middleware diff --git a/internal/middleware/session.go b/internal/middleware/session.go deleted file mode 100644 index c870d7c..0000000 --- a/internal/middleware/session.go +++ /dev/null @@ -1 +0,0 @@ -package middleware diff --git a/internal/oidc/handler.go b/internal/oidc/handler.go index dcc6de3..b833b9c 100644 --- a/internal/oidc/handler.go +++ b/internal/oidc/handler.go @@ -6,10 +6,10 @@ import ( "errors" "net/http" - "git.tijl.dev/tijl/tijl.dev/internal/db" + "git.tijl.dev/tijl/tijl.dev/internal/queries" "git.tijl.dev/tijl/tijl.dev/internal/user" "git.tijl.dev/tijl/tijl.dev/internal/utils" - "git.tijl.dev/tijl/tijl.dev/modules/database" + "git.tijl.dev/tijl/tijl.dev/modules/db" log "git.tijl.dev/tijl/tijl.dev/modules/logger" "github.com/gofiber/fiber/v2" ) @@ -53,7 +53,7 @@ func HandleCallback(c *fiber.Ctx) error { _, err = db.Queries.GetUser(ctx, idToken.Subject) if err == nil { - db.Queries.UpdateUserData(ctx, database.UpdateUserDataParams{ + db.Queries.UpdateUserData(ctx, queries.UpdateUserDataParams{ Uid: idToken.Subject, Email: claims.Email, EmailVerified: claims.EmailVerified, @@ -61,7 +61,7 @@ func HandleCallback(c *fiber.Ctx) error { FullName: claims.Name, }) } else if err == sql.ErrNoRows { - db.Queries.CreateUser(ctx, database.CreateUserParams{ + db.Queries.CreateUser(ctx, queries.CreateUserParams{ Uid: idToken.Subject, Email: claims.Email, EmailVerified: claims.EmailVerified, diff --git a/modules/database/db.go b/internal/queries/db.go similarity index 97% rename from modules/database/db.go rename to internal/queries/db.go index dacb52e..1cbab90 100644 --- a/modules/database/db.go +++ b/internal/queries/db.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.27.0 -package database +package queries import ( "context" diff --git a/modules/database/models.go b/internal/queries/models.go similarity index 97% rename from modules/database/models.go rename to internal/queries/models.go index adaf94d..22d71bd 100644 --- a/modules/database/models.go +++ b/internal/queries/models.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.27.0 -package database +package queries import ( "database/sql" diff --git a/modules/database/sessions.sql b/internal/queries/sessions.sql similarity index 100% rename from modules/database/sessions.sql rename to internal/queries/sessions.sql diff --git a/modules/database/sessions.sql.go b/internal/queries/sessions.sql.go similarity index 99% rename from modules/database/sessions.sql.go rename to internal/queries/sessions.sql.go index 034a4b5..4db8d36 100644 --- a/modules/database/sessions.sql.go +++ b/internal/queries/sessions.sql.go @@ -3,7 +3,7 @@ // sqlc v1.27.0 // source: sessions.sql -package database +package queries import ( "context" diff --git a/modules/database/users.sql b/internal/queries/users.sql similarity index 100% rename from modules/database/users.sql rename to internal/queries/users.sql diff --git a/modules/database/users.sql.go b/internal/queries/users.sql.go similarity index 99% rename from modules/database/users.sql.go rename to internal/queries/users.sql.go index 070d0c4..0a8a073 100644 --- a/modules/database/users.sql.go +++ b/internal/queries/users.sql.go @@ -3,7 +3,7 @@ // sqlc v1.27.0 // source: users.sql -package database +package queries import ( "context" diff --git a/internal/service/main.go b/internal/service/main.go index 363c592..3e9fe8e 100644 --- a/internal/service/main.go +++ b/internal/service/main.go @@ -7,11 +7,11 @@ import ( "git.tijl.dev/tijl/tijl.dev/internal/assets" "git.tijl.dev/tijl/tijl.dev/internal/config" - "git.tijl.dev/tijl/tijl.dev/internal/db" "git.tijl.dev/tijl/tijl.dev/internal/handlers" "git.tijl.dev/tijl/tijl.dev/internal/i18n" "git.tijl.dev/tijl/tijl.dev/internal/oidc" webinternal "git.tijl.dev/tijl/tijl.dev/internal/web" + "git.tijl.dev/tijl/tijl.dev/modules/db" "git.tijl.dev/tijl/tijl.dev/modules/logger" "git.tijl.dev/tijl/tijl.dev/modules/web" webf "git.tijl.dev/tijl/tijl.dev/web" diff --git a/internal/user/sessions.go b/internal/user/sessions.go index 92f1208..ee781a9 100644 --- a/internal/user/sessions.go +++ b/internal/user/sessions.go @@ -4,14 +4,14 @@ import ( "context" "errors" - "git.tijl.dev/tijl/tijl.dev/internal/db" + "git.tijl.dev/tijl/tijl.dev/internal/queries" "git.tijl.dev/tijl/tijl.dev/internal/utils" - "git.tijl.dev/tijl/tijl.dev/modules/database" + "git.tijl.dev/tijl/tijl.dev/modules/db" "github.com/gofiber/fiber/v2" ) func NewSession(uid string, c *fiber.Ctx) (string, error) { - createSessionParams := database.CreateSessionParams{ + createSessionParams := queries.CreateSessionParams{ Uid: uid, Token: utils.RandString(64), } @@ -25,7 +25,7 @@ func NewSession(uid string, c *fiber.Ctx) (string, error) { Secure: true, }) - _, err = db.Queries.QuickUpdateSession(context.TODO(), database.QuickUpdateSessionParams{ + _, err = db.Queries.QuickUpdateSession(context.TODO(), queries.QuickUpdateSessionParams{ Token: createSessionParams.Token, IpAddress: c.IP(), Agent: string(c.Context().UserAgent()), @@ -41,7 +41,7 @@ func GetSession(c *fiber.Ctx) (string, error) { if c.Cookies("session") == "" { return "", errors.New("no cookie found") } - uid, err := db.Queries.QuickUpdateSession(context.TODO(), database.QuickUpdateSessionParams{ + uid, err := db.Queries.QuickUpdateSession(context.TODO(), queries.QuickUpdateSessionParams{ Token: c.Cookies("session"), IpAddress: c.IP(), Agent: string(c.Context().UserAgent()), diff --git a/internal/user/users.go b/internal/user/users.go index 0dd2e74..d1c14b1 100644 --- a/internal/user/users.go +++ b/internal/user/users.go @@ -3,14 +3,14 @@ package user import ( "context" - "git.tijl.dev/tijl/tijl.dev/internal/db" - "git.tijl.dev/tijl/tijl.dev/modules/database" + "git.tijl.dev/tijl/tijl.dev/internal/queries" + "git.tijl.dev/tijl/tijl.dev/modules/db" ) -func GetUser(uid string) (error, database.User) { +func GetUser(uid string) (error, queries.User) { user, err := db.Queries.GetUser(context.TODO(), uid) if err != nil { - return err, database.User{} + return err, queries.User{} } return nil, user diff --git a/internal/db/db.go b/modules/db/db.go similarity index 91% rename from internal/db/db.go rename to modules/db/db.go index ff002f1..147d62e 100644 --- a/internal/db/db.go +++ b/modules/db/db.go @@ -5,8 +5,8 @@ import ( "errors" "git.tijl.dev/tijl/tijl.dev/internal/config" + "git.tijl.dev/tijl/tijl.dev/internal/queries" "git.tijl.dev/tijl/tijl.dev/migrations" - dbmanager "git.tijl.dev/tijl/tijl.dev/modules/database" log "git.tijl.dev/tijl/tijl.dev/modules/logger" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database/pgx/v5" @@ -15,7 +15,7 @@ import ( ) var DB *sql.DB -var Queries *dbmanager.Queries +var Queries *queries.Queries func Load() { var err error @@ -24,7 +24,7 @@ func Load() { log.Fatal().Err(err).Msg("failed to connect to database") } //defer DB.Close() - Queries = dbmanager.New(DB) + Queries = queries.New(DB) log.Info().Msg("connected to database") /* diff --git a/sqlc.yaml b/sqlc.yaml index c612d69..73bba56 100644 --- a/sqlc.yaml +++ b/sqlc.yaml @@ -1,10 +1,10 @@ version: "2" sql: - engine: "postgresql" - queries: "modules/database/*.sql" + queries: "internal/queries/*.sql" schema: "migrations/*.sql" gen: go: - package: "database" - out: "modules/database/" + package: "queries" + out: "internal/queries/" sql_package: "database/sql"