is_late implementation & tests (wip)

Author: SebSept

phpunit/functional/OLATest.php

@@ -101,6 +101,33 @@
  *              - ttr waiting time is incremented while the ticket status is WAITING : @see self::testOlaTTRWaitingTimeIsIncrementedWhileTicketStatusIsWaiting()
  *              + @todo tests avec autres groupes
  *
+ *          - ticket is late if : (business logic extracted from CommonITILObject::generateSLAOLAComputation())
+ *              tto :
+ *              - ola due time is not null (0)
+ *              - and ticket status is not WAITING (1)
+*               - and one of the following is true :
+ *                  - takeintoaccountdate is not null & > due_time (2.1))
+ *                  - takeintoaccountdate is null & target resolution delay (time elapsed since ticket creation without pauses) > time elapsed since ticket start start (2.2) // @todoseb need rewrite
+ *                  - takeintoaccountdate is null & due time is passed (2.3)
+ *              - ttr :
+ *                  - due time is not null
+ *                  - ticket status is not WAITING
+*                      - ticket solved_date > due_time
+ *                     - or solved_date is null & due_time is passed
+ *              // ---
+ *
+ *              - tto : (takeintoaccountdate is replaced by end_time)
+ *                - end_time is defined and > due_time - @see self::testOlaTtoIsLateWhenEndTimeIsAfterDueTime()
+ *                - end_time is not defined & due_time is passed - @see self::testOlaTtoIsLateWhenDueTimeIsPassed()
+ *                - ticket status is not WAITING (1): @see self::testOlaTtoIsLateWhenTicketStatusIsNotWaiting()    // @todoseb
+ *                and that's all.
+
+ * // ----
+ *                - is never late if ticket is solved or closed : @see self::testOlaTtoIsNotLateWhenTicketIsSolvedOrClosed()
+                * - ttr : @todoseb implémenter tests manquants
+ *
+ * // @todoseb test si is_late change quand ticket devient waiting
+ *
  *          - when completion is done, the associated group is removed from ticket assignees : not implemented, seems not relevant atm
  */
 
@@ -811,6 +838,32 @@ public function testOlaTTRWaitingTimeIsIncrementedWhileTicketStatusIsWaiting()
         $this->assertEquals(20 * 60, $ola_data['waiting_time'], 'Waiting time should be incremented by 20 minutes after 20 min in WAITING status for an OLA TTR');
     }
 
+    public function testOlaTtoIsLateWhenEndTimeIsAfterDueTime(): void
+    {
+        // arrange
+        $this->login();
+        $ola = $this->createOLA(ola_type: SLM::TTR)['ola'];
+        $now = $this->setCurrentTime('10:04:00', '2025-06-26');
+        $ticket = $this->createTicket(['_la_update' => true, '_olas_id' => [$ola->getID()]]);
+
+        // act - check ola is not yet late
+        $ola_data = $ticket->getOlasData()[0];
+        assert($ola_data['is_late'] == 0, 'OLA should not be late when end time is not set');
+
+        // act : complete ola after due time - wait for ola to be late + assign the ola group to the ticket
+        $later = clone($now);
+        $later->add($this->getDefaultTtrDelayInterval());
+        $later->add(new \DateInterval('PT1H')); // add 1 hour to ensure end time is after due time
+        $this->setCurrentTime($later->format('Y-m-d H:i:s'));
+        $this->updateItem($ticket::class, $ticket->getID(), ['_groups_id_assign' => $ola->fields['groups_id']]);
+        $this->runOlaCron();
+
+        // assert - check ola is late
+        $ola_data = $ticket->getOlasData()[0];
+        dump($ola_data, $ola_data['is_late']);
+        $this->assertEquals(1, $ola_data['is_late'], 'OLA should be late when end time is set');
+    }
+
     private function getDefaultTtoDelayInterval(): \DateInterval
     {
         [$amount, $unit] = self::OLA_TTO_DELAY;

phpunit/functional/SLMTest.php

@@ -2966,14 +2966,4 @@ public function testCloneOLA()
             $ola_compare
         );
     }
