oss ent change

Author: kartik-579

api/restHandler/app/workflow/AppWorkflowRestHandler.go

@@ -188,13 +188,6 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 		return
 	}
 	token := r.Header.Get("token")
-	app, err := impl.pipelineBuilder.GetApp(appId)
-	if err != nil {
-		impl.Logger.Errorw("bad request", "err", err)
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-
 	v := r.URL.Query()
 	envIdsString := v.Get("envIds")
 	envIds := make([]int, 0)
@@ -207,16 +200,15 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 	}
 
 	// RBAC enforcer applying
-	object := impl.enforcerUtil.GetAppRBACName(app.AppName)
+	object := impl.enforcerUtil.GetAppRBACNameByAppId(appId)
 	impl.Logger.Debugw("rbac object for other environment list", "object", object)
 	ok := impl.enforcerUtil.CheckAppRbacForAppOrJob(token, object, casbin.ActionGet)
 	if !ok {
 		common.WriteJsonResp(w, err, "unauthorized user", http.StatusForbidden)
 		return
 	}
 	//RBAC enforcer Ends
-	workflows := make(map[string]interface{})
-	workflowsList, err := impl.appWorkflowService.FindAppWorkflows(appId)
+	workflowsListResp, appType, err := impl.appWorkflowService.FindAppWorkflowsListResolvedResp(appId)
 	if err != nil {
 		impl.Logger.Errorw("error in fetching workflows for app", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -231,7 +223,7 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 			return
 		}
 		triggerViewPayload := &bean2.TriggerViewWorkflowConfig{
-			Workflows:   workflowsList,
+			Workflows:   workflowsListResp.Workflows,
 			CdPipelines: cdPipelineWfData,
 		}
 		queryParam := bean2.NewWorkflowsFilterQuery().WithEnvIds(envIds)
@@ -242,12 +234,10 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 			return
 		}
-		workflowsList = response.Workflows
+		workflowsListResp.Workflows = response.Workflows
 	}
 
