Applied Maestro And task patch

Author: rimi-itk

CHANGELOG.md

@@ -9,6 +9,8 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.
 * Opdaterede installationsguide.
 * Applied Maestro notification patch
   (<https://github.com/itk-dev/os2forms_selvbetjening/pull/270>)
+* Applied Maestro And task patch
+  (<https://github.com/itk-dev/os2forms_selvbetjening/pull/275>)
 
 ## [2.7.3] 2024-01-16
 

composer.json

@@ -144,7 +144,8 @@
                 "Change check for node form": "patches/drupal/permissions_by_term/changeNodeCheck.patch"
             },
             "drupal/maestro": {
-                "Fix check for task notifications": "patches/drupal/maestro/maestro_notification.patch"
+                "Fix check for task notifications": "patches/drupal/maestro/maestro_notification.patch",
+                "Fix task pointers query": "patches/drupal/maestro/and-task.patch"
             }
         },
         "patches-ignore": {

composer.lock

@@ -0,0 +1,19 @@
+diff --git a/src/Plugin/EngineTasks/MaestroAndTask.php b/src/Plugin/EngineTasks/MaestroAndTask.php
+index 2d27bbe..bbdc5ff 100644
+--- a/src/Plugin/EngineTasks/MaestroAndTask.php
++++ b/src/Plugin/EngineTasks/MaestroAndTask.php
+@@ -94,12 +94,10 @@ class MaestroAndTask extends PluginBase implements MaestroEngineTaskInterface {
+       ->condition('archived', '2', '!=')
+       ->condition('process_id', $this->processID);
+ 
+-    $orConditionGroup = $query->orConditionGroup();
+-    foreach ($pointers as $taskID) {
+-      $orConditionGroup->condition('task_id', $taskID);
++    if (!empty($pointers)) {
++      $andMainConditions->condition('task_id', $pointers, 'IN');
+     }
+ 
+-    $andMainConditions->condition($orConditionGroup);
+     $query->condition($andMainConditions);
+ 
+     $queueIdCount = $query->count()->execute();