-
-    private function runSlaCron(): void
-    {
-        SlaLevel_Ticket::cronSlaTicket(getItemByTypeName(\CronTask::class, 'slaticket'));
-    }
-
-    private function runOlaCron(): void
-    {
-        OlaLevel_Ticket::cronOlaTicket(getItemByTypeName(\CronTask::class, 'slaticket')); // at the moment only slaticketcron exists
-    }
 }

phpunit/src/Glpi/SLMTrait.php

@@ -35,7 +35,9 @@
 namespace Glpi\PHPUnit\Tests\Glpi;
 
 use OLA;
+use OlaLevel_Ticket;
 use SLA;
+use SlaLevel_Ticket;
 use SLM;
 
 trait SLMTrait
@@ -130,4 +132,15 @@ private function createSLM(array $data = [], ?\Calendar $calendar = null): SLM
             ]
         );
     }
+
+    private function runSlaCron(): void
+    {
+        SlaLevel_Ticket::cronSlaTicket(getItemByTypeName(\CronTask::class, 'slaticket'));
+    }
+
+    private function runOlaCron(): void
+    {
+        OlaLevel_Ticket::cronOlaTicket(getItemByTypeName(\CronTask::class, 'slaticket')); // at the moment only slaticketcron exists
+        \Item_Ola::cron(getItemByTypeName(\CronTask::class, 'slaticket'));
+    }
 }

src/Glpi/Dashboard/Provider.php

@@ -496,6 +496,9 @@ public static function nbTicketsGeneric(
     }
 
 
