simplify

Author: Mat001

pkg/config/datafileprojectconfig/mappers/holdout.go

@@ -43,63 +43,13 @@ func MapHoldouts(holdouts []datafileEntities.Holdout, audienceMap map[string]ent
 	}
 
 	for _, datafileHoldout := range holdouts {
-		// Map variations similar to experiments
-		variationMap := make(map[string]entities.Variation)
-		variationKeyToIDMap := make(map[string]string)
-
-		for _, variation := range datafileHoldout.Variations {
-			variableMap := make(map[string]entities.VariationVariable)
-			for _, variable := range variation.Variables {
-				variableMap[variable.ID] = entities.VariationVariable{
-					ID:    variable.ID,
-					Value: variable.Value,
-				}
-			}
-
-			v := entities.Variation{
-				ID:             variation.ID,
-				Key:            variation.Key,
-				FeatureEnabled: variation.FeatureEnabled,
-				Variables:      variableMap,
-			}
-			variationMap[variation.ID] = v
-			variationKeyToIDMap[variation.Key] = variation.ID
-		}
-
-		// Map traffic allocation
-		trafficAllocation := []entities.Range{}
-		for _, allocation := range datafileHoldout.TrafficAllocation {
-			trafficAllocation = append(trafficAllocation, entities.Range{
-				EntityID:   allocation.EntityID,
-				EndOfRange: allocation.EndOfRange,
-			})
-		}
-
-		// Build audience condition tree
-		var audienceConditionTree *entities.TreeNode
-		if datafileHoldout.AudienceConditions != nil {
-			audienceConditionTree, _, _ = buildConditionTree(datafileHoldout.AudienceConditions)
-		} else if len(datafileHoldout.AudienceIds) > 0 {
-			// Build from audience IDs similar to experiments
-			audienceConditionTree, _ = buildAudienceConditionTree(datafileHoldout.AudienceIds)
-		}
-
-		// Convert status string to HoldoutStatus type
-		status := entities.HoldoutStatus(datafileHoldout.Status)
-
-		// Create the runtime holdout entity
+		// Create minimal runtime holdout entity - only what's needed for flag dependency
 		holdout := entities.Holdout{
-			ID:                    datafileHoldout.ID,
-			Key:                   datafileHoldout.Key,
-			Status:                status,
-			Variations:            variationMap,
-			VariationKeyToIDMap:   variationKeyToIDMap,
-			TrafficAllocation:     trafficAllocation,
-			AudienceIds:           datafileHoldout.AudienceIds,
-			AudienceConditions:    datafileHoldout.AudienceConditions,
-			AudienceConditionTree: audienceConditionTree,
-			IncludedFlags:         datafileHoldout.IncludedFlags,
-			ExcludedFlags:         datafileHoldout.ExcludedFlags,
+			ID:            datafileHoldout.ID,
+			Key:           datafileHoldout.Key,
+			Status:        entities.HoldoutStatus(datafileHoldout.Status),
+			IncludedFlags: datafileHoldout.IncludedFlags,
+			ExcludedFlags: datafileHoldout.ExcludedFlags,
 		}
 
 		// Add to ID map

pkg/config/datafileprojectconfig/mappers/holdout_test.go

@@ -25,21 +25,12 @@ import (
 )
 
 func TestMapHoldouts(t *testing.T) {
-	// Create test holdouts
+	// Create test holdouts - minimal fields only
 	holdouts := []datafileEntities.Holdout{
 		{
 			ExperimentCore: datafileEntities.ExperimentCore{
 				ID:  "holdout_1",
 				Key: "global_holdout",
-				Variations: []datafileEntities.Variation{
-					{ID: "var1", Key: "control"},
-					{ID: "var2", Key: "treatment"},
-				},
-				TrafficAllocation: []datafileEntities.TrafficAllocation{
-					{EntityID: "var1", EndOfRange: 5000},
-					{EntityID: "var2", EndOfRange: 10000},
-				},
-				AudienceIds: []string{"audience1"},
 			},
 			Status:        datafileEntities.HoldoutStatusRunning,
 			IncludedFlags: []string{}, // Global holdout
@@ -49,12 +40,6 @@ func TestMapHoldouts(t *testing.T) {
 			ExperimentCore: datafileEntities.ExperimentCore{
 				ID:  "holdout_2",
 				Key: "feature_specific_holdout",
-				Variations: []datafileEntities.Variation{
-					{ID: "var3", Key: "variant_a"},
-				},
-				TrafficAllocation: []datafileEntities.TrafficAllocation{
-					{EntityID: "var3", EndOfRange: 10000},
-				},
 			},
 			Status:        datafileEntities.HoldoutStatusRunning,
 			IncludedFlags: []string{"feature_1", "feature_2"},

pkg/entities/experiment.go

@@ -74,18 +74,12 @@ const (
 	HoldoutStatusArchived HoldoutStatus = "Archived"
 )
 
-// Holdout represents a holdout experiment that can be applied to feature flags
-// Holdouts share core bucketing logic with experiments but add flag-specific targeting
+// Holdout represents a holdout that can be applied to feature flags
+// Contains only the minimal information needed to establish flag dependencies
 type Holdout struct {
-	ID                    string
-	Key                   string
-	Status                HoldoutStatus
-	Variations            map[string]Variation // keyed by variation ID
-	VariationKeyToIDMap   map[string]string
-	TrafficAllocation     []Range
-	AudienceIds           []string
-	AudienceConditions    interface{}
-	AudienceConditionTree *TreeNode
-	IncludedFlags         []string // Flag IDs this holdout specifically includes
-	ExcludedFlags         []string // Flag IDs this holdout specifically excludes
+	ID            string
+	Key           string
+	Status        HoldoutStatus
+	IncludedFlags []string // Flag IDs this holdout specifically includes
+	ExcludedFlags []string // Flag IDs this holdout specifically excludes
 }