rewrite

internal/transport/rest/transport.go

@@ -5,43 +5,71 @@ import (
 	"fmt"
 	"net/http"
 
-	"git.intra.yksa.space/gsn/predictor/internal/pkg/log"
-	"git.intra.yksa.space/gsn/predictor/internal/transport/middleware"
-	handler "git.intra.yksa.space/gsn/predictor/internal/transport/rest/handler"
-	api "git.intra.yksa.space/gsn/predictor/pkg/rest"
-	"github.com/rs/cors"
+	"predictor-refactored/internal/transport/middleware"
+	"predictor-refactored/internal/transport/rest/handler"
+	api "predictor-refactored/pkg/rest"
+
+	"go.uber.org/zap"
 )
 
+// Transport wraps the ogen HTTP server.
 type Transport struct {
-	cfg     *Config
 	srv     *api.Server
 	handler *handler.Handler
+	port    int
+	log     *zap.Logger
 }
 
-func New(handler *handler.Handler, cfg *Config) (*Transport, error) {
+// New creates a new REST transport.
+func New(h *handler.Handler, port int, log *zap.Logger) (*Transport, error) {
 	srv, err := api.NewServer(
-		handler,
-		api.WithMiddleware(middleware.Logging()),
+		h,
+		api.WithMiddleware(middleware.Logging(log)),
 	)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("create ogen server: %w", err)
 	}
 
 	return &Transport{
 		srv:     srv,
-		cfg:     cfg,
-		handler: handler,
+		handler: h,
+		port:    port,
+		log:     log,
 	}, nil
 }
 
-func (t *Transport) Run() {
-	log.Ctx(context.Background()).Info("started")
-
+// Run starts the HTTP server. Blocks until the server stops.
+func (t *Transport) Run() error {
 	mux := http.NewServeMux()
 	mux.Handle("/", t.srv)
-	cors.AllowAll().Handler(mux)
 
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", t.cfg.Port), t.srv); err != nil {
-		panic(err)
+	httpSrv := &http.Server{
+		Addr:    fmt.Sprintf(":%d", t.port),
+		Handler: corsMiddleware(mux),
 	}
+
+	t.log.Info("starting HTTP server", zap.Int("port", t.port))
+	return httpSrv.ListenAndServe()
+}
+
+// Shutdown gracefully stops the HTTP server.
+func (t *Transport) Shutdown(ctx context.Context) error {
+	// The ogen server doesn't have a shutdown method;
+	// shutdown is handled by the http.Server in main.go
+	return nil
+}
+
+func corsMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
+		w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
+
+		if r.Method == http.MethodOptions {
+			w.WriteHeader(http.StatusNoContent)
+			return
+		}
+
+		next.ServeHTTP(w, r)
+	})
 }