-	workflows["appId"] = app.Id
-	workflows["appName"] = app.AppName
-	if len(workflowsList) > 0 && app.AppType == helper.Job {
+	if len(workflowsListResp.Workflows) > 0 && appType == helper.Job {
 		// RBAC
 
 		var workflowNames []string
@@ -256,15 +246,15 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 		var rbacObjects []string
 		workNameObjectMap := make(map[string]bean2.AppWorkflowDto)
 
-		for _, workflow := range workflowsList {
+		for _, workflow := range workflowsListResp.Workflows {
 			workflowNames = append(workflowNames, workflow.Name)
 			workflowIds = append(workflowIds, workflow.Id)
 		}
 		workflowIdToObjectMap := impl.enforcerUtil.GetAllWorkflowRBACObjectsByAppId(appId, workflowNames, workflowIds)
 		itr := 0
 		for _, val := range workflowIdToObjectMap {
 			rbacObjects = append(rbacObjects, val)
-			workNameObjectMap[val] = workflowsList[itr]
+			workNameObjectMap[val] = workflowsListResp.Workflows[itr]
 			itr++
 		}
 
@@ -277,20 +267,8 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 		if len(updatedWorkflowList) == 0 {
 			updatedWorkflowList = []bean2.AppWorkflowDto{}
 		}
-		workflows[bean3.Workflows] = updatedWorkflowList
-	} else if len(workflowsList) > 0 {
-		workflows[bean3.Workflows] = workflowsList
-	} else {
-		workflows[bean3.Workflows] = []bean2.AppWorkflowDto{}
-	}
-	isAppLevelGitOpsConfigured, err := impl.chartService.IsGitOpsRepoConfiguredForDevtronApp(appId)
-	if err != nil && !util.IsErrNoRows(err) {
-		impl.Logger.Errorw("service err, IsGitOpsRepoConfiguredForDevtronApp", "appId", appId, "envIds", envIds, "err", err)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-		return
 	}
-	workflows["isGitOpsRepoNotConfigured"] = !isAppLevelGitOpsConfigured
-	common.WriteJsonResp(w, nil, workflows, http.StatusOK)
+	common.WriteJsonResp(w, nil, workflowsListResp, http.StatusOK)
 }
 
 func (impl AppWorkflowRestHandlerImpl) FindAllWorkflows(w http.ResponseWriter, r *http.Request) {

pkg/appWorkflow/AppWorkflowService.go

@@ -19,6 +19,7 @@ package appWorkflow
 import (
 	"errors"
 	"fmt"
+	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	bean4 "github.com/devtron-labs/devtron/pkg/appWorkflow/bean"
 	"github.com/devtron-labs/devtron/pkg/deployment/common"
 	util2 "github.com/devtron-labs/devtron/util"
@@ -46,6 +47,7 @@ import (
 
 type AppWorkflowService interface {
 	CreateAppWorkflow(req bean4.AppWorkflowDto) (bean4.AppWorkflowDto, error)
+	FindAppWorkflowsListResolvedResp(appId int) (resp bean4.AppWorkflowListRespDto, appType helper.AppType, err error)
 	FindAppWorkflows(appId int) ([]bean4.AppWorkflowDto, error)
 	FindAppWorkflowById(Id int, appId int) (bean4.AppWorkflowDto, error)
 	DeleteAppWorkflow(appWorkflowId int, userId int32) error
@@ -79,13 +81,15 @@ type AppWorkflowServiceImpl struct {
 	userAuthService          user.UserAuthService
 	chartService             chart.ChartService
 	deploymentConfigService  common.DeploymentConfigService
+	pipelineBuilder          pipeline.PipelineBuilder
 }
 
 func NewAppWorkflowServiceImpl(logger *zap.SugaredLogger, appWorkflowRepository appWorkflow.AppWorkflowRepository,
 	ciCdPipelineOrchestrator pipeline.CiCdPipelineOrchestrator, ciPipelineRepository pipelineConfig.CiPipelineRepository,
 	pipelineRepository pipelineConfig.PipelineRepository, enforcerUtil rbac.EnforcerUtil, resourceGroupService resourceGroup2.ResourceGroupService,
 	appRepository appRepository.AppRepository, userAuthService user.UserAuthService, chartService chart.ChartService,
 	deploymentConfigService common.DeploymentConfigService,
+	pipelineBuilder pipeline.PipelineBuilder,
 ) *AppWorkflowServiceImpl {
 	return &AppWorkflowServiceImpl{
 		Logger:                   logger,
@@ -99,6 +103,7 @@ func NewAppWorkflowServiceImpl(logger *zap.SugaredLogger, appWorkflowRepository
 		userAuthService:          userAuthService,
 		chartService:             chartService,
 		deploymentConfigService:  deploymentConfigService,
+		pipelineBuilder:          pipelineBuilder,
 	}
 }
 
@@ -153,6 +158,34 @@ func (impl AppWorkflowServiceImpl) CreateAppWorkflow(req bean4.AppWorkflowDto) (
 	return req, nil
 }
 
+func (impl AppWorkflowServiceImpl) FindAppWorkflowsListResolvedResp(appId int) (resp bean4.AppWorkflowListRespDto, appType helper.AppType, err error) {
+	app, err := impl.pipelineBuilder.GetApp(appId)
+	if err != nil {
+		impl.Logger.Errorw("error, GetApp", "appId", appId, "err", err)
+		return resp, appType, err
+	}
+	workflowsList, err := impl.FindAppWorkflows(appId)
+	if err != nil {
+		impl.Logger.Errorw("error in fetching workflows for app", "appId", appId, "err", err)
+		return resp, appType, err
+	}
+	isAppLevelGitOpsConfigured, err := impl.chartService.IsGitOpsRepoConfiguredForDevtronApp(appId)
+	if err != nil && !util.IsErrNoRows(err) {
+		impl.Logger.Errorw("service err, IsGitOpsRepoConfiguredForDevtronApp", "appId", appId, "err", err)
+		return resp, appType, err
+	}
+	resp.AppId = app.Id
+	resp.AppName = app.AppName
+	resp.Workflows = workflowsList
+	resp.IsGitOpsRepoNotConfigured = !isAppLevelGitOpsConfigured
+	if len(workflowsList) > 0 {
+		resp.Workflows = workflowsList
+	} else {
+		resp.Workflows = []bean4.AppWorkflowDto{}
+	}
+	return resp, app.AppType, nil
+}
+
 func (impl AppWorkflowServiceImpl) FindAppWorkflows(appId int) ([]bean4.AppWorkflowDto, error) {
 	appWorkflows, err := impl.appWorkflowRepository.FindByAppId(appId)
 	if err != nil && err != pg.ErrNoRows {

pkg/appWorkflow/bean/bean.go

@@ -55,6 +55,13 @@ type WorkflowComponents struct {
 	CdPipelineIds        []int
 }
 
+type AppWorkflowListRespDto struct {
+	Workflows                 []AppWorkflowDto `json:"workflows"`
+	AppId                     int              `json:"appId"`
+	AppName                   string           `json:"appName"`
+	IsGitOpsRepoNotConfigured bool             `json:"isGitOpsRepoNotConfigured"`
+}
+
 type AppWorkflowDto struct {
 	Id                    int                     `json:"id,omitempty"`
 	Name                  string                  `json:"name"`