ola tto & ttr completed when ola group removed from assignees.

Author: SebSept

phpunit/functional/OLATest.php

@@ -95,6 +95,7 @@
  *              - is not done when a user not in the dedicated group is assigned to the ticket : @see self::testOlaTtoIsNotCompleteWhenTicketIsAssignedToUserNotInDedicatedGroup()
  *              - is not done when the group is added and the ola added by rule : @see self::testOlaTtoIsNotCompleteWhenTicketIsAssignedToDedicatedGroupAndOlaAddedByRule()
  *              - is done when a group associated to ola is removed from ticket assigned group : @see self::testOlaTtoIsCompleteWhenGroupAssociatedToOlaIsRemovedFromTicketAssignedGroup()
+ *              - @todo same for user of group
  *              - is done when ticket is "taken into account" (add task, add followup) by a user of the ola group : @todoseb - d'abord vérifier à quoi correspond taken_into_account(_delay)
  *              - is not done when ticket is updated(add task, add followup) by a user not in the ola group : @todoseb - d'abord vérifier à quoi correspond taken_into_account(_delay)
  *              @todoseb voir quels tests sont à répliquer pour les TTR
@@ -741,12 +742,12 @@ public function testOlaTtoIsCompleteWhenGroupAssociatedToOlaIsRemovedFromTicketA
         // act : remove group associated to OLA TTO from ticket assigned groups, maybe there is a cleaner way to do this
         $gt = new \Group_Ticket();
         assert(true === $gt->deleteByCriteria(['tickets_id' => $ticket->getID(), 'groups_id' => $g_n1->getID()]));
-        throw new \Exception('mise à jour des olas pas lancée dans le deleteByCriteria, hors on a besoin de mettre à jour item_olas ');
 
         $ticket = $this->reloadItem($ticket);
         assert(false === $ticket->isGroup(CommonITILActor::ASSIGN, $g_n1->getID()), 'Group N1 should not be assigned to ticket anymore');
 
         // assert OLA TTO is now complete
+        $fetched_ola_data = $ticket->getOlasTTOData()[0] ?? throw new \Exception('Tested OLA TTO not fetched');
         $this->assertNotNull($fetched_ola_data['end_time']);
     }
 

src/Group_Ticket.php

@@ -66,4 +66,12 @@ public function post_addItem()
         parent::post_addItem();
         $this->_force_log_option = 0;
     }
+
+
+    public function post_purgeItem()
+    {
+        Item_Ola::computeGroupAssigneeRemoval((int) $this->fields['tickets_id'], (int) $this->fields['groups_id']);
+
+        parent::post_purgeItem();
+    }
 }

src/Item_Ola.php

@@ -168,8 +168,6 @@ public static function compute(Ticket $ticket, mixed $olas_id): void
         // - except if update is triggered by a rule
         // - except if end_time is already set
         // @todoseb refacto en mettant end_time, sur l'ensemble.
-        // @todoseb traitement de la suppression du groupe de l'OLA (à été présent, ne l'ai plus -> ola tto terminée (idem ttr probablement))
-        $ola_group_removed = $ticket->haveAGroup(CommonITILActor::ASSIGN, [$ola->fields['groups_id']]);
 
         if ($item_ola_data['ola_type'] === SLM::TTO) {
             if (
@@ -209,6 +207,60 @@ public static function compute(Ticket $ticket, mixed $olas_id): void
         $ticket->manageOlaLevel($item_ola->fields['olas_id']);
     }
 
+    /**
+     * When the ola dedicated group is removed from a ticket, the ola is considered completed.
+     *
+     * The $groups_id_removed is the group id that has been removed from the ticket assignees.
+     * Be sure that the group was previously assigned to the ticket.
+     */
+    public static function computeGroupAssigneeRemoval(int $tickets_id, int $groups_id_removed)
+    {
+        /** @var DBmysql $DB */
+        global $DB;
+
+        // find all items_olas OLA related to this group & ticket
+        $items_olas_to_update_results = $DB->request([
+            'SELECT'       => [
+                Item_Ola::getTable() . '.id',
+                Item_Ola::getTable() . '.olas_id',
+            ],
+            'FROM'         => Item_Ola::getTable(),
+            'INNER JOIN'   => [
+                OLA::getTable() => [
+                    'FKEY'   => [
+                        Item_Ola::getTable() => 'olas_id',
+                        OLA::getTable()      => 'id',
+                    ],
+                ],
+            ],
+            'WHERE'        => [
+                'items_id' => $tickets_id,
+                'itemtype' => Ticket::class,
+                'groups_id' => $groups_id_removed,
+            ],
+        ]);
+
+        foreach ($items_olas_to_update_results as $item_ola_row) {
+            $ticket = new Ticket();
+            if (!$ticket->getFromDB($tickets_id)) {
+                throw new Exception('Ticket related to Ticket_group not found');
+            }
+
+            if (!(new self())->update(
+                [
+                    'end_time' => Session::getCurrentTime(),
+                    'id' => $item_ola_row['id'],
+                ]
+            )
+            ) {
+                throw new Exception('Failed to update end_time on Item_Ola #' . $item_ola_row['id']);
+            }
+
+            Item_Ola::compute($ticket, (int) $item_ola_row['olas_id']);
+        }
+    }
+
+
     public function getOla(): OLA
     {
         $item = $this->getConnexityItem(self::$itemtype_2, self::$items_id_2);