umstellung auf Service und Repository Verwendung - WIP

kontor-gin/cmd/kontor-cli/main.go

@@ -0,0 +1,8 @@
+package main
+
+import "log/slog"
+
+func main() {
+	slog.Info("Kontor started")
+	slog.Info("Kontor finished")
+}

kontor-gin/cmd/kontor-gin/main.go

@@ -3,10 +3,10 @@ package main
 import (
 	// "kontor-api-gin/pkg/handler"
 
-	"kontor-api-gin/pkg/globals"
+	"kontor-api-gin/internal/globals"
+	"kontor-api-gin/internal/schema"
 	"kontor-api-gin/pkg/middleware"
 	"kontor-api-gin/pkg/routes"
-	"kontor-api-gin/pkg/schema"
 	"log"
 	"log/slog"
 	"os"
@@ -27,6 +27,8 @@ func main() {
 	viper.SetDefault("db.user", "kontor")
 	viper.SetDefault("db.password", "kontor")
 	viper.SetDefault("port", 8550)
+	viper.SetDefault("token_hour_lifespan", 1)
+	viper.SetDefault("api_secret", "secret")
 
 	if err := globals.InitConfig(); err != nil {
 		slog.Info("Failed to initialize config", "error", err)
@@ -66,6 +68,7 @@ func main() {
 	// Setup api routes
 	api := routes.SetupApiRoutes(router)
 	api.Use(middleware.CorsMiddleware)
+	api.Use(middleware.JwtRequired)
 	routes.SetupMediaRoutes(api)
 	routes.SetupComicRoutes(api)
 

kontor-gin/cmd/kontor/main.go

@@ -1,23 +1,23 @@
 package main
 
 import (
-	// "kontor-api-gin/pkg/handler"
-
-	"html/template"
-	"kontor-api-gin/assets"
-	"kontor-api-gin/pkg/globals"
-	"kontor-api-gin/pkg/middleware"
-	"kontor-api-gin/pkg/routes"
-	"kontor-api-gin/pkg/schema"
-	"kontor-api-gin/templates"
+	"context"
+	"fmt"
+	"kontor-api-gin/internal/config"
+	"kontor-api-gin/internal/globals"
+	"kontor-api-gin/internal/handlers"
+	"kontor-api-gin/internal/repository"
+	"kontor-api-gin/internal/router"
+	"kontor-api-gin/internal/service"
 	"log"
 	"log/slog"
 	"net/http"
+	"os"
+	"os/signal"
 	"strconv"
+	"syscall"
+	"time"
 
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/cookie"
-	gin_slog "github.com/gin-contrib/slog"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/viper"
 )
@@ -25,70 +25,67 @@ import (
 func main() {
 	slog.Info("Kontor started")
 
-	viper.SetDefault("db.host", "localhost")
-	viper.SetDefault("db.port", 5432)
-	viper.SetDefault("db.name", "kontor")
-	viper.SetDefault("db.user", "kontor")
-	viper.SetDefault("db.password", "kontor")
-	viper.SetDefault("port", 8550)
-	viper.SetDefault("gin.mode", "release")
-
 	if err := globals.InitConfig(); err != nil {
 		log.Fatalf("Failed to initialize config: %v", err)
 	}
 
+	dsn := fmt.Sprintf(
+		"host=%s user=%s password=%s dbname=%s port=%d sslmode=disable",
+		viper.GetString("db.host"),
+		viper.GetString("db.user"),
+		viper.GetString("db.password"),
+		viper.GetString("db.name"),
+		viper.GetInt("db.port"),
+	)
+
+	db, err := config.NewDB(dsn)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if err := db.AutoMigrate(); err != nil {
+		log.Fatal(err)
+	}
+
+	comicRepo := repository.NewComicRepository(db)
+	profileRepo := repository.NewProfileRepository(db)
+	comicService := service.NewComicService(comicRepo)
+	authService := service.NewAuthService(profileRepo, []byte(viper.GetString("api_secret")))
+
 	// Set Gin mode based on environment
 	// Production mode disables debug output
 	if viper.GetString("gin.mode") == "release" {
 		gin.SetMode(gin.ReleaseMode)
 	}
 
-	// Connect to database
-	schema.Connect()
+	r := router.New(
+		&handlers.ComicHandler{Service: comicService},
+		&handlers.AuthHandler{Service: authService},
+		[]byte(viper.GetString("api_secret")),
+	)
+	// router.Use(sessions.Sessions("session", cookie.NewStore(globals.Secret)))
 
-	// Run migrations
-	schema.RunMigrations()
-
-	// Create Gin router with default middleware
-	// Default includes Logger and Recovery middleware
-	// router := gin.Default()
-	// Create a new router without default mmiddleware
-	router := gin.New()
-	// Add recovery middleware
-	router.Use(gin.Recovery())
-	router.Use(gin_slog.SetLogger(
-		gin_slog.WithSkipPath([]string{"/health", "/public/style/main.css"}),
-		gin_slog.WithDefaultLevel(slog.LevelInfo),
-		gin_slog.WithClientErrorLevel(slog.LevelInfo),
-		gin_slog.WithServerErrorLevel(slog.LevelInfo),
-	))
-
-	templ := template.Must(template.New("").ParseFS(templates.TemplateFiles, "layouts/*.html", "pages/*.html"))
-	router.SetHTMLTemplate(templ)
-
-	router.StaticFS("/public", http.FS(assets.StaticFiles))
-
-	router.Use(sessions.Sessions("session", cookie.NewStore(globals.Secret)))
-
-	// Setup api routes
-	api := routes.SetupApiRoutes(router)
-	api.Use(middleware.CorsMiddleware)
-	routes.SetupMediaRoutes(api)
-	routes.SetupComicRoutes(api)
-
-	// Setup Webapp routes
-	routes.AuthRoutes(router)
-	routes.ComicRoutes(router)
-	routes.MediaRoutes(router)
-	routes.PublicRoutes(router)
-
-	// Start server
-	port := viper.GetInt("port")
-
-	slog.Info("Server starting", "port", port)
-	if err := router.Run(":" + strconv.Itoa(port)); err != nil {
-		log.Fatal("Failed to start server:", err)
+	srv := &http.Server{
+		Addr:              ":" + strconv.Itoa(viper.GetInt("port")),
+		Handler:           r,
+		ReadHeaderTimeout: 5 * time.Second,
+		WriteTimeout:      30 * time.Second,
+		IdleTimeout:       120 * time.Second,
 	}
 
+	go func() {
+		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			log.Fatal(err)
+		}
+	}()
+	slog.Info("server up", "address", srv.Addr)
+
+	quit := make(chan os.Signal, 1)
+	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+	<-quit
+
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
+	_ = srv.Shutdown(ctx)
+	slog.Info("server stopped")
 	slog.Info("Kontor finished")
 }