fix: update DeletionEvent to retrieve MCPUsage before updating deleti… (#2)

* fix: update DeletionEvent to retrieve MCPUsage before updating deletion timestamp

* Update internal/usage/tracking.go

Co-authored-by: Copilot <[email protected]>

* fix: streamline DeletionEvent to update MCPDeletedAt with retry logic

---------

Co-authored-by: Copilot <[email protected]>

Author: n3rdc4ptn

VERSION

@@ -1 +1 @@
-v0.0.13-dev
+v0.0.14

internal/usage/tracking.go

@@ -168,21 +168,27 @@ func (u *UsageTracker) DeletionEvent(ctx context.Context, project string, worksp
 		return fmt.Errorf("error getting object key: %w", err)
 	}
 
-	var mcpUsage = v1.MCPUsage{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      objectKey.Name,
-			Namespace: objectKey.Namespace,
-		},
-		Spec: v1.MCPUsageSpec{
-			MCPDeletedAt: metav1.NewTime(time.Now().UTC()),
-		},
-	}
-	err = u.client.Patch(ctx, &mcpUsage, client.Merge)
-	if k8serrors.IsNotFound(err) {
+	deletedAt := metav1.NewTime(time.Now().UTC())
+	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		var mcpUsage v1.MCPUsage
+		// Re-fetch the latest version to avoid update conflicts
+		err := u.client.Get(ctx, objectKey, &mcpUsage)
+		if err != nil {
+			return fmt.Errorf("error getting MCPUsage resource during retry: %w", err)
+		}
+		mcpUsage.Spec.MCPDeletedAt = deletedAt
+		err = u.client.Update(ctx, &mcpUsage)
+		if err != nil {
+			if k8serrors.IsConflict(err) {
+				return err // trigger retry
+			}
+			return fmt.Errorf("error when setting deletion timestamp on MCPUsage element: %w", err)
+		}
 		return nil
-	}
+	})
+
 	if err != nil {
-		return fmt.Errorf("error when setting deletion timestamp on MCPUsage element: %w", err)
+		return err
 	}
 
 	return nil