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)
-	FetchAppsEnvContainers(envId, limit, offset int) ([]*AppView.AppEnvironmentContainer, error)
+	FetchAppsEnvContainers(envId, limit, offset int, appIds []int) ([]*AppView.AppEnvironmentContainer, error)
 	FetchLastDeployedImage(appId, envId int) (*LastDeployed, error)
 }
 
@@ -137,25 +137,35 @@ func (impl *AppListingRepositoryImpl) FetchOverviewCiPipelines(jobId int) ([]*Ap
 	return jobContainers, nil
 }
 
-func (impl *AppListingRepositoryImpl) FetchAppsEnvContainers(envId, limit, offset int) ([]*AppView.AppEnvironmentContainer, error) {
+func (impl *AppListingRepositoryImpl) FetchAppsEnvContainers(envId int, limit, offset int, appIds []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 = ? 
 		 LEFT JOIN app_status aps ON aps.app_id = a.id and aps.env_id = ? 
 		 LEFT JOIN 
 		 (SELECT pco.pipeline_id,MAX(pco.created_on) as last_deployed_time from pipeline_config_override pco 
 		 GROUP BY pco.pipeline_id) ld ON ld.pipeline_id = p.id 
-		 WHERE a.active = true 
-		 ORDER BY a.app_name `
+		 WHERE a.active = true`
+
 	queryParams := []interface{}{envId, envId}
+
+	// Add app IDs filter if provided
+	if len(appIds) > 0 {
+		query += " AND a.id IN (?)"
+		queryParams = append(queryParams, pg.In(appIds))
+	}
+
+	query += " ORDER BY a.app_name"
+
 	if limit > 0 {
-		query += fmt.Sprintf("LIMIT ? ")
+		query += " LIMIT ?"
 		queryParams = append(queryParams, limit)
 	}
 	if offset > 0 {
-		query += fmt.Sprintf("OFFSET ? ")
+		query += " OFFSET ?"
 		queryParams = append(queryParams, offset)
 	}
+
 	var envContainers []*AppView.AppEnvironmentContainer
 	_, err := impl.dbConnection.Query(&envContainers, query, queryParams...)
 	return envContainers, err

pkg/app/AppListingService.go

@@ -233,7 +233,8 @@ func (impl AppListingServiceImpl) FetchOverviewAppsByEnvironment(envId, limit, o
 			resp.CreatedBy = fmt.Sprintf("%s (inactive)", createdBy.EmailId)
 		}
 	}
-	envContainers, err := impl.FetchAppsEnvContainers(envId, limit, offset)
+	var appIds []int
+	envContainers, err := impl.FetchAppsEnvContainers(envId, limit, offset, appIds)
 	if err != nil {
 		impl.Logger.Errorw("failed to fetch env containers", "err", err, "envId", envId)
 		return resp, err
@@ -287,8 +288,8 @@ 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)
+func (impl AppListingServiceImpl) FetchAppsEnvContainers(envId, limit, offset int, appIds []int) ([]*AppView.AppEnvironmentContainer, error) {
+	envContainers, err := impl.appListingRepository.FetchAppsEnvContainers(envId, limit, offset, appIds)
 	if err != nil {
 		impl.Logger.Errorw("failed to fetch environment containers", "err", err, "envId", envId)
 		return nil, err