init

cmd/history-api/main.go

@@ -2,18 +2,16 @@ package main
 
 import (
 	"context"
-	// _ "history-api/docs"
-	"history-api/internal/gen/sqlc"
+	"fmt"
+	_ "history-api/docs"
 	"history-api/pkg/cache"
 	"history-api/pkg/config"
-	_ "history-api/pkg/log"
-
-	"fmt"
 	"history-api/pkg/database"
+	_ "history-api/pkg/log"
+	"history-api/pkg/mbtiles"
 	"os/signal"
 	"syscall"
 	"time"
-
 	"github.com/rs/zerolog/log"
 )
 
@@ -46,15 +44,21 @@ func StartServer() {
 		log.Error().Msg(err.Error())
 		panic(err)
 	}
-	pool, err := database.Connect()
-		if err != nil {
+	poolPg, err := database.NewPostgresqlDB()
+	if err != nil {
 		log.Error().Msg(err.Error())
 		panic(err)
 	}
-	defer pool.Close()
-	queries := sqlc.New(pool)
+	defer poolPg.Close()
 
-	err = cache.Connect()
+	sqlTile, err := mbtiles.NewMBTilesDB("data/map.mbtiles")
+	if err != nil {
+		log.Error().Msg(err.Error())
+		panic(err)
+	}
+	defer sqlTile.Close()
+
+	redisClient, err := cache.NewRedisClient()
 	if err != nil {
 		log.Error().Msg(err.Error())
 		panic(err)
@@ -71,7 +75,7 @@ func StartServer() {
 	}
 
 	serverHttp := NewHttpServer()
-	serverHttp.RegisterFiberRoutes()
+	serverHttp.SetupServer(poolPg, sqlTile, redisClient)
 	Singleton = serverHttp
 
 	done := make(chan bool, 1)
@@ -90,15 +94,25 @@ func StartServer() {
 	log.Info().Msg("Graceful shutdown complete.")
 }
 
-// @title Firefly Manager API
-// @version 1.0
-// @description API to update Firefly Manager data
-// @host localhost:3344
-// @BasePath /
+// @title           History API
+// @version         1.0
+// @description     This is a sample server for History API.
+// @termsOfService  http://swagger.io/terms/
+
+// @contact.name   API Support
+// @contact.url    http://www.swagger.io/support
+// @contact.email  support@swagger.io
+
+// @license.name  Apache 2.0
+// @license.url   http://www.apache.org/licenses/LICENSE-2.0.html
+
+// @host      localhost:3344
+// @BasePath  /
 
 // @securityDefinitions.apikey BearerAuth
 // @in header
 // @name Authorization
+// @description Type "Bearer " followed by a space and JWT token.
 func main() {
 	StartServer()
 }

cmd/history-api/server.go

@@ -1,13 +1,22 @@
 package main
 
 import (
-	// "history-api/internal/routes"
-	// "history-api/internal/services"
+	"database/sql"
+	_ "embed"
+	"history-api/docs"
+	"history-api/internal/controllers"
+	"history-api/internal/gen/sqlc"
+	"history-api/internal/repositories"
+	"history-api/internal/routes"
+	"history-api/internal/services"
+	"history-api/pkg/cache"
+	"os"
 
 	swagger "github.com/gofiber/contrib/v3/swaggerui"
+	middleware "github.com/gofiber/contrib/v3/zerolog"
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/middleware/cors"
-	"github.com/gofiber/fiber/v3/middleware/logger"
+	"github.com/rs/zerolog"
 )
 
 var (
@@ -27,17 +36,21 @@ func NewHttpServer() *FiberServer {
 	}
 	cfg := swagger.Config{
 		BasePath: "/",
-		FilePath: "./docs/swagger.json",
+		FileContent: docs.SwaggerJSON,
 		Path:     "swagger",
 		Title:    "Swagger API Docs",
 	}
 
 	server.App.Use(swagger.New(cfg))
-	server.App.Use(logger.New())
+
+	logger := zerolog.New(os.Stderr).With().Timestamp().Logger()
+	server.App.Use(middleware.New(middleware.Config{
+		Logger: &logger,
+	}))
 	return server
 }
 
-func (s *FiberServer) RegisterFiberRoutes() {
+func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.Cache) {
 	// Apply CORS middleware
 	s.App.Use(cors.New(cors.Config{
 		AllowOrigins:     []string{"*"},
@@ -47,9 +60,21 @@ func (s *FiberServer) RegisterFiberRoutes() {
 		MaxAge:           300,
 	}))
 
-	// routes.UserRoutes(s.App)
-	// routes.AuthRoutes(s.App)
-	// routes.MediaRoute(s.App)
-	// routes.NotFoundRoute(s.App)
+	// repo setup
+	userRepo := repositories.NewUserRepository(sqlPg, redis)
+	roleRepo := repositories.NewRoleRepository(sqlPg, redis)
+	tileRepo := repositories.NewTileRepository(sqlTile, redis)
 
+	// service setup
+	authService := services.NewAuthService(userRepo, roleRepo)
+	tileService := services.NewTileService(tileRepo)
+
+	// controller setup
+	authController := controllers.NewAuthController(authService)
+	tileController := controllers.NewTileController(tileService)
+
+	// route setup
+	routes.AuthRoutes(s.App, authController)
+	routes.TileRoutes(s.App, tileController)
+	routes.NotFoundRoute(s.App)
 }