Draft: Resolve "Redesign notifications class"

Related to #80

plugins/tasks/Notifications.php

@@ -4,7 +4,6 @@ class Notifications implements EndpointInterface
 {
 
   private TaskGateway $gateway;
-  private string $errorMessage = 'No matching audited attributes with monitored attributes, safely removed!';
 
   public function __construct (TaskGateway $gateway)
   {
@@ -70,7 +69,26 @@ class Notifications implements EndpointInterface
         // Generate the mail form with all mail controller requirements
         $mailTemplateForm = $this->generateMainTaskMailTemplate($notificationsMainTask);
 
-        $matchingAttrs = $this->getMatchingAttrs($notificationsMainTask, $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]);
+
+        // 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 = 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';
+        }
 
         if (!empty($matchingAttrs)) {
           // Fill an array with UID of audited user and related matching attributes
@@ -85,7 +103,7 @@ class Notifications implements EndpointInterface
 
         } else { // Simply remove the subTask has no notifications are required
           $result[$task['dn']]['Removed'] = $this->gateway->removeSubTask($task['dn']);
-          $result[$task['dn']]['Status']  = $this->errorMessage;
+          $result[$task['dn']]['Status']  = 'No matching audited attributes with monitored attributes, safely removed!';
         }
       }
     }
@@ -97,32 +115,6 @@ class Notifications implements EndpointInterface
     return $result;
   }
 
-  private function getMatchingAttrs (array $notificationsMainTask, array $task): array
-  {
-    // 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]);
-
-    // 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 = 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';
-    }
-
-      return $matchingAttrs;
-  }
-
   /**
    * Determine if Supann resource verification is needed.
    *
@@ -181,15 +173,25 @@ class Notifications implements EndpointInterface
    */
   private function verifySupannState (array $supannResource, array $auditedAttrs): bool
   {
+    $result = FALSE;
+
     //Construct Supann Resource State as string
-    $monitoredSupannState = '{' . $supannResource['resource'][0] . '}' . $supannResource['state'][0];
     if (!empty($supannResource['subState'][0])) {
-      $monitoredSupannState = $monitoredSupannState . ':' . $supannResource['subState'][0];
+      $monitoredSupannState = '{' . $supannResource['resource'][0] . '}' . $supannResource['state'][0] . ':' . $supannResource['subState'][0];
+    } else {
+      $monitoredSupannState = '{' . $supannResource['resource'][0] . '}' . $supannResource['state'][0];
     }
 
     // Get all the values only of a multidimensional array.
     $auditedValues = Utils::getArrayValuesRecursive($auditedAttrs);
-    return in_array($monitoredSupannState, $auditedValues);
+
+    if (in_array($monitoredSupannState, $auditedValues)) {
+      $result = TRUE;
+    } else {
+      $result = FALSE;
+    }
+
+    return $result;
   }
 
   /**