check if an addon that is not a platform exists when the project is deleted (#3419) (#3450)

* check if an addon that is not a platform exists

* add comment

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

Author: erda-bot

go.sum

@@ -479,7 +479,6 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/erda-project/elastic v0.0.1-ex h1:5ajfxQ5S5YjpzFqY9LzL9hiKWCn6q/JDT4n8sNv7+pU=
 github.com/erda-project/elastic v0.0.1-ex/go.mod h1:iAVsas6fcmt9pxtge1+dErMhecv+RLSXlD4rnZRJVW0=
-github.com/erda-project/erda-infra v0.0.0-20211217092649-00fbcca89a94 h1:tWFSZ4YKi/Ob6wgiVa5aV88zK9Z/AWLvqszm5WK/2z0=
 github.com/erda-project/erda-infra v0.0.0-20211217092649-00fbcca89a94/go.mod h1:JEXUFWDC/a97+3AgX/cL4xRlqL9vTDM+wVV3Ee5FXYI=
 github.com/erda-project/erda-infra v0.0.0-20211220060639-a30b7096b5ff h1:Whg+CnwfzC/YTlFmvnmYFBeGec0he2EdB37W7JV7+9E=
 github.com/erda-project/erda-infra v0.0.0-20211220060639-a30b7096b5ff/go.mod h1:JEXUFWDC/a97+3AgX/cL4xRlqL9vTDM+wVV3Ee5FXYI=
@@ -1186,7 +1185,6 @@ github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=

modules/core-services/services/project/project.go

@@ -649,15 +649,17 @@ func (p *Project) Delete(projectID int64) (*model.Project, error) {
 		return nil, errors.Errorf(p.trans.Text(langCodes, "FailedGetProject")+"(%v)", err)
 	}
 
-	// TODO We need to turn this check on after adding the delete portal to the UI
-	// check if addon exists
-	// addOnListResp, err := p.bdl.ListAddonByProjectID(projectID, project.OrgID)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	// if addOnListResp != nil && len(addOnListResp.Data) > 0 {
-	// 	return nil, errors.Errorf("failed to delete project(there exists addons)")
-	// }
+	// Check if an addon that is not a platform exists
+	addOnListResp, err := p.bdl.ListAddonByProjectID(projectID, project.OrgID)
+	if err != nil {
+		return nil, err
+	}
+	if addOnListResp != nil && len(addOnsFilterIn(addOnListResp.Data, func(addOn *apistructs.AddonFetchResponseData) bool {
+		// The platformServiceType is 0 means it can be deleted by the platform
+		return addOn.PlatformServiceType == 0
+	})) > 0 {
+		return nil, errors.Errorf("failed to delete project(there exists addons)")
+	}
 
 	if err = p.db.DeleteProject(projectID); err != nil {
 		return nil, errors.Errorf(p.trans.Text(langCodes, "FailedDeleteProject")+"(%v)", err)
@@ -675,6 +677,15 @@ func (p *Project) Delete(projectID int64) (*model.Project, error) {
 	return &project, nil
 }
 
+func addOnsFilterIn(addOns []apistructs.AddonFetchResponseData, fn func(addOn *apistructs.AddonFetchResponseData) bool) (newAddons []apistructs.AddonFetchResponseData) {
+	for i := range addOns {
+		if fn(&addOns[i]) {
+			newAddons = append(newAddons, addOns[i])
+		}
+	}
+	return
+}
+
 // Get 获取项目
 func (p *Project) Get(ctx context.Context, projectID int64, withQuota bool) (*apistructs.ProjectDTO, error) {
 	project, err := p.db.GetProjectByID(projectID)

modules/core-services/services/project/project_test.go

@@ -396,38 +396,62 @@ func Test_defaultResourceConfig(t *testing.T) {
 	}
 }
 
-// TODO We need to turn this ut on after adding the delete portal to the UI
-// func TestDeleteProjectWhenAddonExists(t *testing.T) {
-// 	db := &dao.DBClient{}
-// 	monkey.PatchInstanceMethod(reflect.TypeOf(db), "GetApplicationCountByProjectID",
-// 		func(*dao.DBClient, int64) (int64, error) {
-// 			return 0, nil
-// 		})
-// 	defer monkey.UnpatchAll()
-
-// 	monkey.PatchInstanceMethod(reflect.TypeOf(db), "GetProjectByID",
-// 		func(*dao.DBClient, int64) (model.Project, error) {
-// 			return model.Project{}, nil
-// 		})
-
-// 	bdl := &bundle.Bundle{}
-// 	monkey.PatchInstanceMethod(reflect.TypeOf(bdl), "ListAddonByProjectID",
-// 		func(*bundle.Bundle, int64, int64) (*apistructs.AddonListResponse, error) {
-// 			return &apistructs.AddonListResponse{
-// 				Header: apistructs.Header{},
-// 				Data: []apistructs.AddonFetchResponseData{
-// 					{
-// 						ID: "1",
-// 					},
-// 				},
-// 			}, nil
-// 		})
-// 	p := &Project{}
-// 	_, err := p.Delete(1)
-// 	if err == nil {
-// 		assert.Fail(t, "fail")
-// 		return
-// 	}
-// 	assert.Equal(t, "failed to delete project(there exists addons)", err.Error())
-
-// }
+func TestDeleteProjectWhenAddonExists(t *testing.T) {
+	db := &dao.DBClient{}
+	monkey.PatchInstanceMethod(reflect.TypeOf(db), "GetApplicationCountByProjectID",
+		func(*dao.DBClient, int64) (int64, error) {
+			return 0, nil
+		})
+	defer monkey.UnpatchAll()
+
+	monkey.PatchInstanceMethod(reflect.TypeOf(db), "GetProjectByID",
+		func(*dao.DBClient, int64) (model.Project, error) {
+			return model.Project{}, nil
+		})
+
+	bdl := &bundle.Bundle{}
+	monkey.PatchInstanceMethod(reflect.TypeOf(bdl), "ListAddonByProjectID",
+		func(*bundle.Bundle, int64, int64) (*apistructs.AddonListResponse, error) {
+			return &apistructs.AddonListResponse{
+				Header: apistructs.Header{},
+				Data: []apistructs.AddonFetchResponseData{
+					{
+						ID:                  "1",
+						PlatformServiceType: 1,
+					},
+					{
+						ID:                  "1",
+						PlatformServiceType: 0,
+					},
+				},
+			}, nil
+		})
+	p := &Project{}
+	_, err := p.Delete(1)
+	if err == nil {
+		assert.Fail(t, "fail")
+		return
+	}
+	assert.Equal(t, "failed to delete project(there exists addons)", err.Error())
+}
+
+func TestAddOnsFilterIn(t *testing.T) {
+	addOns := []apistructs.AddonFetchResponseData{
+		{
+			ID:                  "1",
+			PlatformServiceType: 1,
+		},
+		{
+			ID:                  "2",
+			PlatformServiceType: 0,
+		},
+		{
+			ID:                  "3",
+			PlatformServiceType: 1,
+		},
+	}
+	newAddOns := addOnsFilterIn(addOns, func(addOn *apistructs.AddonFetchResponseData) bool {
+		return addOn.PlatformServiceType == 0
+	})
+	assert.Equal(t, 1, len(newAddOns))
+}