Merge remote-tracking branch 'origin/main' into get_cluster_name

Author: ShashwatDadhich

api/bean/AppView.go

@@ -144,6 +144,9 @@ type AppEnvironmentContainer struct {
 type DeploymentDetailContainer struct {
 	InstalledAppId                int             `json:"installedAppId,omitempty"`
 	AppId                         int             `json:"appId,omitempty"`
+	CdPipelineId                  int             `json:"cdPipelineId,omitempty"`
+	TriggerType                   string          `json:"triggerType,omitempty"`
+	ParentEnvironmentName         string          `json:"parentEnvironmentName"`
 	AppStoreInstalledAppVersionId int             `json:"appStoreInstalledAppVersionId,omitempty"`
 	AppStoreChartName             string          `json:"appStoreChartName,omitempty"`
 	AppStoreChartId               int             `json:"appStoreChartId,omitempty"`
@@ -169,7 +172,7 @@ type DeploymentDetailContainer struct {
 	ParentArtifactId              int             `json:"parentArtifactId"`
 	ClusterId                     int             `json:"clusterId"`
 	DeploymentAppType             string          `json:"deploymentAppType"`
-	CiPipelineId                  int             `json:"-"`
+	CiPipelineId                  int             `json:"ciPipelineId,omitempty"`
 	IsExternalCi                  bool            `json:"externalCi"`
 	ClusterName                   string          `json:"clusterName,omitempty"`
 	DockerRegistryId              string          `json:"dockerRegistryId,omitempty"`

internal/sql/repository/AppListingRepository.go

@@ -26,6 +26,7 @@ import (
 	"fmt"
 	"github.com/devtron-labs/devtron/api/bean/gitOps"
 	"github.com/devtron-labs/devtron/internal/middleware"
+	appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/repository"
 	"go.opentelemetry.io/otel"
 	"strings"
@@ -87,20 +88,22 @@ type AppListingRepositoryImpl struct {
 	appListingRepositoryQueryBuilder helper.AppListingRepositoryQueryBuilder
 	environmentRepository            repository2.EnvironmentRepository
 	gitOpsRepository                 GitOpsConfigRepository
+	appWorkflowRepository            appWorkflow2.AppWorkflowRepository
 }
 
 func NewAppListingRepositoryImpl(
 	Logger *zap.SugaredLogger,
 	dbConnection *pg.DB,
 	appListingRepositoryQueryBuilder helper.AppListingRepositoryQueryBuilder,
 	environmentRepository repository2.EnvironmentRepository,
-	gitOpsRepository GitOpsConfigRepository) *AppListingRepositoryImpl {
+	gitOpsRepository GitOpsConfigRepository, appWorkflowRepository appWorkflow2.AppWorkflowRepository) *AppListingRepositoryImpl {
 	return &AppListingRepositoryImpl{
 		dbConnection:                     dbConnection,
 		Logger:                           Logger,
 		appListingRepositoryQueryBuilder: appListingRepositoryQueryBuilder,
 		environmentRepository:            environmentRepository,
 		gitOpsRepository:                 gitOpsRepository,
+		appWorkflowRepository:            appWorkflowRepository,
 	}
 }
 
@@ -321,6 +324,20 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 	return appEnvArr, appsSize, nil
 }
 
+func (impl AppListingRepositoryImpl) getEnvironmentNameFromPipelineId(pipelineID int) (string, error) {
+	var environmentName string
+	query := "SELECT e.environment_name " +
+		"FROM pipeline p " +
+		"JOIN environment e ON p.environment_id = e.id WHERE p.id = ?"
+
+	_, err := impl.dbConnection.Query(&environmentName, query, pipelineID)
+	if err != nil {
+		impl.Logger.Errorw("error in finding environment", "err", err, "pipelineID", pipelineID)
+		return "", err
+	}
+	return environmentName, nil
+}
+
 // DeploymentDetailsByAppIdAndEnvId It will return the deployment detail of any cd pipeline which is latest triggered for Environment of any App
 func (impl AppListingRepositoryImpl) deploymentDetailsByAppIdAndEnvId(ctx context.Context, appId int, envId int) (bean.DeploymentDetailContainer, error) {
 	_, span := otel.Tracer("orchestrator").Start(ctx, "DeploymentDetailsByAppIdAndEnvId")
@@ -340,7 +357,10 @@ func (impl AppListingRepositoryImpl) deploymentDetailsByAppIdAndEnvId(ctx contex
 		" cl.k8s_version," +
 		" env.cluster_id," +
 		" env.is_virtual_environment," +
-		" cl.cluster_name" +
+		" cl.cluster_name," +
+		" p.id as cd_pipeline_id," +
+		" p.ci_pipeline_id," +
+		" p.trigger_type" +
 		" FROM pipeline p" +
 		" INNER JOIN pipeline_config_override pco on pco.pipeline_id=p.id" +
 		" INNER JOIN environment env ON env.id=p.environment_id" +
@@ -423,6 +443,11 @@ func (impl AppListingRepositoryImpl) FetchAppDetail(ctx context.Context, appId i
 	if err != nil {
 		impl.Logger.Warn("unable to fetch deployment detail for app")
 	}
+	appWfMapping, _ := impl.appWorkflowRepository.FindWFCDMappingByCDPipelineId(deploymentDetail.CdPipelineId)
+	if appWfMapping.ParentType == appWorkflow2.CDPIPELINE {
+		parentEnvironmentName, _ := impl.getEnvironmentNameFromPipelineId(appWfMapping.ParentId)
+		deploymentDetail.ParentEnvironmentName = parentEnvironmentName
+	}
 	appDetailContainer.DeploymentDetailContainer = deploymentDetail
 	return appDetailContainer, nil
 }