updates

.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"]

internal/middleware/language.go

@@ -1 +0,0 @@
-package middleware

internal/middleware/session.go

@@ -1 +0,0 @@
-package middleware

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,

internal/queries/db.go

@@ -2,7 +2,7 @@
 // versions:
 //   sqlc v1.27.0
 
-package database
+package queries
 
 import (
 	"context"

internal/queries/models.go

@@ -2,7 +2,7 @@
 // versions:
 //   sqlc v1.27.0
 
-package database
+package queries
 
 import (
 	"database/sql"

internal/queries/sessions.sql.go

@@ -3,7 +3,7 @@
 //   sqlc v1.27.0
 // source: sessions.sql
 
-package database
+package queries
 
 import (
 	"context"

internal/queries/users.sql.go

@@ -3,7 +3,7 @@
 //   sqlc v1.27.0
 // source: users.sql
 
-package database
+package queries
 
 import (
 	"context"

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"

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()),

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

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")
 
 	/*

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"