Refactor libraries

plugins/tasks/Notifications.php

@@ -62,6 +62,7 @@ class Notifications implements EndpointInterface
     foreach ($notificationsSubTasks as $task) {
       // If the tasks must be treated - status and scheduled - process the sub-tasks
       if ($this->gateway->statusAndScheduleCheck($task)) {
+
         // Retrieve data from the main task
         $notificationsMainTask     = $this->getNotificationsMainTask($task['fdtasksgranularmaster'][0]);
         $notificationsMainTaskName = $task['fdtasksgranularmaster'][0];
@@ -98,26 +99,26 @@ class Notifications implements EndpointInterface
 
   private function getMatchingAttrs (array $notificationsMainTask, array $task): array
   {
-      // Simply retrieve the list of audited attributes
-      $auditAttributes = $this->decodeAuditAttributes($task);
+    // Simply retrieve the list of audited attributes
+    $auditAttributes = $this->decodeAuditAttributes($task);
 
-      // Recovering monitored attributes list from the defined notification task.
-      $monitoredAttrs = $notificationsMainTask[0]['fdtasksnotificationsattributes'];
-      // Reformat supann
-      $monitoredSupannResource = $this->getSupannResourceState($notificationsMainTask[0]);
+    // Recovering monitored attributes list from the defined notification task.
+    $monitoredAttrs = $notificationsMainTask[0]['fdtasksnotificationsattributes'];
+    // Reformat supann
+    $monitoredSupannResource = $this->getSupannResourceState($notificationsMainTask[0]);
 
-      // Simply remove keys with 'count' reported by ldap.
-      $this->gateway->unsetCountKeys($monitoredAttrs);
-      $this->gateway->unsetCountKeys($monitoredSupannResource);
+    // Simply remove keys with 'count' reported by ldap.
+    $this->gateway->unsetCountKeys($monitoredAttrs);
+    $this->gateway->unsetCountKeys($monitoredSupannResource);
 
-      // Find matching attributes between audited and monitored attributes
-      $matchingAttrs = $this->findMatchingAttributes($auditAttributes, $monitoredAttrs);
+    // Find matching attributes between audited and monitored attributes
+    $matchingAttrs = Utils::findMatchingKeys($auditAttributes, $monitoredAttrs);
 
-      // Verify Supann resource state if applicable
-      if ($this->shouldVerifySupannResource($monitoredSupannResource, $auditAttributes)) {
-          // Adds it to the mating attrs for further notification process.
-          $matchingAttrs[] = 'supannRessourceEtat';
-      }
+    // Verify Supann resource state if applicable
+    if ($this->shouldVerifySupannResource($monitoredSupannResource, $auditAttributes)) {
+      // Adds it to the mating attrs for further notification process.
+      $matchingAttrs[] = 'supannRessourceEtat';
+    }
 
       return $matchingAttrs;
   }
@@ -172,30 +173,6 @@ class Notifications implements EndpointInterface
     return $auditAttributes;
   }
 
-  /**
-   * Find matching attributes between audit and monitored attributes.
-   *
-   * @param array|null $auditAttributes
-   * @param array $monitoredAttrs
-   * @return array
-   */
-  private function findMatchingAttributes (?array $auditAttributes, array $monitoredAttrs): array
-  {
-    $matchingAttrs = [];
-
-    if (!empty($auditAttributes)) {
-      foreach ($auditAttributes as $attributeName) {
-        foreach ($monitoredAttrs as $monitoredAttr) {
-          if (!empty($attributeName) && array_key_exists($monitoredAttr, $attributeName)) {
-            $matchingAttrs[] = $monitoredAttr;
-          }
-        }
-      }
-    }
-
-    return $matchingAttrs;
-  }
-
   /**
    * @param array $supannResource
    * @param array $auditedAttrs
@@ -211,30 +188,10 @@ class Notifications implements EndpointInterface
     }
 
     // Get all the values only of a multidimensional array.
-    $auditedValues = $this->getArrayValuesRecursive($auditedAttrs);
+    $auditedValues = Utils::getArrayValuesRecursive($auditedAttrs);
     return in_array($monitoredSupannState, $auditedValues);
   }
 
-  /**
-   * @param $array
-   * @return array
-   * Note : simply return all values of a multi-dimensional array.
-   */
-  public function getArrayValuesRecursive ($array)
-  {
-    $values = [];
-    foreach ($array as $value) {
-      if (is_array($value)) {
-        // If value is an array, merge its values recursively
-        $values = array_merge($values, $this->getArrayValuesRecursive($value));
-      } else {
-        // If value is not an array, add it to the result
-        $values[] = $value;
-      }
-    }
-    return $values;
-  }
-
   /**
    * @param string $mainTaskDn
    * @return array