[scd] Factorize volume4D union from rest

Author: RustedBones

pkg/models/scd_conversions.go

@@ -58,6 +58,24 @@ func Volume4DFromSCDRest(vol4 *restapi.Volume4D, opts Volume4DOpts) (*Volume4D,
 	}, nil
 }
 
+// UnionVolume4DFromSCDRest converts a slice of vol4 SCD v1 REST model to a single bounding Volume4D
+func UnionVolume4DFromSCDRest(vol4s []restapi.Volume4D, opts Volume4DOpts) (*Volume4D, error) {
+	volumes := make([]*Volume4D, len(vol4s))
+	for idx, vol4 := range vol4s {
+		volume, err := Volume4DFromSCDRest(&vol4, opts)
+		if err != nil {
+			return nil, stacktrace.Propagate(err, "Failed to parse volume %d", idx)
+		}
+		volumes[idx] = volume
+	}
+	union, err := UnionVolumes4D(volumes...)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "Failed to union volumes")
+	}
+
+	return union, nil
+}
+
 type Volume3DOpts struct {
 	RequireAltitudeBounds bool
 }

pkg/scd/constraints_handler.go

@@ -362,7 +362,6 @@ func (a *Server) PutConstraintReference(ctx context.Context, manager string, ent
 
 type validConstraintParams struct {
 	id         dssmodels.ID
-	extents    []*dssmodels.Volume4D
 	uExtent    *dssmodels.Volume4D
 	cells      s2.CellUnion
 	ussBaseURL string
@@ -414,20 +413,11 @@ func validateAndReturnConstraintUpsertParams(
 		}
 	}
 
-	// TODO: factor out logic below into common multi-vol4d parser and reuse with PutOperationReference
-	valid.extents = make([]*dssmodels.Volume4D, len(params.Extents))
-	for idx, extent := range params.Extents {
-		// Start and end times are required for each volume
-		opts := dssmodels.Volume4DOpts{RequireTimeBounds: true}
-		cExtent, err := dssmodels.Volume4DFromSCDRest(&extent, opts)
-		if err != nil {
-			return nil, stacktrace.Propagate(err, "Failed to parse extent %d", idx)
-		}
-		valid.extents[idx] = cExtent
-	}
-	valid.uExtent, err = dssmodels.UnionVolumes4D(valid.extents...)
+	// Start and end times are required for each volume
+	opts := dssmodels.Volume4DOpts{RequireTimeBounds: true}
+	valid.uExtent, err = dssmodels.UnionVolume4DFromSCDRest(params.Extents, opts)
 	if err != nil {
-		return nil, stacktrace.Propagate(err, "Failed to union extents")
+		return nil, stacktrace.Propagate(err, "Invalid extents")
 	}
 
 	if now.After(*valid.uExtent.EndTime) {

pkg/scd/operational_intents_handler.go

@@ -393,7 +393,6 @@ type validOIRParams struct {
 	ovn                  scdmodels.OVN
 	newOVN               scdmodels.OVN
 	state                scdmodels.OperationalIntentState
-	extents              []*dssmodels.Volume4D
 	uExtent              *dssmodels.Volume4D
 	cells                s2.CellUnion
 	subscriptionID       dssmodels.ID
@@ -503,20 +502,12 @@ func validateAndReturnOIRUpsertParams(
 		return nil, stacktrace.NewError("Invalid OperationalIntent state: %s", params.State)
 	}
 
-	valid.extents = make([]*dssmodels.Volume4D, len(params.Extents))
-	for idx, extent := range params.Extents {
-		// Start and end times, as well as lower and upper altitudes, are required for each volume
-		opts := dssmodels.Volume4DOpts{RequireAltitudeBounds: true, RequireTimeBounds: true}
-		cExtent, err := dssmodels.Volume4DFromSCDRest(&extent, opts)
-		if err != nil {
-			return nil, stacktrace.Propagate(err, "Failed to parse extent %d", idx)
-		}
-		valid.extents[idx] = cExtent
-	}
+	// Start and end times, as well as lower and upper altitudes, are required for each volume
+	opts := dssmodels.Volume4DOpts{RequireAltitudeBounds: true, RequireTimeBounds: true}
 
-	valid.uExtent, err = dssmodels.UnionVolumes4D(valid.extents...)
+	valid.uExtent, err = dssmodels.UnionVolume4DFromSCDRest(params.Extents, opts)
 	if err != nil {
-		return nil, stacktrace.Propagate(err, "Failed to union extents")
+		return nil, stacktrace.Propagate(err, "Invalid extents")
 	}
 
 	if now.After(*valid.uExtent.EndTime) {