@@ -49,7 +49,6 @@ import (
49
49
"github.com/devtron-labs/devtron/pkg/pipeline/executors"
50
50
"github.com/devtron-labs/devtron/pkg/pipeline/types"
51
51
"github.com/devtron-labs/devtron/pkg/resourceGroup"
52
- workflowStatusLatest "github.com/devtron-labs/devtron/pkg/workflow/status"
53
52
"github.com/devtron-labs/devtron/util/rbac"
54
53
"github.com/go-pg/pg"
55
54
"go.uber.org/zap"
@@ -98,15 +97,13 @@ type CiHandlerImpl struct {
98
97
config * types.CiConfig
99
98
k8sCommonService k8sPkg.K8sCommonService
100
99
workFlowStageStatusService workflowStatus.WorkFlowStageStatusService
101
- workflowStatusUpdateService workflowStatusLatest.WorkflowStatusUpdateService
102
100
}
103
101
104
102
func NewCiHandlerImpl (Logger * zap.SugaredLogger , ciService CiService , ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository , gitSensorClient gitSensor.Client , ciWorkflowRepository pipelineConfig.CiWorkflowRepository ,
105
103
ciArtifactRepository repository.CiArtifactRepository , userService user.UserService , eventClient client.EventClient , eventFactory client.EventFactory , ciPipelineRepository pipelineConfig.CiPipelineRepository ,
106
104
appListingRepository repository.AppListingRepository , cdPipelineRepository pipelineConfig.PipelineRepository , enforcerUtil rbac.EnforcerUtil , resourceGroupService resourceGroup.ResourceGroupService , envRepository repository2.EnvironmentRepository ,
107
105
imageTaggingService imageTagging.ImageTaggingService , k8sCommonService k8sPkg.K8sCommonService , appWorkflowRepository appWorkflow.AppWorkflowRepository , customTagService CustomTagService ,
108
106
workFlowStageStatusService workflowStatus.WorkFlowStageStatusService ,
109
- workflowStatusUpdateService workflowStatusLatest.WorkflowStatusUpdateService ,
110
107
) * CiHandlerImpl {
111
108
cih := & CiHandlerImpl {
112
109
Logger : Logger ,
@@ -129,7 +126,6 @@ func NewCiHandlerImpl(Logger *zap.SugaredLogger, ciService CiService, ciPipeline
129
126
appWorkflowRepository : appWorkflowRepository ,
130
127
k8sCommonService : k8sCommonService ,
131
128
workFlowStageStatusService : workFlowStageStatusService ,
132
- workflowStatusUpdateService : workflowStatusUpdateService ,
133
129
}
134
130
config , err := types .GetCiConfig ()
135
131
if err != nil {
@@ -648,16 +644,10 @@ func (impl *CiHandlerImpl) stateChanged(status string, podStatus string, msg str
648
644
}
649
645
650
646
func (impl * CiHandlerImpl ) FetchCiStatusForTriggerViewV1 (appId int ) ([]* pipelineConfig.CiWorkflowStatus , error ) {
651
- // Try to use the optimized workflow status latest service first
652
- ciWorkflowStatuses , err := impl .workflowStatusUpdateService .FetchCiStatusForTriggerViewOptimized (appId )
653
- if err != nil {
654
- impl .Logger .Errorw ("error in fetching ci status from optimized service, falling back to old method" , "appId" , appId , "err" , err )
655
- // Fallback to old method if optimized service fails
656
- ciWorkflowStatuses , err = impl .ciWorkflowRepository .FIndCiWorkflowStatusesByAppId (appId )
657
- if err != nil && ! util .IsErrNoRows (err ) {
658
- impl .Logger .Errorw ("err in fetching ciWorkflowStatuses from ciWorkflowRepository" , "appId" , appId , "err" , err )
659
- return ciWorkflowStatuses , err
660
- }
647
+ ciWorkflowStatuses , err := impl .ciWorkflowRepository .FIndCiWorkflowStatusesByAppId (appId )
648
+ if err != nil && ! util .IsErrNoRows (err ) {
649
+ impl .Logger .Errorw ("err in fetching ciWorkflowStatuses from ciWorkflowRepository" , "appId" , appId , "err" , err )
650
+ return ciWorkflowStatuses , err
661
651
}
662
652
663
653
return ciWorkflowStatuses , err
0 commit comments