Refactor same thing from the calling side

internal/controllers/reconciliation/controller.go

@@ -75,12 +75,7 @@ func (c *Controller) Reconcile(ctx context.Context, req *reconstitution.Request)
 	}
 
 	// Find the current and (optionally) previous desired states in the cache
-	currentGen := comp.Status.CurrentState.ObservedCompositionGeneration
-	if comp.DeletionTimestamp != nil {
-		// TODO
-		currentGen++
-	}
-	resource, exists := c.resourceClient.Get(ctx, &req.ResourceRef, currentGen)
+	resource, exists := c.resourceClient.Get(ctx, &req.ResourceRef, reconstitution.GetCompositionGenerationAtCurrentState(comp))
 	if !exists {
 		// It's possible for the cache to be empty because a manifest for this resource no longer exists at the requested composition generation.
 		// Dropping the work item is safe since filling the new version will generate a new queue message.

internal/reconstitution/cache.go

@@ -198,3 +198,10 @@ func getCompositionGeneration(comp *apiv1.Composition, syn *apiv1.Synthesis) int
 	}
 	return syn.ObservedCompositionGeneration
 }
+
+func GetCompositionGenerationAtCurrentState(comp *apiv1.Composition) int64 {
+	if comp.Status.CurrentState == nil {
+		return 0
+	}
+	return getCompositionGeneration(comp, comp.Status.CurrentState)
+}