From fb7ee70b8863d1c57e9a237387dcb7257458fcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Thu, 8 Apr 2021 14:15:23 +0200
Subject: [PATCH] Make query search for include instead of prefix

---
 store/rdbms/applications.go         |  2 +-
 store/rdbms/automation_workflows.go |  2 +-
 store/rdbms/roles.go                |  2 +-
 store/rdbms/templates.go            | 11 +++++++----
 store/rdbms/users.go                |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/store/rdbms/applications.go b/store/rdbms/applications.go
index bc56e55f4..a575e01a1 100644
--- a/store/rdbms/applications.go
+++ b/store/rdbms/applications.go
@@ -23,7 +23,7 @@ func (s Store) convertApplicationFilter(f types.ApplicationFilter) (query squirr
 	}
 
 	if f.Query != "" {
-		qs := f.Query + "%"
+		qs := "%" + f.Query + "%"
 		query = query.Where(squirrel.Or{
 			squirrel.Like{"app.name": qs},
 		})
diff --git a/store/rdbms/automation_workflows.go b/store/rdbms/automation_workflows.go
index c9d7e6268..2b73eb5c1 100644
--- a/store/rdbms/automation_workflows.go
+++ b/store/rdbms/automation_workflows.go
@@ -21,7 +21,7 @@ func (s Store) convertAutomationWorkflowFilter(f types.WorkflowFilter) (query sq
 	}
 
 	if f.Query != "" {
-		qs := f.Query + "%"
+		qs := "%" + f.Query + "%"
 		query = query.Where(squirrel.Or{
 			squirrel.Like{"atmwf.handle": qs},
 		})
diff --git a/store/rdbms/roles.go b/store/rdbms/roles.go
index 2283a61fe..0379365f1 100644
--- a/store/rdbms/roles.go
+++ b/store/rdbms/roles.go
@@ -26,7 +26,7 @@ func (s Store) convertRoleFilter(f types.RoleFilter) (query squirrel.SelectBuild
 	}
 
 	if f.Query != "" {
-		qs := f.Query + "%"
+		qs := "%" + f.Query + "%"
 		query = query.Where(squirrel.Or{
 			squirrel.Like{"rl.name": qs},
 			squirrel.Like{"rl.handle": qs},
diff --git a/store/rdbms/templates.go b/store/rdbms/templates.go
index 08e996f12..981b85924 100644
--- a/store/rdbms/templates.go
+++ b/store/rdbms/templates.go
@@ -11,6 +11,10 @@ func (s Store) convertTemplateFilter(f types.TemplateFilter) (query squirrel.Sel
 
 	query = filter.StateCondition(query, "tpl.deleted_at", f.Deleted)
 
+	if len(f.TemplateID) > 0 {
+		query = query.Where(squirrel.Eq{"tpl.id": f.TemplateID})
+	}
+
 	if len(f.LabeledIDs) > 0 {
 		query = query.Where(squirrel.Eq{"tpl.id": f.LabeledIDs})
 	}
@@ -19,15 +23,14 @@ func (s Store) convertTemplateFilter(f types.TemplateFilter) (query squirrel.Sel
 		query = query.Where(squirrel.Eq{"tpl.partial": true})
 	}
 
-	if len(f.TemplateID) > 0 {
-		query = query.Where(squirrel.Eq{"tpl.id": f.TemplateID})
-	}
 	if f.Handle != "" {
-		query = query.Where(squirrel.Eq{"tpl.handle": f.Handle})
+		query = query.Where(squirrel.Like{"tpl.handle": "%" + f.Handle + "%"})
 	}
+
 	if f.Type != "" {
 		query = query.Where(squirrel.Eq{"tpl.type": f.Type})
 	}
+
 	if f.OwnerID > 0 {
 		query = query.Where(squirrel.Eq{"tpl.rel_owner": f.OwnerID})
 	}
diff --git a/store/rdbms/users.go b/store/rdbms/users.go
index 8a4765e75..2fb6cc46e 100644
--- a/store/rdbms/users.go
+++ b/store/rdbms/users.go
@@ -34,7 +34,7 @@ func (s Store) convertUserFilter(f types.UserFilter) (query squirrel.SelectBuild
 	}
 
 	if f.Query != "" {
-		qs := f.Query + "%"
+		qs := "%" + f.Query + "%"
 		query = query.Where(squirrel.Or{
 			squirrel.Like{"usr.username": qs},
 			squirrel.Like{"usr.handle": qs},