Merge pull request #8233 from ProcessMaker/bugfix/FOUR-24286

FOUR-24286: Advanced filter on PROCESS in task saved search does not work

Author: ryancooley

ProcessMaker/Filters/BaseFilter.php

@@ -29,6 +29,8 @@ abstract class BaseFilter
 
     public const TYPE_PROCESS_NAME = 'ProcessName';
 
+    public const PROCESS_NAME_IN_REQUEST = 'process_request.name';
+
     public const TYPE_RELATIONSHIP = 'Relationship';
 
     public string|null $subjectValue;
@@ -98,6 +100,11 @@ private function apply($query): void
             $this->valueAliasAdapter($valueAliasMethod, $query);
         } elseif ($this->subjectType === self::TYPE_PROCESS) {
             $this->filterByProcessId($query);
+        } elseif ($this->subjectValue === self::PROCESS_NAME_IN_REQUEST) {
+            // For performance reasons, the task list uses the column process_request.name
+            // But the filters must use the Process table, for this reason the subjectType is updated
+            $this->subjectType = self::TYPE_PROCESS_NAME;
+            $this->filterByProcessName($query);
         } elseif ($this->subjectType === self::TYPE_PROCESS_NAME) {
             $this->filterByProcessName($query);
         } elseif ($this->subjectType === self::TYPE_RELATIONSHIP) {

tests/Feature/Api/TasksTest.php

@@ -788,6 +788,54 @@ public function testAdvancedFilter()
         $this->assertEquals($hitTask->id, $json['data'][0]['id']);
     }
 
+    public function testAdvancedFilterByProcessRequestName()
+    {
+        $hitProcess = Process::factory()->create(['name' => 'foo']);
+        $missProcess = Process::factory()->create(['name' => 'bar']);
+        $hitRequest = ProcessRequest::factory()->create([
+            'process_id' => $hitProcess->id,
+            'name' => $hitProcess->name,
+        ]);
+        $missRequest = ProcessRequest::factory()->create([
+            'process_id' => $missProcess->id,
+        ]);
+        $hitTask = ProcessRequestToken::factory()->create([
+            'process_request_id' => $hitRequest->id,
+        ]);
+        ProcessRequestToken::factory()->create([
+            'process_request_id' => $missRequest->id,
+        ]);
+
+        // Filter by operator =
+        $filterString = json_encode([
+            [
+                'subject' => ['type' => 'Field', 'value' => 'process_request.name'],
+                'operator' => '=',
+                'value' => $hitProcess->name,
+
+            ],
+        ]);
+
+        $response = $this->apiCall('GET', '/tasks', ['advanced_filter' => $filterString]);
+        $json = $response->json();
+
+        $this->assertEquals($hitTask->id, $json['data'][0]['id']);
+        // Filter by operator contains
+        $filterString = json_encode([
+            [
+                'subject' => ['type' => 'Field', 'value' => 'process_request.name'],
+                'operator' => 'contains',
+                'value' => $hitProcess->name,
+
+            ],
+        ]);
+
+        $response = $this->apiCall('GET', '/tasks', ['advanced_filter' => $filterString]);
+        $json = $response->json();
+
+        $this->assertEquals($hitTask->id, $json['data'][0]['id']);
+    }
+
     public function testGetScreenFields()
     {
         $this->be($this->user);