Merge pull request #419 from openinfradev/filter_fix

Filter fix
openinfradev · Apr 23, 2024 · 9673e8c · 9673e8c
2 parents e06d8ec + 0757ba2
commit 9673e8c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/api/swagger/docs.go b/api/swagger/docs.go
@@ -15249,6 +15249,9 @@ const docTemplate = `{
                 "messageTitle": {
                     "type": "string"
                 },
+                "name": {
+                    "type": "string"
+                },
                 "node": {
                     "type": "string"
                 },

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -15243,6 +15243,9 @@
                 "messageTitle": {
                     "type": "string"
                 },
+                "name": {
+                    "type": "string"
+                },
                 "node": {
                     "type": "string"
                 },

diff --git a/api/swagger/swagger.yaml b/api/swagger/swagger.yaml
@@ -3348,6 +3348,8 @@ definitions:
         type: string
       messageTitle:
         type: string
+      name:
+        type: string
       node:
         type: string
       notificationType:

diff --git a/internal/filter/operator.go b/internal/filter/operator.go
@@ -35,7 +35,7 @@ var (
 				if dataType != DataTypeText && dataType != DataTypeEnum {
 					return filter.Where(tx, "FALSE")
 				}
-				query := castEnumAsText(column, dataType) + " LIKE ?"
+				query := castEnumAsText(column, dataType) + " ILIKE ?"
 				value := sqlutil.EscapeLike(filter.Args[0]) + "%"
 				return filter.Where(tx, query, value)
 			},
@@ -46,7 +46,7 @@ var (
 				if dataType != DataTypeText && dataType != DataTypeEnum {
 					return filter.Where(tx, "FALSE")
 				}
-				query := castEnumAsText(column, dataType) + " LIKE ?"
+				query := castEnumAsText(column, dataType) + " ILIKE ?"
 				value := "%" + sqlutil.EscapeLike(filter.Args[0])
 				return filter.Where(tx, query, value)
 			},
@@ -57,7 +57,7 @@ var (
 				if dataType != DataTypeText && dataType != DataTypeEnum {
 					return filter.Where(tx, "FALSE")
 				}
-				query := castEnumAsText(column, dataType) + " LIKE ?"
+				query := castEnumAsText(column, dataType) + " ILIKE ?"
 				value := "%" + sqlutil.EscapeLike(filter.Args[0]) + "%"
 				return filter.Where(tx, query, value)
 			},
@@ -68,7 +68,7 @@ var (
 				if dataType != DataTypeText && dataType != DataTypeEnum {
 					return filter.Where(tx, "FALSE")
 				}
-				query := castEnumAsText(column, dataType) + " NOT LIKE ?"
+				query := castEnumAsText(column, dataType) + " NOT ILIKE ?"
 				value := "%" + sqlutil.EscapeLike(filter.Args[0]) + "%"
 				return filter.Where(tx, query, value)
 			},

diff --git a/pkg/domain/system-notification.go b/pkg/domain/system-notification.go
@@ -80,6 +80,7 @@ type CreateSystemNotificationRequest struct {
 
 type SystemNotificationResponse struct {
 	ID                        string                             `json:"id"`
+	Name                      string                             `json:"name"`
 	OrganizationId            string                             `json:"organizationId"`
 	Severity                  string                             `json:"severity"`
 	MessageTitle              string                             `json:"messageTitle"`