develop sync change

Author: kartik-579

internal/sql/repository/CiArtifactRepository.go

@@ -362,8 +362,8 @@ func (impl CiArtifactRepositoryImpl) GetArtifactsByCDPipelineV3(listingFilterOpt
 	artifactsResp := make([]*CiArtifactWithExtraData, 0, listingFilterOpts.Limit)
 	var artifacts []*CiArtifact
 	totalCount := 0
-	finalQuery := BuildQueryForParentTypeCIOrWebhook(*listingFilterOpts)
-	_, err := impl.dbConnection.Query(&artifactsResp, finalQuery)
+	finalQuery, finalQueryParams := BuildQueryForParentTypeCIOrWebhook(*listingFilterOpts)
+	_, err := impl.dbConnection.Query(&artifactsResp, finalQuery, finalQueryParams...)
 	if err != nil {
 		return nil, totalCount, err
 	}

internal/sql/repository/CiArtifactsListingQueryBuilder.go

@@ -25,8 +25,8 @@ import (
 
 const EmptyLikeRegex = "%%"
 
-func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilterOptions) string {
-	commonPaginatedQueryPart, commonPaginatedQueryParams := " cia.image LIKE '?'", []interface{}{listingFilterOpts.SearchString}
+func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilterOptions) (string, []interface{}) {
+	commonPaginatedQueryPart, commonPaginatedQueryParams := " cia.image LIKE ?", []interface{}{listingFilterOpts.SearchString}
 	orderByClause := " ORDER BY cia.id DESC"
 	limitOffsetQueryPart, limitOffsetQueryParams := fmt.Sprintf(" LIMIT ? OFFSET ?"), []interface{}{listingFilterOpts.Limit, listingFilterOpts.Offset}
 	finalQuery := ""
@@ -68,7 +68,7 @@ func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilt
 	finalQueryParams = append(finalQueryParams, remainingQueryParams...)
 	finalQueryParams = append(finalQueryParams, commonPaginatedQueryParams...)
 	finalQueryParams = append(finalQueryParams, limitOffsetQueryParams...)
-	return finalQuery
+	return finalQuery, finalQueryParams
 }
 
 func BuildQueryForArtifactsForCdStage(listingFilterOptions bean.ArtifactsListFilterOptions) string {

pkg/auth/user/repository/helper/UserRepositoryQueryBuilder.go

@@ -108,7 +108,7 @@ func GetQueryForGroupListingWithFilters(req *bean.ListingRequest) (string, []int
 func GetEmailSearchQuery(usersTableAlias string, emailId string) (string, []interface{}) {
 	queryParams := []interface{}{emailId, emailId}
 	expression := fmt.Sprintf(
-		"( (%s.user_type is NULL and %s.email_id ILIKE '?' ) or (%s.user_type='apiToken' and %s.email_id='?') )",
+		"( (%s.user_type is NULL and %s.email_id ILIKE ? ) or (%s.user_type='apiToken' and %s.email_id=?) )",
 		usersTableAlias, usersTableAlias, usersTableAlias, usersTableAlias)
 	return expression, queryParams
 }