trigger validation_answer notifications only when answered

Author: cconard96

src/CommonITILValidation.php

@@ -539,10 +539,12 @@ public function post_updateItem($history = true)
 
         // -- notifications
         if (
-            count($this->updates)
+            in_array('status', $this->updates)
+            && (int) $this->fields["status"] !== self::WAITING
             && $donotif
         ) {
-            $options  = ['validation_id'     => $this->fields["id"],
+            $options  = [
+                'validation_id'     => $this->fields["id"],
                 'validation_status' => $this->fields["status"],
             ];
             NotificationEvent::raiseEvent('validation_answer', $this->getItem(), $options, $this);

tests/src/CommonITILValidationTest.php

@@ -42,6 +42,7 @@
 use NotificationEventMailing;
 use NotificationTargetCommonITILObject;
 use PHPUnit\Framework\Attributes\DataProvider;
+use QueuedNotification;
 use Rule;
 use RuleCommonITILObject;
 use RuntimeException;
@@ -1624,4 +1625,40 @@ public function testNotificationValidatorSubstitutes()
         // Substitute timerange expired
         $this->assertEmpty($notification_target->target);
     }
+
+    public function testValidationAnswerNotification(): void
+    {
+        global $CFG_GLPI;
+
+        $this->login();
+        $itil = $this->createItem($this->getITILClassname(), [
+            'name' => 'Test Notification Recipients',
+            'content' => 'Test Notification Recipients',
+        ]);
+        $validation = $this->createItem($this->getValidationClassname(), [
+            $itil::getForeignKeyField() => $itil->getID(),
+            'itemtype_target' => 'User',
+            'items_id_target' => $_SESSION['glpiID'],
+        ]);
+        $queued_notification = new QueuedNotification();
+
+        $CFG_GLPI["use_notifications"] = true;
+        $CFG_GLPI['notifications_mailing'] = true;
+
+        $this->assertEquals(0, countElementsInTable($queued_notification::getTable(), ['event' => 'validation_answer']));
+
+        // Updating the submission comment should not trigger the validation_answer notification
+        $validation->update([
+            'id' => $validation->getID(),
+            'comment_submission' => 'This is a comment.',
+        ]);
+        $this->assertEquals(0, countElementsInTable($queued_notification::getTable(), ['event' => 'validation_answer']));
+
+        $validation->update([
+            'id' => $validation->getID(),
+            'status' => CommonITILValidation::ACCEPTED,
+        ]);
+        // Administrator + Approver
+        $this->assertEquals(2, countElementsInTable($queued_notification::getTable(), ['event' => 'validation_answer']));
+    }
 }