refactor

Author: prkhrkat

internal/sql/repository/AppListingRepository.go

@@ -51,7 +51,7 @@ type AppListingRepository interface {
 	DeploymentDetailByArtifactId(ciArtifactId int, envId int) (AppView.DeploymentDetailContainer, error)
 	FindAppCount(isProd bool) (int, error)
 	FetchAppsByEnvironmentV2(appListingFilter helper.AppListingFilter) ([]*AppView.AppEnvironmentContainer, int, error)
-	FetchOverviewAppsByEnvironment(envId, limit, offset int) ([]*AppView.AppEnvironmentContainer, error)
+	FetchAppsEnvContainers(envId, limit, offset int) ([]*AppView.AppEnvironmentContainer, error)
 	FetchLastDeployedImage(appId, envId int) (*LastDeployed, error)
 }
 
@@ -137,7 +137,7 @@ func (impl *AppListingRepositoryImpl) FetchOverviewCiPipelines(jobId int) ([]*Ap
 	return jobContainers, nil
 }
 
-func (impl *AppListingRepositoryImpl) FetchOverviewAppsByEnvironment(envId, limit, offset int) ([]*AppView.AppEnvironmentContainer, error) {
+func (impl *AppListingRepositoryImpl) FetchAppsEnvContainers(envId, limit, offset int) ([]*AppView.AppEnvironmentContainer, error) {
 	query := ` SELECT a.id as app_id,a.app_name,aps.status as app_status, ld.last_deployed_time, p.id as pipeline_id 
 		 FROM app a 
 		 INNER JOIN pipeline p ON p.app_id = a.id and p.deleted = false and p.environment_id = ? 

pkg/app/AppListingService.go

@@ -233,15 +233,9 @@ func (impl AppListingServiceImpl) FetchOverviewAppsByEnvironment(envId, limit, o
 			resp.CreatedBy = fmt.Sprintf("%s (inactive)", createdBy.EmailId)
 		}
 	}
-	envContainers, err := impl.appListingRepository.FetchOverviewAppsByEnvironment(envId, limit, offset)
+	envContainers, err := impl.FetchAppsEnvContainers(envId, limit, offset)
 	if err != nil {
-		impl.Logger.Errorw("failed to fetch environment containers", "err", err, "envId", envId)
-		return resp, err
-	}
-
-	err = impl.updateAppStatusForHelmTypePipelines(envContainers)
-	if err != nil {
-		impl.Logger.Errorw("err, updateAppStatusForHelmTypePipelines", "envId", envId, "err", err)
+		impl.Logger.Errorw("failed to fetch env containers", "err", err, "envId", envId)
 		return resp, err
 	}
 
@@ -293,6 +287,21 @@ func getUniqueArtifacts(artifactIds []int) (uniqueArtifactIds []int) {
 	return uniqueArtifactIds
 }
 
+func (impl AppListingServiceImpl) FetchAppsEnvContainers(envId, limit, offset int) ([]*AppView.AppEnvironmentContainer, error) {
+	envContainers, err := impl.appListingRepository.FetchAppsEnvContainers(envId, limit, offset)
+	if err != nil {
+		impl.Logger.Errorw("failed to fetch environment containers", "err", err, "envId", envId)
+		return nil, err
+	}
+
+	err = impl.updateAppStatusForHelmTypePipelines(envContainers)
+	if err != nil {
+		impl.Logger.Errorw("err, updateAppStatusForHelmTypePipelines", "envId", envId, "err", err)
+		return nil, err
+	}
+	return envContainers, nil
+}
+
 func (impl AppListingServiceImpl) FetchAllDevtronManagedApps() ([]AppNameTypeIdContainer, error) {
 	impl.Logger.Debug("reached at FetchAllDevtronManagedApps:")
 	apps := make([]AppNameTypeIdContainer, 0)