add partial search for description (#3195)

* add partial search for description * add contains func * escape contains search --------- Co-authored-by: Lakshmi V <[email protected]> Co-authored-by: Nathaniel Caza <[email protected]>
target · Oct 13, 2023 · 4b95ef8 · 4b95ef8
1 parent 3671734
commit 4b95ef8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/escalation/search.go b/escalation/search.go
@@ -55,7 +55,7 @@ var searchTemplate = template.Must(template.New("search").Funcs(search.Helpers()
 		AND NOT pol.id = any(:omit)
 	{{end}}
 	{{if .Search}}
-		AND {{orderedPrefixSearch "search" "pol.name"}}
+		AND ({{orderedPrefixSearch "search" "pol.name"}} OR {{contains "search" "pol.description"}})
 	{{end}}
 	{{if .After.Name}}
 		AND

diff --git a/schedule/rotation/search.go b/schedule/rotation/search.go
@@ -57,7 +57,7 @@ var searchTemplate = template.Must(template.New("search").Funcs(search.Helpers()
 		AND NOT rot.id = any(:omit)
 	{{end}}
 	{{if .Search}}
-		AND {{orderedPrefixSearch "search" "rot.name"}}
+		AND ({{orderedPrefixSearch "search" "rot.name"}} OR {{contains "search" "rot.description"}})
 	{{end}}
 	{{if .After.Name}}
 		AND

diff --git a/schedule/search.go b/schedule/search.go
@@ -56,7 +56,7 @@ var searchTemplate = template.Must(template.New("search").Funcs(search.Helpers()
 		AND NOT sched.id = any(:omit)
 	{{end}}
 	{{if .Search}}
-		AND {{orderedPrefixSearch "search" "sched.name"}}
+		AND ({{orderedPrefixSearch "search" "sched.name"}} OR {{contains "search" "sched.description"}})
 	{{end}}
 	{{if .After.Name}}
 		AND

diff --git a/search/render.go b/search/render.go
@@ -26,6 +26,14 @@ func Helpers() template.FuncMap {
 		"orderedPrefixSearch": func(argName string, columnName string) string {
 			return fmt.Sprintf("lower(%s) ~ :~%s", columnName, argName)
 		},
+		"contains": func(argName string, columnName string) string {
+			// search for the term in the column
+			//
+			// - case insensitive
+			// - allow for partial matches
+			// - escape % and _ using `\` (backslash -- the default escape character)
+			return fmt.Sprintf(`%s ilike '%%' || REPLACE(REPLACE(REPLACE(:%s, '\', '\\'), '%%', '\%%'), '_', '\_') || '%%'`, columnName, argName)
+		},
 		"textSearch": func(argName string, columnNames ...string) string {
 			var buf strings.Builder
 			buf.WriteRune('(')

diff --git a/service/search.go b/service/search.go
@@ -78,7 +78,7 @@ var searchTemplate = template.Must(template.New("search").Funcs(search.Helpers()
 		)
 	{{end}}
 	{{- if and .Search (not .LabelKey) (not .IntegrationKey)}}
-		AND {{orderedPrefixSearch "search" "svc.name"}}
+		AND ({{orderedPrefixSearch "search" "svc.name"}} OR {{contains "search" "svc.description"}})
 	{{- end}}
 	{{- if .After.Name}}
 		AND