update data flightnumber endpoint to use flights data

go/api/data/handler.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/csv"
 	"errors"
-	"fmt"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/explore-flights/monorepo/go/common"
@@ -257,16 +256,27 @@ func (h *Handler) Aircraft(ctx context.Context) ([]Aircraft, error) {
 }
 
 func (h *Handler) FlightNumber(ctx context.Context, fn, airport string, d common.LocalDate) (*common.Flight, error) {
-	return loadJson[*common.Flight](
+	flights, err := loadJson[[]*common.Flight](
 		ctx,
 		h,
-		fmt.Sprintf(
-			"processed/flight_numbers/%s/%s/%s.json",
-			fn,
-			airport,
-			d.Time(nil).Format("2006/01/02"),
-		),
+		"processed/flights/"+d.Time(nil).Format("2006/01/02")+".json",
 	)
+
+	if err != nil {
+		if adapt.IsS3NotFound(err) {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+
+	for _, f := range flights {
+		if f.Number().String() == fn && f.DepartureAirport == airport {
+			return f, nil
+		}
+	}
+
+	return nil, nil
 }
 
 func (h *Handler) loadCsv(ctx context.Context, name string) (*csvReader, error) {

go/api/web/data.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"github.com/explore-flights/monorepo/go/api/data"
 	"github.com/explore-flights/monorepo/go/common"
-	"github.com/explore-flights/monorepo/go/common/adapt"
 	"github.com/labstack/echo/v4"
 	"net/http"
 )
@@ -59,10 +58,6 @@ func NewFlightNumberHandler(dh *data.Handler) echo.HandlerFunc {
 
 		flight, err := dh.FlightNumber(c.Request().Context(), fn, airport, d)
 		if err != nil {
-			if adapt.IsS3NotFound(err) {
-				return echo.NewHTTPError(http.StatusNotFound)
-			}
-
 			noCache(c)
 
 			if errors.Is(err, context.DeadlineExceeded) {
@@ -72,6 +67,10 @@ func NewFlightNumberHandler(dh *data.Handler) echo.HandlerFunc {
 			return echo.NewHTTPError(http.StatusInternalServerError)
 		}
 
+		if flight == nil {
+			return echo.NewHTTPError(http.StatusNotFound)
+		}
+
 		return c.JSON(http.StatusOK, flight)
 	}
 }