+    /**
+     * Get the number of late tickets by SLA status and technician
+     */
     public static function nbTicketsByAgreementStatusAndTechnician(array $params = []): array
     {
         /** @var \DBmysql $DB */

src/Item_Ola.php

@@ -33,6 +33,9 @@
  * ---------------------------------------------------------------------
  */
 
+
+use function \Safe\strtotime;
+
 class Item_Ola extends CommonDBRelation
 {
     public static $itemtype_1 = 'itemtype'; // Only Ticket at the moment
@@ -41,6 +44,11 @@ class Item_Ola extends CommonDBRelation
     public static $itemtype_2 = OLA::class;
     public static $items_id_2 = 'olas_id';
 
+    public static function cron(CronTask $cronTask)
+    {
+        throw new \Exception('implement me');
+    }
+
     /**
      * Prepare the input for add
      *
@@ -69,7 +77,7 @@ public function prepareInputForAdd($input)
     }
 
     /**
-     * Compute the OLA for a ticket
+     * Compute the OLA data for a ticket
      *
      * @param \Ticket $ticket
      * @param mixed $olas_id must exist in the database
@@ -85,7 +93,8 @@ public static function compute(Ticket $ticket, mixed $olas_id): void
         $ola = $item_ola->getOla();
         $ola->setTicketCalendar($calendars_id);
 
-        $item_ola_data['id'] = $item_ola->getID();
+        $item_ola_data = $item_ola->fields;
+        $item_ola_data['id'] = $item_ola->getID(); // for final CommonDBRelation::update
 
         // - update start_time skipped
         // nothing to do for TTO : done at creation of item_ola
@@ -110,67 +119,53 @@ public static function compute(Ticket $ticket, mixed $olas_id): void
                 )
             )
         ) {
-            $item_ola_data['waiting_time'] = $item_ola->fields['waiting_time'] + $ola->getActiveTimeBetween(
+            $item_ola_data['waiting_time'] += $ola->getActiveTimeBetween(
                 $ticket->fields['begin_waiting_date'] ?? 0,
                 $_SESSION["glpi_currenttime"]
             );
-            $item_ola->fields['waiting_time'] = $item_ola_data['waiting_time'];
         }
 
         // - update due_time
         // update due_time (former internal_time_to_own, internal_time_to_resolve)
         $item_ola_data['due_time'] = $ola->computeDate(
-            $item_ola->fields['start_time'],
-            $item_ola->fields['waiting_time']
+            $item_ola_data['start_time'],
+            $item_ola_data['waiting_time']
         );
 
         // - update end_time
         // for TTO, endtime is when the ticket is assigned to the dedicated group.
         if ($ola->fields['type'] === SLM::TTO) {
-            if ($item_ola->fields['end_time'] == null
+            if ($item_ola_data['end_time'] == null
                 &&
                 (
                     $ticket->haveAGroup(CommonITILActor::ASSIGN, [$ola->fields['groups_id']])
                 || self::ticketHasAnAssigneeOfOlaGroup($ticket, $ola)
                 )
             ) {
-                $item_ola->fields['end_time'] = Session::getCurrentTime();
-                $item_ola_data['end_time'] = $item_ola->fields['end_time'];
+                $item_ola_data['end_time'] = Session::getCurrentTime();
             }
         }
 
         // For TTR, end_time is when the ticket is closed
         if ($ola->fields['type'] === SLM::TTR) {
             if ($ticket->isClosed() || $ticket->isSolved()) {
-                $item_ola->fields['end_time'] = Session::getCurrentTime();
                 $item_ola_data['end_time'] = $item_ola->fields['end_time'];
             }
         }
 
-        // - update is_late
-        // just for POC, condition are a bit more complex
-        $now = strtotime(Session::getCurrentTime());
-        $due_time_timestamp = strtotime($item_ola->fields['due_time']);
-        if( $now > $due_time_timestamp) {
-            $item_ola->fields['is_late'] = 1;
-        }
-        else {
-            $item_ola->fields['is_late'] = 0;
+        // update current object
+        foreach ($item_ola_data as $field => $value) {
+            $item_ola->fields[$field] = $value;
         }
 
+        // - update is_late
+        $item_ola_data['is_late'] = (int) $item_ola->isLate();
+
         if (!(new Item_Ola())->update($item_ola_data)) {
             throw new \Exception('Failed to update item_ola');
         }
         // since dates may be changed, rebuild the levels todo
         $ticket->manageOlaLevel($item_ola->fields['olas_id']);
-        //
-        //            $this->updates[] = "waiting_duration";
-        //            $this->fields["waiting_duration"] += $delay_time;
-        //
-        //            // Reset begin_waiting_date
-        //            $this->updates[] = "begin_waiting_date";
-        //            $this->fields["begin_waiting_date"] = 'NULL';
-
     }
 
     public function getOla(): OLA
@@ -196,7 +191,7 @@ private static function ticketHasAnAssigneeOfOlaGroup(Ticket $ticket, OLA $ola):
 
     /**
      * Get data from Item_Ola + linked OLA for a Ticket
-     *
+     * // @todoseb déplacer plus haut
      * @param \Ticket $ticket
      *
      * @return array<array{olas_id: int, items_olas_id: int, name: string, entities_id: int, is_recursive: bool, type: int, comment: string, number_time: int, use_ticket_calendar: bool, calendars_id: int, date_mod: string, definition_time: string, end_of_working_day: string, date_creation: string, slms_id: int, due_time: string, end_time: string, class: string, item: Ticket, nextaction: false|OlaLevel_Ticket|SlaLevel_Ticket, level: false|\LevelAgreementLevel, group_name: string}>
@@ -246,6 +241,23 @@ public function getDataFromOlasIdsForTicket(Ticket $ticket, array $olas_ids): ar
         return $this->sort($merged_data);
     }
 
+    /**
+     * @todoseb implement me
+     */
+    private function isLate(): bool
+    {
+        $now_timestamp = strtotime(Session::getCurrentTime());
+        $due_time_timestamp = strtotime($this->fields['due_time']);
+        $end_time_timestamp = is_null($this->fields['end_time']) ? null : strtotime($this->fields['end_time']);
+
+        // end_time is after due_time
+        if(!is_null($end_time_timestamp) && $due_time_timestamp > $end_time_timestamp) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * @param array $ola_data fields from ola + possibly 'linkid' field representing items_olas_id
      * @param \Ticket $ticket
@@ -317,5 +329,4 @@ private function sort(array $merged_data): array
 
         return $merged_data;
     }
-
 }

src/LevelAgreement.php

@@ -879,7 +879,6 @@ public function clearInvalidLevels(int $tickets_id): void
     {
         // CLear levels of others LA of the same type
         // e.g. if a new LA TTR was assigned, clear levels from others (= previous) LA TTR
-        // @todoseb       throw new \Exception('à reimplementer pour OLA ou à ne plus appeller carrément ?');
         $level_ticket_class = $this->getLevelTicketClass();
         $level_ticket = getItemForItemtype($level_ticket_class);
         $level_class = $this->getLevelClass();