UPDATE: Add raster tiles
All checks were successful
Build and Release / release (push) Successful in 1m30s
All checks were successful
Build and Release / release (push) Successful in 1m30s
This commit is contained in:
@@ -67,6 +67,14 @@ func StartServer() {
|
|||||||
}
|
}
|
||||||
defer sqlTile.Close()
|
defer sqlTile.Close()
|
||||||
|
|
||||||
|
|
||||||
|
sqlRasterTile, err := mbtiles.NewMBTilesDB("data/raster.mbtiles")
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Msg(err.Error())
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
defer sqlRasterTile.Close()
|
||||||
|
|
||||||
redisClient, err := cache.NewRedisClient()
|
redisClient, err := cache.NewRedisClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Msg(err.Error())
|
log.Error().Msg(err.Error())
|
||||||
@@ -96,7 +104,7 @@ func StartServer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
serverHttp := NewHttpServer()
|
serverHttp := NewHttpServer()
|
||||||
serverHttp.SetupServer(poolPg, sqlTile, redisClient, storageClient, googleOAuthConfig)
|
serverHttp.SetupServer(poolPg, sqlTile, sqlRasterTile, redisClient, storageClient, googleOAuthConfig)
|
||||||
Singleton = serverHttp
|
Singleton = serverHttp
|
||||||
|
|
||||||
done := make(chan bool, 1)
|
done := make(chan bool, 1)
|
||||||
|
|||||||
@@ -56,7 +56,14 @@ func NewHttpServer() *FiberServer {
|
|||||||
return server
|
return server
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.Cache, sclient storage.Storage, oauth *oauth2.Config) {
|
func (s *FiberServer) SetupServer(
|
||||||
|
sqlPg sqlc.DBTX,
|
||||||
|
sqlTile *sql.DB,
|
||||||
|
sqlRasterTile *sql.DB,
|
||||||
|
redis cache.Cache,
|
||||||
|
sclient storage.Storage,
|
||||||
|
oauth *oauth2.Config,
|
||||||
|
) {
|
||||||
// Apply CORS middleware
|
// Apply CORS middleware
|
||||||
s.App.Use(cors.New(cors.Config{
|
s.App.Use(cors.New(cors.Config{
|
||||||
AllowOrigins: []string{
|
AllowOrigins: []string{
|
||||||
@@ -75,6 +82,7 @@ func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.
|
|||||||
userRepo := repositories.NewUserRepository(sqlPg, redis)
|
userRepo := repositories.NewUserRepository(sqlPg, redis)
|
||||||
roleRepo := repositories.NewRoleRepository(sqlPg, redis)
|
roleRepo := repositories.NewRoleRepository(sqlPg, redis)
|
||||||
tileRepo := repositories.NewTileRepository(sqlTile, redis)
|
tileRepo := repositories.NewTileRepository(sqlTile, redis)
|
||||||
|
rasterTileRepo := repositories.NewRasterTileRepository(sqlRasterTile, redis)
|
||||||
tokenRepo := repositories.NewTokenRepository(redis)
|
tokenRepo := repositories.NewTokenRepository(redis)
|
||||||
mediaRepo := repositories.NewMediaRepository(sqlPg, redis)
|
mediaRepo := repositories.NewMediaRepository(sqlPg, redis)
|
||||||
verificationRepo := repositories.NewVerificationRepository(sqlPg, redis)
|
verificationRepo := repositories.NewVerificationRepository(sqlPg, redis)
|
||||||
@@ -84,6 +92,7 @@ func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.
|
|||||||
userService := services.NewUserService(userRepo, roleRepo, redis)
|
userService := services.NewUserService(userRepo, roleRepo, redis)
|
||||||
roleService := services.NewRoleService(roleRepo)
|
roleService := services.NewRoleService(roleRepo)
|
||||||
tileService := services.NewTileService(tileRepo)
|
tileService := services.NewTileService(tileRepo)
|
||||||
|
rasterTileService := services.NewRasterTileService(rasterTileRepo)
|
||||||
mediaService := services.NewMediaService(mediaRepo, tokenRepo, sclient, redis)
|
mediaService := services.NewMediaService(mediaRepo, tokenRepo, sclient, redis)
|
||||||
verificationService := services.NewVerificationService(verificationRepo, mediaRepo, userRepo, roleRepo, redis)
|
verificationService := services.NewVerificationService(verificationRepo, mediaRepo, userRepo, roleRepo, redis)
|
||||||
|
|
||||||
@@ -91,6 +100,7 @@ func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.
|
|||||||
authController := controllers.NewAuthController(authService, oauth)
|
authController := controllers.NewAuthController(authService, oauth)
|
||||||
userController := controllers.NewUserController(userService, mediaService, verificationService)
|
userController := controllers.NewUserController(userService, mediaService, verificationService)
|
||||||
tileController := controllers.NewTileController(tileService)
|
tileController := controllers.NewTileController(tileService)
|
||||||
|
rasterTileController := controllers.NewRasterTileController(rasterTileService)
|
||||||
roleController := controllers.NewRoleController(roleService)
|
roleController := controllers.NewRoleController(roleService)
|
||||||
mediaController := controllers.NewMediaController(mediaService)
|
mediaController := controllers.NewMediaController(mediaService)
|
||||||
verificationController := controllers.NewVerificationController(verificationService)
|
verificationController := controllers.NewVerificationController(verificationService)
|
||||||
@@ -102,5 +112,6 @@ func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.
|
|||||||
routes.RoleRoutes(s.App, roleController, userRepo)
|
routes.RoleRoutes(s.App, roleController, userRepo)
|
||||||
routes.VerificationRoutes(s.App, verificationController, userRepo)
|
routes.VerificationRoutes(s.App, verificationController, userRepo)
|
||||||
routes.TileRoutes(s.App, tileController)
|
routes.TileRoutes(s.App, tileController)
|
||||||
|
routes.RasterTileRoutes(s.App, rasterTileController)
|
||||||
routes.NotFoundRoute(s.App)
|
routes.NotFoundRoute(s.App)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user