fix(controlplane): apply owner_id replacements to base used in query (ineffassign)

mekilis · mekilis · commit 43e41654d7a2 · 2026-02-12T15:39:55.000+01:00
diff --git a/database/postgres/event.go b/database/postgres/event.go
@@ -596,12 +596,12 @@ func (e *eventRepo) LoadEventsPaged(ctx context.Context, projectID string, filte
 		}
 		query = fmt.Sprintf(existsPagination, baseEventsPagedExists, filterQueryNoEndpoint, existsSubquery, preOrder, filter.Pageable.SortOrder(), preOrder, filter.Pageable.SortOrder())
 	} else {
+		base = baseEventsSearch
 		if len(filter.OwnerID) == 0 {
 			base = strings.Replace(base, "with endpoint_ids as (select id from convoy.endpoints where owner_id = :owner_id),", "with ", 1)
 			base = strings.Replace(base, "endpoint_ids", "convoy.endpoints", 1)
 		}
 		filterQuery += searchFilter
-		base = baseEventsSearch
 		query = fmt.Sprintf(baseQueryPagination, base, filterQuery, preOrder, filter.Pageable.SortOrder(), preOrder, filter.Pageable.SortOrder())
 	}
 	query, args, err = sqlx.Named(query, arg)

Original file line number	Diff line number	Diff line change
`@@ -596,12 +596,12 @@ func (e *eventRepo) LoadEventsPaged(ctx context.Context, projectID string, filte`
`596`	`596`	`}`
`597`	`597`	`query = fmt.Sprintf(existsPagination, baseEventsPagedExists, filterQueryNoEndpoint, existsSubquery, preOrder, filter.Pageable.SortOrder(), preOrder, filter.Pageable.SortOrder())`
`598`	`598`	`} else {`
	`599`	`+ base = baseEventsSearch`
`599`	`600`	`if len(filter.OwnerID) == 0 {`
`600`	`601`	`base = strings.Replace(base, "with endpoint_ids as (select id from convoy.endpoints where owner_id = :owner_id),", "with ", 1)`
`601`	`602`	`base = strings.Replace(base, "endpoint_ids", "convoy.endpoints", 1)`
`602`	`603`	`}`
`603`	`604`	`filterQuery += searchFilter`
`604`		`- base = baseEventsSearch`
`605`	`605`	`query = fmt.Sprintf(baseQueryPagination, base, filterQuery, preOrder, filter.Pageable.SortOrder(), preOrder, filter.Pageable.SortOrder())`
`606`	`606`	`}`
`607`	`607`	`query, args, err = sqlx.Named(query, arg)`