From 1516efa927721c2cbb5a38bb983e70c4e85cd9ab Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Mon, 27 Jul 2026 12:49:37 +0530
Subject: [PATCH] fix: redeploy project should delete old stopped deployments

---
 admin/projects.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/admin/projects.go b/admin/projects.go
index cc1c0eecbf7f..ea4aa9479657 100644
--- a/admin/projects.go
+++ b/admin/projects.go
@@ -401,6 +401,20 @@ func (s *Service) RedeployProject(ctx context.Context, proj *database.Project, p
 			s.Logger.Error("trigger redeploy: could not teardown old deployment", zap.String("deployment_id", prevDepl.ID), zap.Error(err), observability.ZapCtx(ctx))
 		}
 	}
+	// also delete stopped deployments, if any
+	stoppedDepls, err := s.DB.FindDeploymentsForProject(ctx, proj.ID, environment, branch)
+	if err != nil {
+		s.Logger.Error("trigger redeploy: could not find stopped deployments", zap.String("project_id", proj.ID), zap.Error(err), observability.ZapCtx(ctx))
+		return proj, nil
+	}
+	for _, d := range stoppedDepls {
+		if d.Status == database.DeploymentStatusStopped {
+			err := s.TeardownDeployment(ctx, d)
+			if err != nil {
+				s.Logger.Error("trigger redeploy: could not teardown old stopped deployment", zap.String("deployment_id", d.ID), zap.Error(err), observability.ZapCtx(ctx))
+			}
+		}
+	}
 
 	return proj, nil
 }