Merge pull request #14 from klovercloud-ci-cd/13_remove_process_depen…

…dency_in_pipeline Fix #13 removed process dependency in pipeline
klovercloud-ci-cd · Aug 1, 2022 · d2ae572 · d2ae572
2 parents 300034a + 1464b37
commit d2ae572
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/api/v1/base.go b/api/v1/base.go
@@ -46,7 +46,7 @@ func ProcessRouter(g *echo.Group) {
 
 // PipelineRouter api/v1/pipelines router/*
 func PipelineRouter(g *echo.Group) {
-	pipelineRouter := NewPipelineApi(dependency.GetV1PipelineService(), dependency.GetV1LogEventService(), dependency.GetV1ProcessEventService(), dependency.GetV1ProcessService())
+	pipelineRouter := NewPipelineApi(dependency.GetV1PipelineService(), dependency.GetV1LogEventService(), dependency.GetV1ProcessEventService())
 	g.GET("", pipelineRouter.Get, AuthenticationAndAuthorizationHandler)
 	g.GET("/:processId", pipelineRouter.GetById, AuthenticationAndAuthorizationHandler)
 	g.GET("/ws", pipelineRouter.GetEvents, AuthenticationAndAuthorizationHandlerForWebSocket)

diff --git a/api/v1/pipeline.go b/api/v1/pipeline.go
@@ -21,7 +21,6 @@ type pipelineApi struct {
 	pipelineService     service.Pipeline
 	logEventService     service.LogEvent
 	processEventService service.ProcessEvent
-	processService      service.Process
 }
 
 var (
@@ -98,11 +97,10 @@ func (p pipelineApi) GetById(context echo.Context) error {
 func (p pipelineApi) GetByProcessId(context echo.Context) error {
 	processId := context.Param("processId")
 	companyId := context.QueryParam("companyId")
-	process := p.processService.GetById(companyId, processId)
-	if process.ProcessId == "" {
+	data := p.pipelineService.GetByProcessId(processId)
+	if data.MetaData.CompanyId != companyId {
 		return common.GenerateSuccessResponse(context, v1.Pipeline{}, nil, "")
 	}
-	data := p.pipelineService.GetByProcessId(processId)
 	return common.GenerateSuccessResponse(context, data, nil, "")
 }
 
@@ -189,11 +187,10 @@ func (p pipelineApi) GetEvents(context echo.Context) error {
 }
 
 // NewPipelineApi returns Pipeline type api
-func NewPipelineApi(pipelineService service.Pipeline, logEventService service.LogEvent, processEventService service.ProcessEvent, processService service.Process) api.Pipeline {
+func NewPipelineApi(pipelineService service.Pipeline, logEventService service.LogEvent, processEventService service.ProcessEvent) api.Pipeline {
 	return &pipelineApi{
 		pipelineService:     pipelineService,
 		logEventService:     logEventService,
 		processEventService: processEventService,
-		processService:      processService,
 	}
 }