Case-insensitive workflow filter (#790)

* Case-insensitive workflow filter

Author: jozefbakus

src/main/scala/za/co/absa/hyperdrive/trigger/models/search/ContainsFilterAttributes.scala

@@ -15,4 +15,5 @@
 
 package za.co.absa.hyperdrive.trigger.models.search
 
-case class ContainsFilterAttributes(override val field: String, value: String) extends FilterAttributes
+case class ContainsFilterAttributes(override val field: String, value: String, isCaseSensitive: Boolean)
+    extends FilterAttributes

src/main/scala/za/co/absa/hyperdrive/trigger/models/tables/tableExtensions/searchableTable/SearchableTableQuery.scala

@@ -75,7 +75,11 @@ trait SearchableTableQuery {
       fieldMapping: Map[String, Rep[_]]
     ): Rep[Boolean] = {
       val tableField = fieldMapping(attributes.field).asInstanceOf[Rep[String]]
-      tableField like s"%${attributes.value}%"
+      if (attributes.isCaseSensitive) {
+        tableField like s"%${attributes.value}%"
+      } else {
+        tableField.toLowerCase like s"%${attributes.value}%".toLowerCase
+      }
     }
 
     private def applyIntRangeFilter(

src/test/scala/za/co/absa/hyperdrive/trigger/models/tables/tableExtensions/searchableTable/SearchableTableQueryTest.scala

@@ -49,8 +49,8 @@ class SearchableTableQueryTest
     import TestSearchableTableFieldNames._
     val containsFilterSeq = Some(
       Seq(
-        ContainsFilterAttributes(field = stringField, value = "value"),
-        ContainsFilterAttributes(field = stringField2, value = "str")
+        ContainsFilterAttributes(field = stringField, value = "value", isCaseSensitive = true),
+        ContainsFilterAttributes(field = stringField2, value = "str", isCaseSensitive = true)
       )
     )
     val intRangeFilterSeq = Some(Seq(IntRangeFilterAttributes(field = longField, start = Option(0), end = Option(1))))
@@ -83,7 +83,11 @@ class SearchableTableQueryTest
   }
 
   "The contains filter" should "find values that contain the search string" in {
-    val filter = ContainsFilterAttributes(field = TestSearchableTableFieldNames.stringField, value = "value")
+    val filter = ContainsFilterAttributes(
+      field = TestSearchableTableFieldNames.stringField,
+      value = "value",
+      isCaseSensitive = true
+    )
     val searchRequest =
       TableSearchRequest(containsFilterAttributes = Some(Seq(filter)), sort = None, from = 0, size = 50)
 
@@ -97,7 +101,42 @@ class SearchableTableQueryTest
 
   it should "not find values that do not contain the search string" in {
     val filter =
-      ContainsFilterAttributes(field = TestSearchableTableFieldNames.stringField, value = "not-matching-string")
+      ContainsFilterAttributes(
+        field = TestSearchableTableFieldNames.stringField,
+        value = "not-matching-string",
+        isCaseSensitive = true
+      )
+    val searchRequest =
+      TableSearchRequest(containsFilterAttributes = Some(Seq(filter)), sort = None, from = 0, size = 50)
+
+    val result = await(db.run(underTest.search(searchRequest)))
+
+    result.total shouldBe 0
+  }
+
+  it should "find values that contain the search string with disabled case sensitivity" in {
+    val filter = ContainsFilterAttributes(
+      field = TestSearchableTableFieldNames.stringField,
+      value = "VaLuE",
+      isCaseSensitive = false
+    )
+    val searchRequest =
+      TableSearchRequest(containsFilterAttributes = Some(Seq(filter)), sort = None, from = 0, size = 50)
+
+    val result = await(db.run(underTest.search(searchRequest)))
+
+    val expected = TestSearchableData.testSearchableEntities.filter(_.stringValue.contains("value"))
+    result.total should be > 0
+    result.total shouldBe expected.size
+    result.items should contain theSameElementsAs expected
+  }
+
+  it should "not find values that do contain the search string and do not match case" in {
+    val filter = ContainsFilterAttributes(
+      field = TestSearchableTableFieldNames.stringField,
+      value = "VaLuE",
+      isCaseSensitive = true
+    )
     val searchRequest =
       TableSearchRequest(containsFilterAttributes = Some(Seq(filter)), sort = None, from = 0, size = 50)
 

src/test/scala/za/co/absa/hyperdrive/trigger/persistance/DagRunRepositoryTest.scala

@@ -138,10 +138,10 @@ class DagRunRepositoryTest
     createTestData()
     val containsFilters = Some(
       Seq(
-        ContainsFilterAttributes(field = "workflowName", value = "flow1"),
-        ContainsFilterAttributes(field = "status", value = "Que"),
-        ContainsFilterAttributes(field = "triggeredBy", value = TestData.triggeredBy),
-        ContainsFilterAttributes(field = "projectName", value = "project")
+        ContainsFilterAttributes(field = "workflowName", value = "flow1", isCaseSensitive = true),
+        ContainsFilterAttributes(field = "status", value = "Que", isCaseSensitive = true),
+        ContainsFilterAttributes(field = "triggeredBy", value = TestData.triggeredBy, isCaseSensitive = true),
+        ContainsFilterAttributes(field = "projectName", value = "project", isCaseSensitive = true)
       )
     )
 

src/test/scala/za/co/absa/hyperdrive/trigger/persistance/JobTemplateRepositoryPostgresTest.scala

@@ -122,7 +122,9 @@ class JobTemplateRepositoryPostgresTest
     insertJobTemplates()
 
     val containsFilterAttributes =
-      Option(Seq(ContainsFilterAttributes(field = "name", value = TestData.jobTemplates.head.name)))
+      Option(
+        Seq(ContainsFilterAttributes(field = "name", value = TestData.jobTemplates.head.name, isCaseSensitive = true))
+      )
     val searchRequest: TableSearchRequest = TableSearchRequest(
       containsFilterAttributes = containsFilterAttributes,
       sort = None,

src/test/scala/za/co/absa/hyperdrive/trigger/persistance/NotificationRuleRepositoryTest.scala

@@ -223,7 +223,8 @@ class NotificationRuleRepositoryTest
 
   "searchJobTemplates" should "return notification rules sorted by workflow prefix" in {
     await(db.run(h2NotificationRuleTable.forceInsertAll(Seq(TestData.nr1, TestData.nr2, TestData.nr3))))
-    val containsFilterAttributes = Option(Seq(ContainsFilterAttributes(field = "project", value = "proj")))
+    val containsFilterAttributes =
+      Option(Seq(ContainsFilterAttributes(field = "project", value = "proj", isCaseSensitive = true)))
     val searchRequest: TableSearchRequest = TableSearchRequest(
       containsFilterAttributes = containsFilterAttributes,
       sort = Option(SortAttributes(by = "workflowPrefix", order = 1)),
@@ -240,7 +241,8 @@ class NotificationRuleRepositoryTest
 
   it should "return notification rules sorted by created" in {
     await(db.run(h2NotificationRuleTable.forceInsertAll(Seq(TestData.nr1, TestData.nr2, TestData.nr3))))
-    val containsFilterAttributes = Option(Seq(ContainsFilterAttributes(field = "project", value = "proj")))
+    val containsFilterAttributes =
+      Option(Seq(ContainsFilterAttributes(field = "project", value = "proj", isCaseSensitive = true)))
     val searchRequest: TableSearchRequest = TableSearchRequest(
       containsFilterAttributes = containsFilterAttributes,
       sort = Option(SortAttributes(by = "created", order = 1)),

ui/src/app/components/common/datagrid/filters/string-filter/string-filter.component.ts

@@ -28,6 +28,7 @@ export class StringFilterComponent implements ClrDatagridFilterInterface<any>, A
   @Input() removeFiltersSubject: Subject<any>;
   @Input() property: string;
   @Input() value: string = undefined;
+  @Input() isCaseSensitive = true;
 
   //clarity interface
   changes = new Subject<any>();
@@ -61,7 +62,7 @@ export class StringFilterComponent implements ClrDatagridFilterInterface<any>, A
   }
 
   get state() {
-    return new ContainsFilterAttributes(this.property, this.value);
+    return new ContainsFilterAttributes(this.property, this.value, this.isCaseSensitive);
   }
 
   modelChanged(value: string) {

ui/src/app/components/workflows/workflows-home/workflows-home.component.html

@@ -138,6 +138,7 @@ <h3 class="modal-title">Upload workflow</h3>
     <ng-container>Workflow name</ng-container>
     <clr-dg-filter [clrDgFilter]="workflowNameFilter">
       <app-string-filter [value]="getFilter(workflowsHomeColumns.WORKFLOW_NAME)"
+                         [isCaseSensitive]="false"
                          #workflowNameFilter
                          [property]="workflowsHomeColumns.WORKFLOW_NAME"
                          [removeFiltersSubject]="removeWorkflowFilterSubject">
@@ -151,6 +152,7 @@ <h3 class="modal-title">Upload workflow</h3>
     <clr-dg-filter [clrDgFilter]="workflowProjectFilter">
       <app-string-filter [removeFiltersSubject]="removeWorkflowFilterSubject"
                          [value]="getFilter(workflowsHomeColumns.PROJECT_NAME)"
+                         [isCaseSensitive]="false"
                          #workflowProjectFilter
                          [property]="workflowsHomeColumns.PROJECT_NAME">
       </app-string-filter>

ui/src/app/models/search/containsFilterAttributes.model.ts

@@ -16,5 +16,5 @@
 import { FilterAttributes } from './filterAttributes.model';
 
 export class ContainsFilterAttributes implements FilterAttributes {
-  constructor(public field: string, public value: string) {}
+  constructor(public field: string, public value: string, public isCaseSensitive: boolean) {}
 }