fix: Add regex prepare name for search in user and component

swibly · Nov 2, 2024 · d536036 · d536036
1 parent 96de5f8
commit d536036
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/internal/service/repository/component.go b/internal/service/repository/component.go
@@ -488,7 +488,13 @@ func (cr *componentRepository) Search(issuerID uint, search *dto.SearchComponent
         regexp_like(u.first_name, ?, 'i') OR
         regexp_like(u.last_name, ?, 'i') OR
         regexp_like(u.username, ?, 'i')
-      )`, *search.Name, *search.Name, *search.Name, *search.Name, *search.Name)
+      )`,
+				utils.RegexPrepareName(*search.Name),
+				utils.RegexPrepareName(*search.Name),
+				utils.RegexPrepareName(*search.Name),
+				utils.RegexPrepareName(*search.Name),
+				utils.RegexPrepareName(*search.Name),
+			)
 
 		// TODO: Create ranking system
 	}

diff --git a/internal/service/repository/user.go b/internal/service/repository/user.go
@@ -6,6 +6,7 @@ import (
 	"github.com/swibly/swibly-api/pkg/aws"
 	"github.com/swibly/swibly-api/pkg/db"
 	"github.com/swibly/swibly-api/pkg/pagination"
+	"github.com/swibly/swibly-api/pkg/utils"
 	"gorm.io/gorm"
 )
 
@@ -88,7 +89,12 @@ func (u userRepository) Search(issuerID uint, search *dto.SearchUser, page, perp
 		Where("show_profile = TRUE")
 
 	if search.Name != nil {
-		query = query.Where("regexp_like(first_name, ?, 'i') OR regexp_like(last_name, ?, 'i') OR regexp_like(username, ?, 'i')", *search.Name, *search.Name, *search.Name)
+		query = query.Where(
+			"regexp_like(first_name, ?, 'i') OR regexp_like(last_name, ?, 'i') OR regexp_like(username, ?, 'i')",
+			utils.RegexPrepareName(*search.Name),
+			utils.RegexPrepareName(*search.Name),
+			utils.RegexPrepareName(*search.Name),
+		)
 
 		// TODO: Create ranking system
 	}