fix:duplicate workflow name fixed

api/restHandler/CoreAppRestHandler.go

@@ -1587,6 +1587,16 @@ func (handler CoreAppRestHandlerImpl) createWorkflows(ctx context.Context, appId
 }
 
 func (handler CoreAppRestHandlerImpl) createWorkflowInDb(workflowName string, appId int, userId int32) (int, error) {
+	//checking if workflow name is already exist or not
+	workflow, err := handler.appWorkflowRepository.FindByNameAndAppId(workflowName, appId)
+	if err != nil && !errors.Is(err, pg.ErrNoRows) && !errors.Is(err, pg.ErrMultiRows) {
+		handler.logger.Errorw("error in finding workflow by app id and name", "name", workflowName, "appId", appId)
+		return 0, err
+	}
+	// if workflow name already exists then we will assign a new name to the workflow
+	if workflow.Id != 0 {
+		workflowName = fmt.Sprintf("%s-clone-%s", workflowName, util.Generate(4))
+	}
 	wf := &appWorkflow2.AppWorkflow{
 		Name:   workflowName,
 		AppId:  appId,

pkg/appWorkflow/AppWorkflowService.go

@@ -20,6 +20,7 @@ package appWorkflow
 import (
 	"errors"
 	"fmt"
+	util2 "github.com/devtron-labs/devtron/util"
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
@@ -178,7 +179,11 @@ func (impl AppWorkflowServiceImpl) CreateAppWorkflow(req AppWorkflowDto) (AppWor
 	var wf *appWorkflow.AppWorkflow
 	var savedAppWf *appWorkflow.AppWorkflow
 	var err error
-
+	workflow, err := impl.appWorkflowRepository.FindByNameAndAppId(req.Name, req.AppId)
+	if err != nil && !errors.Is(err, pg.ErrNoRows) {
+		impl.Logger.Errorw("error in finding workflow by app id and name", "name", req.Name, "appId", req.AppId)
+		return req, err
+	}
 	if req.Id != 0 {
 		wf = &appWorkflow.AppWorkflow{
 			Id:     req.Id,
@@ -189,19 +194,19 @@ func (impl AppWorkflowServiceImpl) CreateAppWorkflow(req AppWorkflowDto) (AppWor
 				UpdatedBy: req.UserId,
 			},
 		}
-		savedAppWf, err = impl.appWorkflowRepository.UpdateAppWorkflow(wf)
-	} else {
-		workflow, err := impl.appWorkflowRepository.FindByNameAndAppId(req.Name, req.AppId)
-		if err != nil && err != pg.ErrNoRows {
-			impl.Logger.Errorw("error in finding workflow by app id and name", "name", req.Name, "appId", req.AppId)
-			return req, err
-		}
 		if workflow.Id != 0 {
 			impl.Logger.Errorw("workflow with this name already exist", "err", err)
 			return req, errors.New(bean2.WORKFLOW_EXIST_ERROR)
 		}
+		savedAppWf, err = impl.appWorkflowRepository.UpdateAppWorkflow(wf)
+	} else {
+		workflowName := req.Name
+		// if workflow already exists then we will assign a new name to the workflow
+		if workflow.Id != 0 {
+			workflowName = fmt.Sprintf("%s-clone-%s", req.Name, util2.Generate(4))
+		}
 		wf := &appWorkflow.AppWorkflow{
-			Name:   req.Name,
+			Name:   workflowName,
 			AppId:  req.AppId,
 			Active: true,
 			AuditLog: sql.AuditLog{