feat: Showing app status on app listing page (#2799)

* wip

* rest-handler commit

* constructors added

* test commit

* minor design change and resthandler dev

* getting app_name and env_name in repo layer
for rbac optimisation

* rabc checks moved to service layer for optimisation

* rbac checks in batch

* getting env_identifier instead of env name

* delete and update methods completed in repo layer

* updating app-status for applisting and cdhandler hook points

* updating app-status for app-store app deployed with gitops

* added AppId field in InstalledAppAndEnvDetails struct

* added update app status hook in fetch resource tree function

* wip

* unstable wire

* sending app_status for overview page via other env api

* fix

* added delete with appid and envid
api's

* deleted active column from db

* fix

* query fix

* query fix

* fix

* update hook added

* fix

* fix

* wire

* wire hyperion

* query output error fix

* delete api fix

* delete api fix for installed apps

* open api helm-app struct updated

* delete query change

* sql up script

* port fix

* delete hook code updated

* unit test skeleton added for repo layer

* cleaned unused code

* unit tests WIP

* unit tests(service layer) done for update api

* unit tests(service layer) done for Delete api

* fix

* mocks

* Integration tests WIP

* integration tests for update method

* integration tests for delete method

* integration tests for delete_with_appid method

* integration tests for delete_with_envid method

* fix

* restructuring

* renaming script number

* minor code restructuring

* refactor tests

* skip tests stmnts added

* added filter support on app_status

* script number changed

* fix

* query fix

* wip

* storing suspended status as hibernating

* app-status filtering for installed apps

* update app-status on appStatus_update_topic nats event

* updated sql script number

* wire

* port fix

* fix

* code review changes

* sql down script

* removed code duplication

* improved logging

* code review changes

* optimised query

* query fix

* removed commented code

* changed error log to warn log

* updated sql script number

Author: gireesh-naidu

Wire.go

@@ -62,6 +62,7 @@ import (
 	"github.com/devtron-labs/devtron/client/telemetry"
 	"github.com/devtron-labs/devtron/internal/sql/repository"
 	app2 "github.com/devtron-labs/devtron/internal/sql/repository/app"
+	appStatusRepo "github.com/devtron-labs/devtron/internal/sql/repository/appStatus"
 	appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
 	"github.com/devtron-labs/devtron/internal/sql/repository/bulkUpdate"
 	"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
@@ -74,6 +75,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/app"
 	"github.com/devtron-labs/devtron/pkg/appClone"
 	"github.com/devtron-labs/devtron/pkg/appClone/batch"
+	"github.com/devtron-labs/devtron/pkg/appStatus"
 	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
 	appStoreDeploymentFullMode "github.com/devtron-labs/devtron/pkg/appStore/deployment/fullMode"
 	repository4 "github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
@@ -751,6 +753,13 @@ func InitializeApp() (*App, error) {
 		cron.NewCdApplicationStatusUpdateHandlerImpl,
 		wire.Bind(new(cron.CdApplicationStatusUpdateHandler), new(*cron.CdApplicationStatusUpdateHandlerImpl)),
 
+		//app_status
+		appStatusRepo.NewAppStatusRepositoryImpl,
+		wire.Bind(new(appStatusRepo.AppStatusRepository), new(*appStatusRepo.AppStatusRepositoryImpl)),
+		appStatus.NewAppStatusServiceImpl,
+		wire.Bind(new(appStatus.AppStatusService), new(*appStatus.AppStatusServiceImpl)),
+		//app_status ends
+
 		cron.GetCiWorkflowStatusUpdateConfig,
 		cron.NewCiStatusUpdateCronImpl,
 		wire.Bind(new(cron.CiStatusUpdateCron), new(*cron.CiStatusUpdateCronImpl)),

api/appStore/InstalledAppRestHandler.go

@@ -143,6 +143,12 @@ func (handler InstalledAppRestHandlerImpl) GetAllInstalledApp(w http.ResponseWri
 			}
 		}
 	}
+
+	var appStatuses []string
+	appStatusesStr := v.Get("appStatuses")
+	if len(appStatusesStr) > 0 {
+		appStatuses = strings.Split(appStatusesStr, ",")
+	}
 	appStoreName := v.Get("appStoreName")
 	appName := v.Get("appName")
 	offset := 0
@@ -155,7 +161,15 @@ func (handler InstalledAppRestHandlerImpl) GetAllInstalledApp(w http.ResponseWri
 	if len(sizeStr) > 0 {
 		size, _ = strconv.Atoi(sizeStr)
 	}
-	filter := &appStoreBean.AppStoreFilter{OnlyDeprecated: onlyDeprecated, ChartRepoId: chartRepoIds, AppStoreName: appStoreName, EnvIds: envIds, AppName: appName, ClusterIds: clusterIds}
+	filter := &appStoreBean.AppStoreFilter{
+		OnlyDeprecated: onlyDeprecated,
+		ChartRepoId:    chartRepoIds,
+		AppStoreName:   appStoreName,
+		EnvIds:         envIds,
+		AppName:        appName,
+		ClusterIds:     clusterIds,
+		AppStatuses:    appStatuses,
+	}
 	if size > 0 {
 		filter.Size = size
 		filter.Offset = offset

api/bean/AppView.go

@@ -62,6 +62,7 @@ type AppEnvironmentContainer struct {
 	DeploymentCounter           int                       `json:"deploymentCounter,omitempty"`
 	InstanceCounter             int                       `json:"instanceCounter,omitempty"`
 	Status                      string                    `json:"status"`
+	AppStatus                   string                    `json:"appStatus"`
 	CdStageStatus               *string                   `json:"cdStageStatus"`
 	PreStageStatus              *string                   `json:"preStageStatus"`
 	PostStageStatus             *string                   `json:"postStageStatus"`
@@ -123,6 +124,7 @@ type AppDetailContainer struct {
 }
 
 type Environment struct {
+	AppStatus       string `json:"appStatus"` //this is not the status of environment , this make sense with a specific app only
 	EnvironmentId   int    `json:"environmentId"`
 	EnvironmentName string `json:"environmentName"`
 	AppMetrics      *bool  `json:"appMetrics"`

api/helm-app/openapiClient/model_helm_app.go

@@ -33,6 +33,7 @@ import (
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
+	"github.com/devtron-labs/devtron/pkg/appStatus"
 	service1 "github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
 	"github.com/devtron-labs/devtron/pkg/cluster"
 	"github.com/devtron-labs/devtron/pkg/deploymentGroup"
@@ -85,6 +86,7 @@ type AppListingRestHandlerImpl struct {
 	installedAppService              service1.InstalledAppService
 	cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler
 	pipelineRepository               pipelineConfig.PipelineRepository
+	appStatusService                 appStatus.AppStatusService
 }
 
 type AppStatus struct {
@@ -105,7 +107,8 @@ func NewAppListingRestHandlerImpl(application application.ServiceClient,
 	helmAppClient client.HelmAppClient, clusterService cluster.ClusterService, helmAppService client.HelmAppService,
 	argoUserService argo.ArgoUserService, k8sApplicationService k8s.K8sApplicationService, installedAppService service1.InstalledAppService,
 	cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler,
-	pipelineRepository pipelineConfig.PipelineRepository) *AppListingRestHandlerImpl {
+	pipelineRepository pipelineConfig.PipelineRepository,
+	appStatusService appStatus.AppStatusService) *AppListingRestHandlerImpl {
 	appListingHandler := &AppListingRestHandlerImpl{
 		application:                      application,
 		appListingService:                appListingService,
@@ -124,6 +127,7 @@ func NewAppListingRestHandlerImpl(application application.ServiceClient,
 		installedAppService:              installedAppService,
 		cdApplicationStatusUpdateHandler: cdApplicationStatusUpdateHandler,
 		pipelineRepository:               pipelineRepository,
+		appStatusService:                 appStatusService,
 	}
 	return appListingHandler
 }
@@ -806,6 +810,12 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
 				handler.logger.Errorw("error in syncing pipeline status", "err", err)
 			}
 		}
+		//updating app_status table here
+		err = handler.appStatusService.UpdateStatusWithAppIdEnvId(appDetail.AppId, appDetail.EnvironmentId, resp.Status)
+		if err != nil {
+			handler.logger.Warnw("error in updating app status", "err", err, "appId", appDetail.AppId, "envId", appDetail.EnvironmentId)
+		}
+
 	} else if len(appDetail.AppName) > 0 && len(appDetail.EnvironmentName) > 0 && util.IsHelmApp(appDetail.DeploymentAppType) {
 		config, err := handler.helmAppService.GetClusterConf(appDetail.ClusterId)
 		if err != nil {

api/restHandler/AppListingRestHandler.go

@@ -366,6 +366,7 @@ func (c ServiceClientImpl) Create(ctxt context.Context, query *application.Appli
 }
 
 func (c ServiceClientImpl) ResourceTree(ctxt context.Context, query *application.ResourcesQuery) (*ResourceTreeResponse, error) {
+	//all the apps deployed via argo are fetching status from here
 	ctx, cancel := context.WithTimeout(ctxt, TimeoutSlow)
 	defer cancel()
 	token, ok := ctxt.Value("token").(string)

client/argocdServer/application/Application.go

@@ -29,6 +29,7 @@ import (
 	"github.com/devtron-labs/devtron/client/telemetry"
 	"github.com/devtron-labs/devtron/internal/sql/repository"
 	app2 "github.com/devtron-labs/devtron/internal/sql/repository/app"
+	"github.com/devtron-labs/devtron/internal/sql/repository/appStatus"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
@@ -83,6 +84,10 @@ func InitializeApp() (*App, error) {
 		telemetry.NewPosthogClient,
 		delete2.NewDeleteServiceImpl,
 
+		//appStatus
+		appStatus.NewAppStatusRepositoryImpl,
+		wire.Bind(new(appStatus.AppStatusRepository), new(*appStatus.AppStatusRepositoryImpl)),
+		//appStatus ends
 		rbac.NewEnforcerUtilImpl,
 		wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
 

cmd/external-app/wire.go

@@ -446,14 +446,14 @@ func (impl AppListingRepositoryImpl) FetchOtherEnvironment(appId int) ([]*bean.E
 	impl.Logger.Debug("reached at FetchOtherEnvironment:")
 
 	// other environment tab
+	//TODO : create new optimised query and need to use explain analyse for both queries
 	var otherEnvironments []*bean.Environment
-	query := "SELECT p.environment_id,env.environment_name, p.last_deployed,  env_app_m.app_metrics, env.default as prod, env_app_m.infra_metrics from" +
-		" (SELECT pl.id,pl.app_id,pl.environment_id,pl.deleted,MAX(pco.created_on) as last_deployed from pipeline pl LEFT JOIN pipeline_config_override pco on pco.pipeline_id = pl.id WHERE pl.app_id=? and pl.deleted = FALSE GROUP BY pl.id) p" +
-		" INNER JOIN environment env on env.id=p.environment_id" +
-		" LEFT JOIN env_level_app_metrics env_app_m on env.id=env_app_m.env_id and p.app_id = env_app_m.app_id" +
-		" where p.app_id=? and p.deleted = FALSE AND env.active = TRUE GROUP BY 1,2,3,4,5,6"
+	query := "select OE.*,B.status as app_status " +
+		"FROM " +
+		"(SELECT p.environment_id,env.environment_name, p.last_deployed,  env_app_m.app_metrics, env.default as prod, env_app_m.infra_metrics from ( SELECT pl.id,pl.app_id,pl.environment_id,pl.deleted,MAX(pco.created_on) as last_deployed from pipeline pl LEFT JOIN pipeline_config_override pco on pco.pipeline_id = pl.id WHERE pl.app_id = ? and pl.deleted = FALSE GROUP BY pl.id) p INNER JOIN environment env on env.id=p.environment_id LEFT JOIN env_level_app_metrics env_app_m on env.id=env_app_m.env_id and p.app_id = env_app_m.app_id where p.app_id=? and p.deleted = FALSE AND env.active = TRUE GROUP BY 1,2,3,4,5,6) OE " +
+		" LEFT JOIN app_status B ON OE.environment_id = B.env_id AND B.app_id = ? ;"
 	impl.Logger.Debugw("other env query:", query)
-	_, err := impl.dbConnection.Query(&otherEnvironments, query, appId, appId)
+	_, err := impl.dbConnection.Query(&otherEnvironments, query, appId, appId, appId)
 	if err != nil {
 		impl.Logger.Error("error in fetching other environment", "error", err)
 	}

cmd/external-app/wire_gen.go

@@ -63,6 +63,7 @@ type AppRepository interface {
 	FindIdsByNames(appNames []string) ([]int, error)
 	FetchAllActiveInstalledAppsWithAppIdAndName() ([]*App, error)
 	FetchAllActiveDevtronAppsWithAppIdAndName() ([]*App, error)
+	FindEnvironmentIdForInstalledApp(appId int) (int, error)
 }
 
 const DevtronApp = "DevtronApp"
@@ -321,3 +322,14 @@ func (repo AppRepositoryImpl) FetchAllActiveDevtronAppsWithAppIdAndName() ([]*Ap
 	}
 	return apps, nil
 }
+
+func (repo AppRepositoryImpl) FindEnvironmentIdForInstalledApp(appId int) (int, error) {
+	type envIdRes struct {
+		envId int `json:"envId"`
+	}
+	res := envIdRes{}
+	query := "select ia.environment_id " +
+		"from installed_apps ia where ia.app_id = ?"
+	_, err := repo.dbConnection.Query(&res, query, appId)
+	return res.envId, err
+}