diff --git a/backend/cmd/server/main.go b/backend/cmd/server/main.go index 9302d290..d73e7e9c 100644 --- a/backend/cmd/server/main.go +++ b/backend/cmd/server/main.go @@ -21,6 +21,7 @@ import ( "high-loud-apps-labs/internal/service" "high-loud-apps-labs/internal/storage/postgres" redisstore "high-loud-apps-labs/internal/storage/redis" + s3store "high-loud-apps-labs/internal/storage/s3" ) func main() { @@ -64,8 +65,33 @@ func main() { chatSvc := service.NewChatService(store.Chats(), store.Users()) messageSvc := service.NewMessageService(store.Messages(), store.Chats(), cfg.IdempotencyTTL) + if !cfg.S3Configured() { + log.Fatal("S3 не настроен: задайте S3_ENDPOINT, S3_BUCKET, S3_ACCESS_KEY_ID_FILE/S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY_FILE/S3_SECRET_ACCESS_KEY") + } + + objectStorage, err := s3store.New(ctx, s3store.Config{ + Endpoint: cfg.S3Endpoint, + Bucket: cfg.S3Bucket, + AccessKey: cfg.S3AccessKey, + SecretKey: cfg.S3SecretKey, + UseSSL: cfg.S3UseSSL, + Region: cfg.S3Region, + }) + if err != nil { + log.Fatalf("s3: %v", err) + } + + attachmentSvc := service.NewAttachmentService( + store.Attachments(), + store.Chats(), + objectStorage, + cfg.MaxUploadBytes, + cfg.MaxImagePixels, + ) + healthChecks := []handler.HealthCheck{ func(ctx context.Context) error { return pool.Ping(ctx) }, + func(ctx context.Context) error { return objectStorage.Ping(ctx) }, } if cachePing != nil { healthChecks = append(healthChecks, cachePing) @@ -76,11 +102,12 @@ func main() { router := httpapi.NewRouter( httpapi.Handlers{ - Health: handler.NewHealthHandler(healthChecks...).WithReadyFlag(&ready), - User: handler.NewUserHandler(userSvc), - Chat: handler.NewChatHandler(chatSvc), - Message: handler.NewMessageHandler(messageSvc), - Auth: handler.NewAuthHandler(sessionSvc), + Health: handler.NewHealthHandler(healthChecks...).WithReadyFlag(&ready), + User: handler.NewUserHandler(userSvc), + Chat: handler.NewChatHandler(chatSvc), + Message: handler.NewMessageHandler(messageSvc), + Auth: handler.NewAuthHandler(sessionSvc), + Attachment: handler.NewAttachmentHandler(attachmentSvc), }, middleware.BearerAuth(sessionSvc), ) @@ -114,9 +141,6 @@ func main() { log.Println("Сервер остановлен") } -// runMigrate — одноразовый прогон goose. Запускается как `/server migrate`. -// Использует те же DATABASE_URL_FILE / DATABASE_URL, что и сервер. -// Отдельный процесс, поэтому не конкурирует с репликами за goose lock. func runMigrate() error { cfg, err := config.Load() if err != nil {