migration renaming

(cherry picked from commit c2e625e2ea0aa1feb3d655dd8f28fbf28c96c43a)

Author: mayank-devtron

internal/sql/repository/helper/AppListingRepositoryQueryBuilder.go

@@ -45,18 +45,18 @@ func NewAppListingRepositoryQueryBuilder(logger *zap.SugaredLogger) AppListingRe
 }
 
 type AppListingFilter struct {
-	Environments      []int    `json:"environments"`
-	Statuses          []string `json:"statutes"`
-	Teams             []int    `json:"teams"`
-	AppStatuses       []string `json:"appStatuses"`
+	Environments      []int       `json:"environments"`
+	Statuses          []string    `json:"statutes"`
+	Teams             []int       `json:"teams"`
+	AppStatuses       []string    `json:"appStatuses"`
 	TagFilters        []TagFilter `json:"tagFilters"`
-	AppNameSearch     string    `json:"appNameSearch"`
-	SortOrder         SortOrder `json:"sortOrder"`
-	SortBy            SortBy    `json:"sortBy"`
-	Offset            int       `json:"offset"`
-	Size              int       `json:"size"`
-	DeploymentGroupId int       `json:"deploymentGroupId"`
-	AppIds            []int     `json:"-"` // internal use only
+	AppNameSearch     string      `json:"appNameSearch"`
+	SortOrder         SortOrder   `json:"sortOrder"`
+	SortBy            SortBy      `json:"sortBy"`
+	Offset            int         `json:"offset"`
+	Size              int         `json:"size"`
+	DeploymentGroupId int         `json:"deploymentGroupId"`
+	AppIds            []int       `json:"-"` // internal use only
 }
 
 type SortBy string
@@ -317,11 +317,6 @@ func (impl AppListingRepositoryQueryBuilder) buildAppListingWhereCondition(appLi
 	whereCondition += tagWhereCondition
 	queryParams = append(queryParams, tagQueryParams...)
 
-	// Future OR support placeholder (intentionally disabled today):
-	// orTagWhereCondition, orTagQueryParams := impl.buildTagFiltersWhereConditionOR(appListingFilter.TagFilters)
-	// whereCondition += orTagWhereCondition
-	// queryParams = append(queryParams, orTagQueryParams...)
-
 	if len(appListingFilter.AppIds) > 0 {
 		whereCondition += " and a.id IN (?) "
 		queryParams = append(queryParams, pg.In(appListingFilter.AppIds))
@@ -344,22 +339,6 @@ func (impl AppListingRepositoryQueryBuilder) buildTagFiltersWhereConditionAND(ta
 	return queryBuilder.String(), queryParams
 }
 
-// buildTagFiltersWhereConditionOR is intentionally unused today.
-// It is kept as documented dead code so switching to OR in future is straightforward.
-func (impl AppListingRepositoryQueryBuilder) buildTagFiltersWhereConditionOR(tagFilters []TagFilter) (string, []interface{}) {
-	if len(tagFilters) == 0 {
-		return "", nil
-	}
-	clauses := make([]string, 0, len(tagFilters))
-	queryParams := make([]interface{}, 0, len(tagFilters)*2)
-	for _, tagFilter := range tagFilters {
-		predicate, predicateParams := impl.buildTagFilterPredicate(tagFilter)
-		clauses = append(clauses, predicate)
-		queryParams = append(queryParams, predicateParams...)
-	}
-	return " and (" + strings.Join(clauses, " OR ") + ") ", queryParams
-}
-
 // buildTagFilterPredicate converts one UI tag filter row into a SQL predicate.
 // Operator behavior (all case-sensitive):
 // - EQUALS: key exists with exact value match.

internal/sql/repository/helper/AppListingRepositoryQueryBuilder_tag_filters_test.go

@@ -1,7 +1,6 @@
 package helper
 
 import (
-	"fmt"
 	"go.uber.org/zap"
 	"testing"
 
@@ -38,17 +37,6 @@ func TestBuildAppListingWhereCondition_WithTagFiltersAnd(t *testing.T) {
 	require.Equal(t, "zone", queryParams[7])
 }
 
-func TestBuildTagFiltersWhereConditionOR(t *testing.T) {
-	queryBuilder := NewAppListingRepositoryQueryBuilder(zap.NewNop().Sugar())
-	whereClause, queryParams := queryBuilder.buildTagFiltersWhereConditionOR([]TagFilter{
-		{Key: "owner", Operator: TagFilterOperatorEquals, Value: stringPointer("James")},
-		{Key: "cost-center", Operator: TagFilterOperatorContains, Value: stringPointer("ENG")},
-	})
-
-	require.Equal(t, " and (EXISTS (SELECT 1 FROM app_label al WHERE al.app_id = a.id and al.key = ? and al.value = ?) OR EXISTS (SELECT 1 FROM app_label al WHERE al.app_id = a.id and al.key = ? and al.value LIKE ? ESCAPE '\\')) ", whereClause)
-	require.Equal(t, []interface{}{"owner", "James", "cost-center", "%ENG%"}, queryParams)
-}
-
 func TestBuildTagFilterPredicate_DoesNotEqualRequiresKeyAndDifferentValue(t *testing.T) {
 	queryBuilder := NewAppListingRepositoryQueryBuilder(zap.NewNop().Sugar())
 	value := "mayank"
@@ -76,28 +64,3 @@ func TestBuildTagFilterPredicate_DoesNotContainRequiresKeyAndNotLike(t *testing.
 	require.Equal(t, "EXISTS (SELECT 1 FROM app_label al WHERE al.app_id = a.id and al.key = ? and al.value NOT LIKE ? ESCAPE '\\')", predicate)
 	require.Equal(t, []interface{}{"owner", "%may%"}, queryParams)
 }
-
-func BenchmarkBuildAppListingQueryWithTagFilters(b *testing.B) {
-	queryBuilder := NewAppListingRepositoryQueryBuilder(zap.NewNop().Sugar())
-	tagFilters := make([]TagFilter, 0, 10)
-	for i := 0; i < 10; i++ {
-		value := fmt.Sprintf("value-%d", i)
-		tagFilters = append(tagFilters, TagFilter{
-			Key:      fmt.Sprintf("key-%d", i),
-			Operator: TagFilterOperatorContains,
-			Value:    &value,
-		})
-	}
-	appListingFilter := AppListingFilter{
-		TagFilters: tagFilters,
-		SortBy:     AppNameSortBy,
-		SortOrder:  Asc,
-		Offset:     0,
-		Size:       20,
-	}
-
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		_, _ = queryBuilder.GetAppIdsQueryWithPaginationForAppNameSearch(appListingFilter)
-	}
-}

pkg/app/AppListingService.go

@@ -420,11 +420,6 @@ func (impl AppListingServiceImpl) FetchAppsByEnvironmentV2(fetchAppListingReques
 	if len(fetchAppListingRequest.Namespaces) != 0 && len(fetchAppListingRequest.Environments) == 0 {
 		return []*AppView.AppEnvironmentContainer{}, 0, nil
 	}
-	normalizedTagFilters, err := NormalizeAndValidateTagFilters(fetchAppListingRequest.TagFilters)
-	if err != nil {
-		return []*AppView.AppEnvironmentContainer{}, 0, err
-	}
-	fetchAppListingRequest.TagFilters = normalizedTagFilters
 
 	// Currently AppStatus is available in Db for only ArgoApps
 	// We fetch AppStatus on the fly for Helm Apps from scoop, So AppStatus filter will be applied in last