fix: duplicate name in charts and chart Group (#2942)

* Duplicate name in Charts and Chart Group

* Bad Request

* Error message

* Status Code Update

Author: Ashish-devtron

api/appStore/InstalledAppRestHandler.go

@@ -295,7 +295,16 @@ func (handler *InstalledAppRestHandlerImpl) DeployBulk(w http.ResponseWriter, r
 	}
 	//RBAC block ends here
 
+	visited := make(map[string]bool)
+
 	for _, item := range request.ChartGroupInstallChartRequest {
+		if visited[item.AppName] {
+			handler.Logger.Errorw("service err, CreateInstalledApp", "err", err, "payload", request)
+			common.WriteJsonResp(w, errors.New("duplicate appName found"), nil, http.StatusBadRequest)
+			return
+		} else {
+			visited[item.AppName] = true
+		}
 		isChartRepoActive, err := handler.appStoreDeploymentService.IsChartRepoActive(item.AppStoreVersion)
 		if err != nil {
 			handler.Logger.Errorw("service err, CreateInstalledApp", "err", err, "payload", request)

api/restHandler/ChartGroupRestHandler.go

@@ -99,7 +99,11 @@ func (impl *ChartGroupRestHandlerImpl) CreateChartGroup(w http.ResponseWriter, r
 	res, err := impl.ChartGroupService.CreateChartGroup(&request)
 	if err != nil {
 		impl.Logger.Errorw("service err, CreateChartGroup", "err", err, "payload", request)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		statusCode := http.StatusInternalServerError
+		if service.AppNameAlreadyExistsError == err.Error() {
+			statusCode = http.StatusBadRequest
+		}
+		common.WriteJsonResp(w, err, nil, statusCode)
 		return
 	}
 	common.WriteJsonResp(w, err, res, http.StatusOK)
@@ -312,7 +316,7 @@ func (impl *ChartGroupRestHandlerImpl) GetChartGroupListMin(w http.ResponseWrite
 	common.WriteJsonResp(w, err, res, http.StatusOK)
 }
 
-func(impl *ChartGroupRestHandlerImpl) DeleteChartGroup(w http.ResponseWriter, r *http.Request){
+func (impl *ChartGroupRestHandlerImpl) DeleteChartGroup(w http.ResponseWriter, r *http.Request) {
 	userId, err := impl.userAuthService.GetLoggedInUser(r)
 	if userId == 0 || err != nil {
 		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
@@ -350,4 +354,4 @@ func(impl *ChartGroupRestHandlerImpl) DeleteChartGroup(w http.ResponseWriter, r
 		return
 	}
 	common.WriteJsonResp(w, err, CHART_GROUP_DELETE_SUCCESS_RESP, http.StatusOK)
-}
+}

internal/sql/repository/app/AppRepository.go

@@ -135,6 +135,7 @@ func (repo AppRepositoryImpl) CheckAppExists(appNames []string) ([]*App, error)
 	err := repo.dbConnection.
 		Model(&apps).
 		Where("app_name in (?)", pg.In(appNames)).
+		Where("active = ?", true).
 		Select()
 	return apps, err
 }

pkg/appStore/deployment/repository/ChartGroup.go

@@ -53,6 +53,7 @@ type ChartGroupReposotory interface {
 	FindById(chartGroupId int) (*ChartGroup, error)
 	GetAll(max int) ([]*ChartGroup, error)
 	MarkChartGroupDeleted(chartGroupId int, tx *pg.Tx) error
+	FindByName(chartGroupName string) (bool, error)
 }
 
 func (impl *ChartGroupReposotoryImpl) Save(model *ChartGroup) (*ChartGroup, error) {
@@ -105,3 +106,12 @@ func (impl *ChartGroupReposotoryImpl) MarkChartGroupDeleted(chartGroupId int, tx
 		Update()
 	return err
 }
+
+func (impl *ChartGroupReposotoryImpl) FindByName(chartGroupName string) (bool, error) {
+	var ChartGroup ChartGroup
+	exists, err := impl.dbConnection.Model(&ChartGroup).Where("name = ?", chartGroupName).
+		Where("deleted = ?", false).
+		Exists()
+
+	return exists, err
+}

pkg/appStore/deployment/service/ChartGroupService.go

@@ -18,6 +18,7 @@
 package service
 
 import (
+	"errors"
 	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
 	"github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
 	appStoreValuesRepository "github.com/devtron-labs/devtron/pkg/appStore/values/repository"
@@ -69,7 +70,7 @@ type ChartGroupList struct {
 	Groups []*ChartGroupBean `json:"groups,omitempty"`
 }
 type ChartGroupBean struct {
-	Name               string                 `json:"name,omitempty" validate:"name-component,max=200"`
+	Name               string                 `json:"name,omitempty" validate:"name-component,max=200,min=5"`
 	Description        string                 `json:"description,omitempty"`
 	Id                 int                    `json:"id,omitempty"`
 	ChartGroupEntries  []*ChartGroupEntryBean `json:"chartGroupEntries,omitempty"`
@@ -108,8 +109,21 @@ type InstalledChart struct {
 	InstalledAppId int `json:"installedAppId,omitempty"`
 }
 
+const AppNameAlreadyExistsError = "A chart with this name already exist"
+
 func (impl *ChartGroupServiceImpl) CreateChartGroup(req *ChartGroupBean) (*ChartGroupBean, error) {
 	impl.Logger.Debugw("chart group create request", "req", req)
+
+	exist, err := impl.chartGroupRepository.FindByName(req.Name)
+	if err != nil {
+		impl.Logger.Errorw("error in creating chart group", "req", req, "err", err)
+		return nil, err
+	}
+	if exist {
+		impl.Logger.Errorw("Chart with this name already exist", "req", req, "err", err)
+		return nil, errors.New(AppNameAlreadyExistsError)
+	}
+
 	chartGrouModel := &repository.ChartGroup{
 		Name:        req.Name,
 		Description: req.Description,