Skip to content

Commit 5153e1e

Browse files
authored
fix not delete deploy after deleted project (#4511)
Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
1 parent b653634 commit 5153e1e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pkg/microservice/aslan/core/common/repository/mongodb/deploy.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@ func (c *DeployColl) Create(deploy *models.Deploy) error {
179179
deploy.UpdateTime = time.Now().Unix()
180180

181181
//double check
182-
deployModel, err := c.Find(&DeployFindOption{Name: deploy.Name})
182+
deployModel, err := c.Find(&DeployFindOption{
183+
Name: deploy.Name,
184+
ProjectName: deploy.ProjectName,
185+
})
183186
if err == nil {
184187
return fmt.Errorf("%s%s", deployModel.ProjectName, "项目中有相同的部署名称存在,请检查!")
185188
}

pkg/microservice/aslan/core/project/service/product.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,7 @@ func DeleteProductTemplate(userName, productName, requestID string, isDelete boo
752752
//删除workflow和历史task
753753
go func() {
754754
_ = commonrepo.NewBuildColl().Delete("", productName)
755+
_ = commonrepo.NewDeployColl().Delete(productName, "")
755756
_ = commonrepo.NewServiceColl().Delete("", "", productName, "", 0)
756757
_ = commonrepo.NewProductionServiceColl().DeleteByProject(productName)
757758
_ = commonservice.DeleteDeliveryInfos(productName, log)

0 commit comments

Comments
 (0)