code review changes:- deploymentConfigService

Author: prakash100198

internal/sql/repository/deploymentConfig/repository.go

@@ -17,6 +17,7 @@
 package deploymentConfig
 
 import (
+	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/go-pg/pg"
 	"github.com/go-pg/pg/orm"
@@ -63,6 +64,7 @@ type Repository interface {
 	GetByAppIdAndEnvIdEvenIfInactive(appId, envId int) (*DeploymentConfig, error)
 	UpdateRepoUrlByAppIdAndEnvId(repoUrl string, appId, envId int) error
 	GetConfigByAppIds(appIds []int) ([]*DeploymentConfig, error)
+	GetDeploymentAppTypeForChartStoreAppByAppId(appId int) (string, error)
 }
 
 type RepositoryImpl struct {
@@ -203,3 +205,16 @@ func (impl *RepositoryImpl) GetConfigByAppIds(appIds []int) ([]*DeploymentConfig
 		Select()
 	return results, err
 }
+
+func (impl *RepositoryImpl) GetDeploymentAppTypeForChartStoreAppByAppId(appId int) (string, error) {
+	result := &DeploymentConfig{}
+	err := impl.dbConnection.Model(result).
+		Join("inner join app a").
+		JoinOn("deployment_config.app_id = a.id").
+		Where("deployment_config.app_id = ? ", appId).
+		Where("deployment_config.active = ?", true).
+		Where("a.active = ?", true).
+		Where("a.app_type = ? ", helper.ChartStoreApp).
+		Select()
+	return result.DeploymentAppType, err
+}

pkg/app/AppCrudOperationService.go

@@ -497,7 +497,7 @@ func (impl AppCrudOperationServiceImpl) getAppAndProjectForAppIdentifier(appIden
 		}
 		// there can be a case when an app whose installed_app is deployed via argocd and same appName is also deployed externally
 		// via helm then we need to check if app model found is not deployed by argocd.
-		isManagedByArgocd, err := impl.installedAppDbService.IsInstalledAppManagedByArgoCd(app.Id)
+		isManagedByArgocd, err := impl.installedAppDbService.IsChartStoreAppManagedByArgoCd(app.Id)
 		if err != nil {
 			impl.logger.Errorw("error in checking if installed app linked to this app is managed via argocd or not ", "appId", app.Id, "err", err)
 			return app, false, err

pkg/appStore/installedApp/read/InstalledAppReadEAService.go

@@ -1,6 +1,7 @@
 package read
 
 import (
+	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/read/adapter"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/read/bean"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
@@ -32,6 +33,8 @@ type InstalledAppReadServiceEA interface {
 	// Additional details like app store details are also fetched.
 	// Refer bean.InstalledAppVersionWithAppStoreDetails for more details.
 	GetInstalledAppVersionIncludingDeleted(installedAppVersionId int) (*bean.InstalledAppVersionWithAppStoreDetails, error)
+	// IsChartStoreAppManagedByArgoCd returns if a chart store app is deployed via argo-cd or not
+	IsChartStoreAppManagedByArgoCd(appId int) (bool, error)
 }
 
 type InstalledAppReadServiceEAImpl struct {
@@ -97,3 +100,12 @@ func (impl *InstalledAppReadServiceEAImpl) GetInstalledAppVersionIncludingDelete
 	}
 	return adapter.GetInstalledAppVersionWithAppStoreDetails(installedAppVersionModel), nil
 }
+
+func (impl *InstalledAppReadServiceEAImpl) IsChartStoreAppManagedByArgoCd(appId int) (bool, error) {
+	installedAppModel, err := impl.installedAppRepository.GetInstalledAppsMinByAppId(appId)
+	if err != nil {
+		impl.logger.Errorw("error while fetching installed apps by app id", "appId", appId, "error", err)
+		return false, err
+	}
+	return util.IsAcdApp(installedAppModel.DeploymentAppType), nil
+}

pkg/appStore/installedApp/service/EAMode/InstalledAppDBService.go

@@ -70,7 +70,7 @@ type InstalledAppDBService interface {
 	GetInstalledAppVersionHistoryByVersionId(id int) ([]*appStoreRepo.InstalledAppVersionHistory, error)
 	UpdateDeploymentHistoryMessage(installedAppVersionHistoryId int, message string) error
 
-	IsInstalledAppManagedByArgoCd(appId int) (bool, error)
+	IsChartStoreAppManagedByArgoCd(appId int) (bool, error)
 }
 
 type InstalledAppDBServiceImpl struct {
@@ -536,11 +536,6 @@ func (impl *InstalledAppDBServiceImpl) MarkInstalledAppVersionModelInActive(inst
 	return nil
 }
 
-func (impl *InstalledAppDBServiceImpl) IsInstalledAppManagedByArgoCd(appId int) (bool, error) {
-	installedApp, err := impl.InstalledAppRepository.GetInstalledAppsMinByAppId(appId)
-	if err != nil {
-		impl.Logger.Errorw("error while fetching installed_app min data by appId", "appId", appId, "error", err)
-		return false, err
-	}
-	return util.IsAcdApp(installedApp.DeploymentAppType), nil
+func (impl *InstalledAppDBServiceImpl) IsChartStoreAppManagedByArgoCd(appId int) (bool, error) {
+	return impl.deploymentConfigService.IsChartStoreAppManagedByArgoCd(appId)
 }

pkg/deployment/common/deploymentConfigService.go

@@ -39,6 +39,7 @@ type DeploymentConfigService interface {
 	GetConfigForDevtronApps(appId, envId int) (*bean.DeploymentConfig, error)
 	GetAndMigrateConfigIfAbsentForDevtronApps(appId, envId int) (*bean.DeploymentConfig, error)
 	GetConfigForHelmApps(appId, envId int) (*bean.DeploymentConfig, error)
+	IsChartStoreAppManagedByArgoCd(appId int) (bool, error)
 	GetConfigEvenIfInactive(appId, envId int) (*bean.DeploymentConfig, error)
 	GetAndMigrateConfigIfAbsentForHelmApp(appId, envId int) (*bean.DeploymentConfig, error)
 	GetAppLevelConfigForDevtronApp(appId int) (*bean.DeploymentConfig, error)
@@ -387,6 +388,20 @@ func (impl *DeploymentConfigServiceImpl) GetConfigForHelmApps(appId, envId int)
 	return ConvertDeploymentConfigDbObjToDTO(helmDeploymentConfig), nil
 }
 
+func (impl *DeploymentConfigServiceImpl) IsChartStoreAppManagedByArgoCd(appId int) (bool, error) {
+	if impl.deploymentServiceTypeConfig.UseDeploymentConfigData {
+		return impl.installedAppReadService.IsChartStoreAppManagedByArgoCd(appId)
+	}
+	deploymentAppType, err := impl.deploymentConfigRepository.GetDeploymentAppTypeForChartStoreAppByAppId(appId)
+	if err != nil && !util2.IsErrNoRows(err) {
+		impl.logger.Errorw("error in GetDeploymentAppTypeForChartStoreAppByAppId", "appId", appId, "err", err)
+		return false, err
+	} else if util2.IsErrNoRows(err) {
+		return impl.installedAppReadService.IsChartStoreAppManagedByArgoCd(appId)
+	}
+	return util2.IsAcdApp(deploymentAppType), nil
+}
+
 func (impl *DeploymentConfigServiceImpl) GetConfigEvenIfInactive(appId, envId int) (*bean.DeploymentConfig, error) {
 	config, err := impl.deploymentConfigRepository.GetByAppIdAndEnvIdEvenIfInactive(appId, envId)
 	if err != nil {