prevent requests to seatmaps from the past

explore-flights · Nov 12, 2024 · a2fa325 · a2fa325
1 parent 0e66b03
commit a2fa325
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/go/api/data/handler.go b/go/api/data/handler.go
@@ -26,6 +26,8 @@ import (
 	"time"
 )
 
+var ErrSeatMapFreshFetchRequired = errors.New("fresh fetch required but not allowed")
+
 var metroAreaMapping = map[string][2]string{
 	// region Asia
 	"PEK": {"BJS", "Beijing, China"},
@@ -433,7 +435,7 @@ func (h *Handler) Airlines(ctx context.Context, prefix string) ([]common.Airline
 	}), nil
 }
 
-func (h *Handler) SeatMap(ctx context.Context, fn common.FlightNumber, departureAirport, arrivalAirport string, departureDate xtime.LocalDate, cabinClass lufthansa.RequestCabinClass, aircraftType, aircraftConfigurationVersion string) (*lufthansa.SeatAvailability, error) {
+func (h *Handler) SeatMap(ctx context.Context, fn common.FlightNumber, departureAirport, arrivalAirport string, departureDate xtime.LocalDate, cabinClass lufthansa.RequestCabinClass, aircraftType, aircraftConfigurationVersion string, allowFetchFresh bool) (*lufthansa.SeatAvailability, error) {
 	s3Key := h.seatMapS3Key(fn.Airline, aircraftType, aircraftConfigurationVersion, cabinClass)
 	sm, found, err := h.loadSeatMapFromS3(ctx, s3Key)
 	if err != nil {
@@ -457,6 +459,10 @@ func (h *Handler) SeatMap(ctx context.Context, fn common.FlightNumber, departure
 		return sm, nil
 	}
 
+	if !allowFetchFresh {
+		return nil, ErrSeatMapFreshFetchRequired
+	}
+
 	sm, err = h.loadSeatMapFromLH(ctx, fn, departureAirport, arrivalAirport, departureDate, cabinClass)
 	if err != nil {
 		return nil, err

diff --git a/go/api/web/data.go b/go/api/web/data.go
@@ -85,6 +85,7 @@ func NewSeatMapEndpoint(dh *data.Handler) echo.HandlerFunc {
 			return echo.NewHTTPError(http.StatusNotFound)
 		}
 
+		allowFetchFresh := fsd.DepartureTime(departureDate).After(time.Now().Add(-time.Hour * 3))
 		cabinClasses := []lufthansa.RequestCabinClass{
 			lufthansa.RequestCabinClassEco,
 			lufthansa.RequestCabinClassPremiumEco,
@@ -103,10 +104,15 @@ func NewSeatMapEndpoint(dh *data.Handler) echo.HandlerFunc {
 				cabinClass,
 				aircraftType,
 				aircraftConfigurationVersion,
+				allowFetchFresh,
 			)
 
 			if err != nil {
-				return echo.NewHTTPError(http.StatusInternalServerError)
+				if errors.Is(err, data.ErrSeatMapFreshFetchRequired) {
+					return echo.NewHTTPError(http.StatusBadRequest, "Seatmaps can only be requested until 3 hours prior to departure")
+				} else {
+					return echo.NewHTTPError(http.StatusInternalServerError)
+				}
 			}
 
 			if sm != nil {