chore: installed app version read service (#6162)

Ash-exp · web-flow · commit c5e8ffd145e8 · 2024-12-13T18:38:11.000+05:30
* chore: refactoring installed app read service

* fix: query from clause issue

* fix: improved query

* fix: info logger

* removed todos

* wip

* chore: wire refactoring

* pointer struct

* renamed IsZero to IsEmpty

* reverted test commit changes
diff --git a/cmd/external-app/wire_gen.go b/cmd/external-app/wire_gen.go
diff --git a/internal/sql/repository/app/AppRepository.go b/internal/sql/repository/app/AppRepository.go
@@ -41,7 +41,7 @@ type App struct {
 	sql.AuditLog
 }
 
-func (app *App) IsZero() bool {
+func (app *App) IsEmpty() bool {
 	if app == nil {
 		return true
 	}
diff --git a/pkg/appStore/discover/repository/AppStoreApplicationVersionRepository.go b/pkg/appStore/discover/repository/AppStoreApplicationVersionRepository.go
@@ -79,6 +79,13 @@ type AppStoreApplicationVersion struct {
 	AppStore         *AppStore
 }
 
+func (a *AppStoreApplicationVersion) IsEmpty() bool {
+	if a == nil {
+		return true
+	}
+	return a.Id == 0
+}
+
 func (impl AppStoreApplicationVersionRepositoryImpl) GetChartInfoById(id int) (*AppStoreApplicationVersion, error) {
 	var appStoreWithVersion AppStoreApplicationVersion
 	err := impl.dbConnection.Model(&appStoreWithVersion).Column("readme", "values_schema_json", "notes", "id").
diff --git a/pkg/appStore/installedApp/read/InstalledAppReadEAService.go b/pkg/appStore/installedApp/read/InstalledAppReadEAService.go
@@ -27,6 +27,11 @@ type InstalledAppReadServiceEA interface {
 	// Only the minimum details are fetched.
 	// Refer bean.InstalledAppMin for more details.
 	GetInstalledAppByInstalledAppVersionId(installedAppVersionId int) (*bean.InstalledAppMin, error)
+	// GetInstalledAppVersionIncludingDeleted will return the installed app version by installed app version id.
+	// Both active and deleted installed app versions are fetched.
+	// Additional details like app store details are also fetched.
+	// Refer bean.InstalledAppVersionWithAppStoreDetails for more details.
+	GetInstalledAppVersionIncludingDeleted(installedAppVersionId int) (*bean.InstalledAppVersionWithAppStoreDetails, error)
 }
 
 type InstalledAppReadServiceEAImpl struct {
@@ -83,3 +88,12 @@ func (impl *InstalledAppReadServiceEAImpl) GetInstalledAppByInstalledAppVersionI
 	}
 	return adapter.GetInstalledAppInternal(installedAppModel).GetInstalledAppMin(), nil
 }
+
+func (impl *InstalledAppReadServiceEAImpl) GetInstalledAppVersionIncludingDeleted(installedAppVersionId int) (*bean.InstalledAppVersionWithAppStoreDetails, error) {
+	installedAppVersionModel, err := impl.installedAppRepository.GetInstalledAppVersionIncludingDeleted(installedAppVersionId)
+	if err != nil {
+		impl.logger.Errorw("error while fetching installed app version by installed app version id", "installedAppVersionId", installedAppVersionId, "error", err)
+		return nil, err
+	}
+	return adapter.GetInstalledAppVersionWithAppStoreDetails(installedAppVersionModel), nil
+}
diff --git a/pkg/appStore/installedApp/read/adapter/adapter.go b/pkg/appStore/installedApp/read/adapter/adapter.go
@@ -15,20 +15,20 @@ func GetInstalledAppInternal(installedAppModel *repository.InstalledApps) *bean.
 	installedAppInternal := &bean.InstalledAppWithEnvAndClusterDetails{}
 	installedAppInternal.InstalledAppMin = GetInstalledAppMin(installedAppModel)
 	// Extra App details
-	if !installedAppModel.App.IsZero() {
+	if !installedAppModel.App.IsEmpty() {
 		installedAppInternal.AppName = installedAppModel.App.AppName
 		installedAppInternal.AppOfferingMode = installedAppModel.App.AppOfferingMode
 		installedAppInternal.TeamId = installedAppModel.App.TeamId
 	}
 	// Extra Environment details
-	if !installedAppModel.Environment.IsZero() {
+	if !installedAppModel.Environment.IsEmpty() {
 		installedAppInternal.EnvironmentName = installedAppModel.Environment.Name
 		installedAppInternal.EnvironmentIdentifier = installedAppModel.Environment.EnvironmentIdentifier
 		installedAppInternal.Namespace = installedAppModel.Environment.Namespace
 		installedAppInternal.ClusterId = installedAppModel.Environment.ClusterId
 	}
 	// Cluster details
-	if !installedAppModel.Environment.Cluster.IsZero() {
+	if !installedAppModel.Environment.Cluster.IsEmpty() {
 		installedAppInternal.ClusterName = installedAppModel.Environment.Cluster.ClusterName
 	}
 	return installedAppInternal
@@ -73,3 +73,38 @@ func GetInstalledAppDeleteRequest(installedAppModel *repository.InstallAppDelete
 		Namespace:       installedAppModel.Namespace,
 	}
 }
+
+// GetInstalledAppVersionMin will return the installed app version minimum details.
+//   - input: installedAppVersionModel *repository.InstalledAppVersions
+//   - returns: *bean.InstalledAppVersionMin
+func GetInstalledAppVersionMin(installedAppVersionModel *repository.InstalledAppVersions) *bean.InstalledAppVersionMin {
+	if installedAppVersionModel == nil {
+		return nil
+	}
+	return &bean.InstalledAppVersionMin{
+		Id:                           installedAppVersionModel.Id,
+		InstalledAppId:               installedAppVersionModel.InstalledAppId,
+		AppStoreApplicationVersionId: installedAppVersionModel.AppStoreApplicationVersionId,
+		ValuesYaml:                   installedAppVersionModel.ValuesYaml,
+		Active:                       installedAppVersionModel.Active,
+		ReferenceValueId:             installedAppVersionModel.ReferenceValueId,
+		ReferenceValueKind:           installedAppVersionModel.ReferenceValueKind,
+	}
+}
+
+// GetInstalledAppVersionWithAppStoreDetails will return the installed app version with app store details.
+//   - input: installedAppVersionModel *repository.InstalledAppVersions
+//   - returns: *bean.InstalledAppVersionWithAppStoreDetails
+func GetInstalledAppVersionWithAppStoreDetails(installedAppVersionModel *repository.InstalledAppVersions) *bean.InstalledAppVersionWithAppStoreDetails {
+	if installedAppVersionModel == nil {
+		return nil
+	}
+	versionDetails := &bean.InstalledAppVersionWithAppStoreDetails{
+		InstalledAppVersionMin: GetInstalledAppVersionMin(installedAppVersionModel),
+	}
+	// Extra App Store Application Version details
+	if !installedAppVersionModel.AppStoreApplicationVersion.IsEmpty() {
+		versionDetails.AppStoreVersion = installedAppVersionModel.AppStoreApplicationVersion.Version
+	}
+	return versionDetails
+}
diff --git a/pkg/appStore/installedApp/read/bean/bean.go b/pkg/appStore/installedApp/read/bean/bean.go
@@ -69,3 +69,20 @@ func (i *InstalledAppWithEnvAndClusterDetails) GetInstalledAppWithEnvDetails() *
 	}
 	return i.InstalledAppWithEnvDetails
 }
+
+type InstalledAppVersionMin struct {
+	// Installed App Version details
+	Id                           int
+	InstalledAppId               int
+	AppStoreApplicationVersionId int
+	ValuesYaml                   string
+	Active                       bool
+	ReferenceValueId             int
+	ReferenceValueKind           string
+}
+
+type InstalledAppVersionWithAppStoreDetails struct {
+	*InstalledAppVersionMin
+	// Extra App Store Version details
+	AppStoreVersion string
+}
diff --git a/pkg/appStore/installedApp/repository/InstalledAppRepository.go b/pkg/appStore/installedApp/repository/InstalledAppRepository.go
@@ -120,7 +120,10 @@ type InstalledAppRepository interface {
 	GetInstalledApp(id int) (*InstalledApps, error)
 	GetInstalledAppsByAppId(appId int) (InstalledApps, error)
 	GetInstalledAppVersion(id int) (*InstalledAppVersions, error)
-	GetInstalledAppVersionAny(id int) (*InstalledAppVersions, error)
+	// GetInstalledAppVersionIncludingDeleted -
+	// For the given installed app version id, it will return the installed app version (both active and inactive)
+	//	- returns InstalledAppVersions by id for both active and inactive versions
+	GetInstalledAppVersionIncludingDeleted(id int) (*InstalledAppVersions, error)
 	GetAllInstalledApps(filter *appStoreBean.AppStoreFilter) ([]InstalledAppsWithChartDetails, error)
 	GetAllInstalledAppsByAppStoreId(appStoreId int) ([]InstalledAppAndEnvDetails, error)
 	GetAllInstalledAppsByChartRepoId(chartRepoId int) ([]InstalledAppAndEnvDetails, error)
@@ -133,7 +136,6 @@ type InstalledAppRepository interface {
 	GetConnection() (dbConnection *pg.DB)
 	GetInstalledAppVersionByInstalledAppIdMeta(installedAppId int) ([]*InstalledAppVersions, error)
 	GetActiveInstalledAppVersionByInstalledAppId(installedAppId int) (*InstalledAppVersions, error)
-	GetLatestInstalledAppVersionByGitHash(gitHash string) (*InstalledAppVersions, error)
 	GetClusterComponentByClusterId(clusterId int) ([]*InstalledApps, error)     //unused
 	GetClusterComponentByClusterIds(clusterIds []int) ([]*InstalledApps, error) //unused
 	GetInstalledAppVersionByAppIdAndEnvId(appId int, envId int) (*InstalledAppVersions, error)
@@ -356,16 +358,6 @@ func (impl *InstalledAppRepositoryImpl) GetActiveInstalledAppVersionByInstalledA
 	return model, err
 }
 
-func (impl *InstalledAppRepositoryImpl) GetLatestInstalledAppVersionByGitHash(gitHash string) (*InstalledAppVersions, error) {
-	model := &InstalledAppVersions{}
-	err := impl.dbConnection.Model(model).
-		Column("installed_app_versions.*", "InstalledApp").
-		Column("AppStoreApplicationVersion.AppStore.ChartRepo").
-		Where("installed_app_versions.git_hash = ?", gitHash).
-		Where("installed_app_versions.active = true").Order("installed_app_versions.id desc").Limit(1).Select()
-	return model, err
-}
-
 func (impl *InstalledAppRepositoryImpl) GetInstalledAppVersion(id int) (*InstalledAppVersions, error) {
 	model := &InstalledAppVersions{}
 	err := impl.dbConnection.Model(model).
@@ -392,8 +384,8 @@ func (impl *InstalledAppRepositoryImpl) GetInstalledAppVersion(id int) (*Install
 	return model, err
 }
 
-// GetInstalledAppVersionAny - returns enable and disabled both version
-func (impl *InstalledAppRepositoryImpl) GetInstalledAppVersionAny(id int) (*InstalledAppVersions, error) {
+// GetInstalledAppVersionIncludingDeleted - returns enable and disabled both versions
+func (impl *InstalledAppRepositoryImpl) GetInstalledAppVersionIncludingDeleted(id int) (*InstalledAppVersions, error) {
 	model := &InstalledAppVersions{}
 	err := impl.dbConnection.Model(model).
 		Column("installed_app_versions.*", "InstalledApp", "InstalledApp.App", "AppStoreApplicationVersion").
diff --git a/pkg/appStore/installedApp/service/EAMode/InstalledAppDBService.go b/pkg/appStore/installedApp/service/EAMode/InstalledAppDBService.go
@@ -362,7 +362,7 @@ func (impl *InstalledAppDBServiceImpl) GetInstalledAppVersion(id int, userId int
 	return installAppVersion, err
 }
 func (impl *InstalledAppDBServiceImpl) GetInstalledAppVersionByIdIncludeDeleted(id int, userId int32) (*appStoreBean.InstallAppVersionDTO, error) {
-	model, err := impl.InstalledAppRepository.GetInstalledAppVersionAny(id)
+	model, err := impl.InstalledAppRepository.GetInstalledAppVersionIncludingDeleted(id)
 	if err != nil {
 		if util.IsErrNoRows(err) {
 			return nil, &util.ApiError{HttpStatusCode: http.StatusBadRequest, Code: "400", UserMessage: "values are outdated. please fetch the latest version and try again", InternalMessage: err.Error()}
diff --git a/pkg/appStore/values/service/AppStoreValuesService.go b/pkg/appStore/values/service/AppStoreValuesService.go
@@ -18,6 +18,7 @@ package service
 
 import (
 	"fmt"
+	installedAppReader "github.com/devtron-labs/devtron/pkg/appStore/installedApp/read"
 	util2 "github.com/devtron-labs/devtron/pkg/appStore/util"
 	"time"
 
@@ -45,17 +46,22 @@ type AppStoreValuesServiceImpl struct {
 	logger                          *zap.SugaredLogger
 	appStoreApplicationRepository   appStoreDiscoverRepository.AppStoreApplicationVersionRepository
 	installedAppRepository          repository.InstalledAppRepository
+	installedAppReadService         installedAppReader.InstalledAppReadServiceEA
 	appStoreVersionValuesRepository appStoreValuesRepository.AppStoreVersionValuesRepository
 	userService                     user.UserService
 }
 
 func NewAppStoreValuesServiceImpl(logger *zap.SugaredLogger,
-	appStoreApplicationRepository appStoreDiscoverRepository.AppStoreApplicationVersionRepository, installedAppRepository repository.InstalledAppRepository,
-	appStoreVersionValuesRepository appStoreValuesRepository.AppStoreVersionValuesRepository, userService user.UserService) *AppStoreValuesServiceImpl {
+	appStoreApplicationRepository appStoreDiscoverRepository.AppStoreApplicationVersionRepository,
+	installedAppRepository repository.InstalledAppRepository,
+	installedAppReadServiceEA installedAppReader.InstalledAppReadServiceEA,
+	appStoreVersionValuesRepository appStoreValuesRepository.AppStoreVersionValuesRepository,
+	userService user.UserService) *AppStoreValuesServiceImpl {
 	return &AppStoreValuesServiceImpl{
 		logger:                          logger,
 		appStoreApplicationRepository:   appStoreApplicationRepository,
 		installedAppRepository:          installedAppRepository,
+		installedAppReadService:         installedAppReadServiceEA,
 		appStoreVersionValuesRepository: appStoreVersionValuesRepository,
 		userService:                     userService,
 	}
@@ -151,15 +157,15 @@ func (impl AppStoreValuesServiceImpl) FindValuesByIdAndKind(referenceId int, kin
 		}
 		return valDto, err
 	} else if kind == appStoreBean.REFERENCE_TYPE_EXISTING {
-		installedAppVersion, err := impl.installedAppRepository.GetInstalledAppVersionAny(referenceId)
+		installedAppVersion, err := impl.installedAppReadService.GetInstalledAppVersionIncludingDeleted(referenceId)
 		if err != nil {
 			impl.logger.Errorw("error in fetching installed App", "id", referenceId, "err", err)
 		}
 		valDto := &appStoreBean.AppStoreVersionValuesDTO{
 			Name:              appStoreBean.REFERENCE_TYPE_EXISTING,
 			Id:                installedAppVersion.Id,
 			Values:            installedAppVersion.ValuesYaml,
-			ChartVersion:      installedAppVersion.AppStoreApplicationVersion.Version,
+			ChartVersion:      installedAppVersion.AppStoreVersion,
 			AppStoreVersionId: installedAppVersion.AppStoreApplicationVersionId,
 		}
 		return valDto, err
diff --git a/pkg/cluster/environment/repository/EnvironmentRepository.go b/pkg/cluster/environment/repository/EnvironmentRepository.go
@@ -49,7 +49,7 @@ type Environment struct {
 	sql.AuditLog
 }
 
-func (environment *Environment) IsZero() bool {
+func (environment *Environment) IsEmpty() bool {
 	if environment == nil {
 		return true
 	}
diff --git a/pkg/cluster/repository/ClusterRepository.go b/pkg/cluster/repository/ClusterRepository.go
@@ -46,7 +46,7 @@ type Cluster struct {
 	sql.AuditLog
 }
 
-func (c *Cluster) IsZero() bool {
+func (c *Cluster) IsEmpty() bool {
 	if c == nil {
 		return true
 	}
diff --git a/wire_gen.go b/wire_gen.go

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ type App struct {`
`41`	`41`	`sql.AuditLog`
`42`	`42`	`}`
`43`	`43`
`44`		`-func (app *App) IsZero() bool {`
	`44`	`+func (app *App) IsEmpty() bool {`
`45`	`45`	`if app == nil {`
`46`	`46`	`return true`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ func (impl *InstalledAppDBServiceImpl) GetInstalledAppVersion(id int, userId int`
`362`	`362`	`return installAppVersion, err`
`363`	`363`	`}`
`364`	`364`	`func (impl InstalledAppDBServiceImpl) GetInstalledAppVersionByIdIncludeDeleted(id int, userId int32) (appStoreBean.InstallAppVersionDTO, error) {`
`365`		`- model, err := impl.InstalledAppRepository.GetInstalledAppVersionAny(id)`
	`365`	`+ model, err := impl.InstalledAppRepository.GetInstalledAppVersionIncludingDeleted(id)`
`366`	`366`	`if err != nil {`
`367`	`367`	`if util.IsErrNoRows(err) {`
`368`	`368`	`return nil, &util.ApiError{HttpStatusCode: http.StatusBadRequest, Code: "400", UserMessage: "values are outdated. please fetch the latest version and try again", InternalMessage: err.Error()}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ type Environment struct {`
`49`	`49`	`sql.AuditLog`
`50`	`50`	`}`
`51`	`51`
`52`		`-func (environment *Environment) IsZero() bool {`
	`52`	`+func (environment *Environment) IsEmpty() bool {`
`53`	`53`	`if environment == nil {`
`54`	`54`	`return true`
`55`	`55`	`}`