cd pipeline get response change

Author: kartik-579

api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

@@ -39,7 +39,6 @@ import (
 	"github.com/devtron-labs/devtron/pkg/bean"
 	"github.com/devtron-labs/devtron/pkg/chart"
 	"github.com/devtron-labs/devtron/pkg/generateManifest"
-	"github.com/devtron-labs/devtron/pkg/pipeline"
 	pipelineBean "github.com/devtron-labs/devtron/pkg/pipeline/bean"
 	resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
 	"github.com/devtron-labs/devtron/pkg/resourceQualifiers"
@@ -1920,15 +1919,9 @@ func (handler *PipelineConfigRestHandlerImpl) GetCdPipelineById(w http.ResponseW
 		return
 	}
 
-	cdPipeline, err := handler.pipelineBuilder.GetCdPipelineById(pipelineId)
+	cdResp, err := handler.pipelineBuilder.GetCdPipelineByIdResolved(pipelineId, version)
 	if err != nil {
-		handler.Logger.Errorw("service err, GetCdPipelineById", "err", err, "appId", appId, "pipelineId", pipelineId)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-		return
-	}
-	cdResp, err := pipeline.CreatePreAndPostStageResponse(cdPipeline, version)
-	if err != nil {
-		handler.Logger.Errorw("service err, CheckForVersionAndCreatePreAndPostStagePayload", "err", err, "appId", appId, "pipelineId", pipelineId)
+		handler.Logger.Errorw("service err, GetCdPipelineByIdResolved", "appId", appId, "pipelineId", pipelineId, "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}

pkg/pipeline/DeploymentPipelineConfigService.go

@@ -76,6 +76,8 @@ import (
 )
 
 type CdPipelineConfigService interface {
+	// GetCdPipelineByIdResolved : Retrieve cdPipeline for given cdPipelineId and update response as per version(change of pre/post stage data)
+	GetCdPipelineByIdResolved(pipelineId int, version string) (cdPipeline *bean.CDPipelineConfigObject, err error)
 	// GetCdPipelineById : Retrieve cdPipeline for given cdPipelineId.
 	// getting cdPipeline,environment and strategies ,preDeployStage, postDeployStage,appWorkflowMapping from respective repository and service layer
 	// converting above data in proper bean object and then assigning to CDPipelineConfigObject
@@ -224,6 +226,20 @@ func NewCdPipelineConfigServiceImpl(logger *zap.SugaredLogger, pipelineRepositor
 	}
 }
 
+func (impl *CdPipelineConfigServiceImpl) GetCdPipelineByIdResolved(pipelineId int, version string) (cdPipeline *bean.CDPipelineConfigObject, err error) {
+	cdPipeline, err = impl.GetCdPipelineById(pipelineId)
+	if err != nil {
+		impl.logger.Errorw("service err, GetCdPipelineById", "pipelineId", pipelineId, "err", err)
+		return
+	}
+	cdResp, err := CreatePreAndPostStageResponse(cdPipeline, version)
+	if err != nil {
+		impl.logger.Errorw("service err, CheckForVersionAndCreatePreAndPostStagePayload", "pipelineId", pipelineId, "err", err)
+		return
+	}
+	return cdResp, nil
+}
+
 func (impl *CdPipelineConfigServiceImpl) GetCdPipelineById(pipelineId int) (cdPipeline *bean.CDPipelineConfigObject, err error) {
 	dbPipeline, err := impl.pipelineRepository.FindById(pipelineId)
 	if err != nil && errors.IsNotFound(err) {