app count

Author: prkhrkat

client/telemetry/TelemetryEventClient.go

@@ -41,7 +41,6 @@ import (
 	"github.com/devtron-labs/common-lib/utils/k8s"
 	"github.com/devtron-labs/devtron/internal/sql/repository"
 	appRepository "github.com/devtron-labs/devtron/internal/sql/repository/app"
-	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/pkg/auth/sso"
 	user2 "github.com/devtron-labs/devtron/pkg/auth/user"
@@ -275,7 +274,7 @@ func (impl *TelemetryEventClientImpl) SummaryDetailsForTelemetry() (cluster []be
 // New methods for collecting additional telemetry metrics
 
 func (impl *TelemetryEventClientImpl) getHelmAppCount() int {
-	count, err := impl.installedAppReadService.GetDeploymentSuccessfulStatusCountForTelemetry()
+	count, err := impl.installedAppReadService.GetActiveInstalledAppCount()
 	if err != nil {
 		impl.logger.Errorw("error getting helm app count", "err", err)
 		return -1
@@ -284,49 +283,21 @@ func (impl *TelemetryEventClientImpl) getHelmAppCount() int {
 }
 
 func (impl *TelemetryEventClientImpl) getDevtronAppCount() int {
-	// Use a simple approach - count all active apps that are not jobs
-	if impl.appRepository == nil {
-		impl.logger.Warnw("appRepository not available for devtron app count")
-		return -1
-	}
-
-	// Get all active apps and filter out jobs
-	apps, err := impl.appRepository.FindAll()
+	devtronAppCount, err := impl.appRepository.FindDevtronAppCount()
 	if err != nil {
 		impl.logger.Errorw("error getting all apps for devtron app count", "err", err)
 		return -1
 	}
-
-	devtronAppCount := 0
-	for _, app := range apps {
-		if app.AppType != helper.Job && app.Active {
-			devtronAppCount++
-		}
-	}
-
 	return devtronAppCount
 }
 
 func (impl *TelemetryEventClientImpl) getJobCount() int {
-	// Use a simple approach - count all active apps that are jobs
-	if impl.appRepository == nil {
-		impl.logger.Warnw("appRepository not available for job count")
-		return -1
-	}
-
-	apps, err := impl.appRepository.FindAll()
+	jobCount, err := impl.appRepository.FindJobCount()
 	if err != nil {
 		impl.logger.Errorw("error getting all apps for job count", "err", err)
 		return -1
 	}
 
-	jobCount := 0
-	for _, app := range apps {
-		if app.AppType == helper.Job && app.Active {
-			jobCount++
-		}
-	}
-
 	return jobCount
 }
 

internal/sql/repository/app/AppRepository.go

@@ -92,6 +92,8 @@ type AppRepository interface {
 	FindAppAndProjectByIdsIn(ids []int) ([]*App, error)
 	FetchAppIdsByDisplayNamesForJobs(names []string) (map[int]string, []int, error)
 	GetActiveCiCdAppsCount() (int, error)
+	FindDevtronAppCount() (int, error)
+	FindJobCount() (int, error)
 
 	UpdateAppOfferingModeForAppIds(successAppIds []*int, appOfferingMode string, userId int32) error
 }
@@ -520,6 +522,20 @@ func (repo AppRepositoryImpl) GetActiveCiCdAppsCount() (int, error) {
 		Count()
 }
 
+func (repo AppRepositoryImpl) FindDevtronAppCount() (int, error) {
+	return repo.dbConnection.Model(&App{}).
+		Where("active=?", true).
+		Where("app_type=?", helper.CustomApp).
+		Count()
+}
+
+func (repo AppRepositoryImpl) FindJobCount() (int, error) {
+	return repo.dbConnection.Model(&App{}).
+		Where("active=?", true).
+		Where("app_type=?", helper.Job).
+		Count()
+}
+
 func (repo AppRepositoryImpl) UpdateAppOfferingModeForAppIds(successAppIds []*int, appOfferingMode string, userId int32) error {
 	query := "update app set app_offering_mode = ?,updated_by = ?, updated_on = ? where id in (?);"
 	var app *App

pkg/appStore/installedApp/read/InstalledAppReadEAService.go

@@ -36,6 +36,8 @@ type InstalledAppReadServiceEA interface {
 	GetAllArgoAppNamesByDeploymentAppNames(deploymentAppNames []string) ([]string, error)
 	// IsChartStoreAppManagedByArgoCd returns if a chart store app is deployed via argo-cd or not
 	IsChartStoreAppManagedByArgoCd(appId int) (bool, error)
+	// GetActiveInstalledAppCount returns the count of all active installed apps
+	GetActiveInstalledAppCount() (int, error)
 }
 
 type InstalledAppReadServiceEAImpl struct {
@@ -114,3 +116,12 @@ func (impl *InstalledAppReadServiceEAImpl) IsChartStoreAppManagedByArgoCd(appId
 	}
 	return util.IsAcdApp(installedAppModel.DeploymentAppType), nil
 }
+
+func (impl *InstalledAppReadServiceEAImpl) GetActiveInstalledAppCount() (int, error) {
+	count, err := impl.installedAppRepository.GetActiveInstalledAppCount()
+	if err != nil {
+		impl.logger.Errorw("error while getting active installed app count", "error", err)
+		return 0, err
+	}
+	return count, nil
+}

pkg/appStore/installedApp/repository/InstalledAppRepository.go

@@ -170,6 +170,8 @@ type InstalledAppRepository interface {
 	GetInstalledAppsMinByAppId(appId int) (*InstalledApps, error)
 	GetAllArgoAppsByDeploymentAppNames(deploymentAppNames []string) ([]string, error)
 	GetAllAppsByClusterAndDeploymentAppType(clusterIds []int, deploymentAppType string) ([]bean.DeployedInstalledAppInfo, error)
+	// GetActiveInstalledAppCount returns the count of all active installed apps
+	GetActiveInstalledAppCount() (int, error)
 }
 
 type InstalledAppRepositoryImpl struct {
@@ -1085,3 +1087,14 @@ func (impl *InstalledAppRepositoryImpl) GetAllArgoAppsByDeploymentAppNames(deplo
 		Select(&result)
 	return result, err
 }
+
+func (impl *InstalledAppRepositoryImpl) GetActiveInstalledAppCount() (int, error) {
+	var count int
+	countQuery := "SELECT COUNT(*) FROM installed_apps WHERE active = true;"
+	_, err := impl.dbConnection.Query(&count, countQuery)
+	if err != nil {
+		impl.Logger.Errorw("error in getting active installed app count", "err", err)
+		return 0, err
+	}
+	return count, nil
+}