fix: wf deletion bug and bulk cd pipeline req (#2693)

* fix for wf deletion bug and bulk cd pipeline req * fix
devtron-labs · Nov 28, 2022 · bb7cea3 · bb7cea3
1 parent 4c31141
commit bb7cea3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/internal/sql/repository/appWorkflow/AppWorkflowRepository.go b/internal/sql/repository/appWorkflow/AppWorkflowRepository.go
@@ -53,6 +53,7 @@ type AppWorkflowRepository interface {
 	FindWFCDMappingByExternalCiId(externalCiId int) ([]*AppWorkflowMapping, error)
 	FindByTypeAndComponentId(wfId int, componentId int, componentType string) (*AppWorkflowMapping, error)
 	FindAllWfsHavingCdPipelinesFromSpecificEnvsOnly(envIds []int, appIds []int) ([]*AppWorkflowMapping, error)
+	FindCiPipelineIdsFromAppWfIds(appWfIds []int) ([]int, error)
 }
 
 type AppWorkflowRepositoryImpl struct {
@@ -349,17 +350,29 @@ func (impl AppWorkflowRepositoryImpl) DeleteAppWorkflowMappingsByCdPipelineId(pi
 func (impl AppWorkflowRepositoryImpl) FindAllWfsHavingCdPipelinesFromSpecificEnvsOnly(envIds []int, appIds []int) ([]*AppWorkflowMapping, error) {
 	var models []*AppWorkflowMapping
 	query := `select * from app_workflow_mapping awm inner join app_workflow aw on aw.id=awm.app_workflow_id 
-				where aw.app_id in (?) and awm.active = ? and awm.app_workflow_id not in  
+				where awm.type = ? and aw.app_id in (?) and awm.active = ? and awm.app_workflow_id not in  
 					(select app_workflow_id from app_workflow_mapping awm inner join pipeline p on p.id=awm.component_id  
 					and awm.type = ? and p.environment_id not in (?) and p.app_id in (?) and p.deleted = ? and awm.active = ?); `
-	_, err := impl.dbConnection.Query(&models, query, pg.In(appIds), true, CDPIPELINE, pg.In(envIds), pg.In(appIds), false, true)
+	_, err := impl.dbConnection.Query(&models, query, CDPIPELINE, pg.In(appIds), true, CDPIPELINE, pg.In(envIds), pg.In(appIds), false, true)
 	if err != nil {
 		impl.Logger.Errorw("error, FindAllWfsHavingCdPipelinesFromSpecificEnvsOnly", "err", err)
 		return nil, err
 	}
 	return models, nil
 }
 
+func (impl AppWorkflowRepositoryImpl) FindCiPipelineIdsFromAppWfIds(appWfIds []int) ([]int, error) {
+	var ciPipelineIds []int
+	query := `select DISTINCT component_id from app_workflow_mapping 
+				where type = ? and app_workflow_id in (?) and active = ?; `
+	_, err := impl.dbConnection.Query(&ciPipelineIds, query, CIPIPELINE, pg.In(appWfIds), true)
+	if err != nil {
+		impl.Logger.Errorw("error, FindCiPipelineIdsFromAppWfIds", "err", err)
+		return nil, err
+	}
+	return ciPipelineIds, nil
+}
+
 func (impl AppWorkflowRepositoryImpl) FindWFCDMappingByExternalCiId(externalCiId int) ([]*AppWorkflowMapping, error) {
 	var models []*AppWorkflowMapping
 	err := impl.dbConnection.Model(&models).

diff --git a/pkg/appWorkflow/AppWorkflowService.go b/pkg/appWorkflow/AppWorkflowService.go
@@ -104,8 +104,9 @@ func (impl AppWorkflowServiceImpl) CreateAppWorkflow(req AppWorkflowDto) (AppWor
 
 	if req.Id != 0 {
 		wf = &appWorkflow.AppWorkflow{
-			Id:   req.Id,
-			Name: req.Name,
+			Id:     req.Id,
+			Name:   req.Name,
+			Active: true,
 			AuditLog: sql.AuditLog{
 				UpdatedOn: time.Now(),
 				UpdatedBy: req.UserId,

diff --git a/pkg/bulkAction/BulkUpdateService.go b/pkg/bulkAction/BulkUpdateService.go
@@ -1325,23 +1325,28 @@ func (impl BulkUpdateServiceImpl) GetBulkActionImpactedPipelinesAndWfs(dto *CdBu
 			}
 		} else {
 			//getting all workflows in given apps which do not have pipelines of other than given environments
-			appWfs, err := impl.appWorkflowRepository.FindAllWfsHavingCdPipelinesFromSpecificEnvsOnly(dto.EnvIds, dto.AppIds)
+			appWfsHavingSpecificCdPipelines, err := impl.appWorkflowRepository.FindAllWfsHavingCdPipelinesFromSpecificEnvsOnly(dto.EnvIds, dto.AppIds)
 			if err != nil && err != pg.ErrNoRows {
 				impl.logger.Errorw("error in getting wfs having cd pipelines from specific env only", "err", err)
 				return nil, nil, nil, err
 			}
 			impactedWfIdsMap := make(map[int]bool)
-			for _, appWf := range appWfs {
+			for _, appWf := range appWfsHavingSpecificCdPipelines {
 				if appWf.Type == appWorkflow.CDPIPELINE {
 					impactedPipelineIds = append(impactedPipelineIds, appWf.ComponentId)
-				} else if appWf.Type == appWorkflow.CIPIPELINE {
-					impactedCiPipelineIds = append(impactedCiPipelineIds, appWf.ComponentId)
 				}
 				if _, ok := impactedWfIdsMap[appWf.AppWorkflowId]; !ok {
 					impactedWfIds = append(impactedWfIds, appWf.AppWorkflowId)
 					impactedWfIdsMap[appWf.AppWorkflowId] = true
 				}
 			}
+			if len(impactedWfIds) > 0 {
+				impactedCiPipelineIds, err = impl.appWorkflowRepository.FindCiPipelineIdsFromAppWfIds(impactedWfIds)
+				if err != nil {
+					impl.logger.Errorw("error in getting ciPipelineIds from appWfIds", "err", err, "wfIds", impactedWfIds)
+					return nil, nil, nil, err
+				}
+			}
 		}
 	}
 	var pipelines []*pipelineConfig.Pipeline