volume expiration validator

Author: RustedBones

pkg/models/scd_conversions.go

@@ -21,6 +21,15 @@ func WithRequireTimeBounds() Volume4DValidator {
 	}
 }
 
+func WithRequireEndTimeAfter(now time.Time) Volume4DValidator {
+	return func(v *Volume4D) error {
+		if v.EndTime != nil && v.EndTime.Before(now) {
+			return stacktrace.NewError("End time may not be in the past")
+		}
+		return nil
+	}
+}
+
 func WithRequireAltitudeBounds() Volume4DValidator {
 	return func(v *Volume4D) error {
 		if v.SpatialVolume.AltitudeLo == nil {
@@ -81,7 +90,7 @@ func Volume4DFromSCDRest(vol4 *restapi.Volume4D, validators ...Volume4DValidator
 func UnionVolume4DFromSCDRest(vol4s []restapi.Volume4D, validators ...Volume4DValidator) (*Volume4D, error) {
 	volumes := make([]*Volume4D, len(vol4s))
 	for idx, vol4 := range vol4s {
-		volume, err := Volume4DFromSCDRest(&vol4, validators...)
+		volume, err := Volume4DFromSCDRest(&vol4)
 		if err != nil {
 			return nil, stacktrace.Propagate(err, "Failed to parse volume %d", idx)
 		}
@@ -92,6 +101,12 @@ func UnionVolume4DFromSCDRest(vol4s []restapi.Volume4D, validators ...Volume4DVa
 		return nil, stacktrace.Propagate(err, "Failed to union volumes")
 	}
 
+	for _, validator := range validators {
+		if err := validator(union); err != nil {
+			return nil, err
+		}
+	}
+
 	return union, nil
 }
 

pkg/models/scd_conversions_test.go

@@ -33,7 +33,7 @@ func TestVolume4DFromSCDRest(t *testing.T) {
 		},
 		{
 			name:       "Times",
-			validators: []Volume4DValidator{WithRequireTimeBounds()},
+			validators: []Volume4DValidator{WithRequireTimeBounds(), WithRequireEndTimeAfter(end.Add(-time.Minute))},
 			rest:       &restapi.Volume4D{TimeStart: &timeStart, TimeEnd: &timeEnd},
 			want: &Volume4D{
 				SpatialVolume: &Volume3D{},
@@ -56,6 +56,12 @@ func TestVolume4DFromSCDRest(t *testing.T) {
 			rest:    &restapi.Volume4D{TimeStart: &timeEnd, TimeEnd: &timeStart},
 			wantErr: true,
 		},
+		{
+			name:       "TimeEndExpired",
+			validators: []Volume4DValidator{WithRequireEndTimeAfter(end.Add(time.Minute))},
+			rest:       &restapi.Volume4D{TimeStart: &timeStart, TimeEnd: &timeEnd},
+			wantErr:    true,
+		},
 		{
 			name:       "MissingTimeStart",
 			validators: []Volume4DValidator{WithRequireTimeBounds()},

pkg/scd/constraints_handler.go

@@ -414,7 +414,12 @@ func validateAndReturnConstraintUpsertParams(
 	}
 
 	// Start and end times are required for each volume
-	valid.uExtent, err = dssmodels.UnionVolume4DFromSCDRest(params.Extents, dssmodels.WithRequireTimeBounds())
+	// The end time may not be in the past
+	valid.uExtent, err = dssmodels.UnionVolume4DFromSCDRest(
+		params.Extents,
+		dssmodels.WithRequireTimeBounds(),
+		dssmodels.WithRequireEndTimeAfter(now),
+	)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "Invalid extents")
 	}

pkg/scd/operational_intents_handler.go

@@ -503,15 +503,16 @@ func validateAndReturnOIRUpsertParams(
 	}
 
 	// Start and end times, as well as lower and upper altitudes, are required for each volume
-	valid.uExtent, err = dssmodels.UnionVolume4DFromSCDRest(params.Extents, dssmodels.WithRequireTimeBounds(), dssmodels.WithRequireAltitudeBounds())
+	// The end time may not be in the past.
+	valid.uExtent, err = dssmodels.UnionVolume4DFromSCDRest(
+		params.Extents,
+		dssmodels.WithRequireTimeBounds(),
+		dssmodels.WithRequireAltitudeBounds(),
+		dssmodels.WithRequireEndTimeAfter(now),
+	)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "Invalid extents")
 	}
-
-	if now.After(*valid.uExtent.EndTime) {
-		return nil, stacktrace.NewError("OperationalIntents may not end in the past")
-	}
-
 	valid.cells, err = valid.uExtent.CalculateSpatialCovering()
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "Invalid area")