Delete Threads/Entries of Deleted Tickets

This commit reallows us to delete threads and thread entries when deleting tickets by adding a column called thread_type to the thread event table that contains the same data as the object_type field on the thread table. The reason for doing this was because in the dashboard reports, we were relying on the object type in the thread table to give us accurate report data.

Author: aydreeihn

include/class.report.php

@@ -84,20 +84,18 @@ function getPlotData() {
         $res = db_query('SELECT DISTINCT(E.name) FROM '.THREAD_EVENT_TABLE
             .' T JOIN '.EVENT_TABLE . ' E ON E.id = T.event_id'
             .' WHERE timestamp BETWEEN '.$start.' AND '.$stop
-            .' AND T.event_id IN ('.implode(",",$event_ids).')'
+            .' AND T.event_id IN ('.implode(",",$event_ids).') AND T.thread_type = "T"'
             .' ORDER BY 1');
         $events = array();
         while ($row = db_fetch_row($res)) $events[] = $row[0];
 
         # TODO: Handle user => db timezone offset
         # XXX: Implement annulled column from the %ticket_event table
         $res = db_query('SELECT H.name, DATE_FORMAT(timestamp, \'%Y-%m-%d\'), '
-                .'COUNT(DISTINCT T.id)'
+                .'COUNT(DISTINCT E.id)'
             .' FROM '.THREAD_EVENT_TABLE. ' E '
             . ' LEFT JOIN '.EVENT_TABLE. ' H
                 ON (E.event_id = H.id)'
-            .' JOIN '.THREAD_TABLE. ' T
-                ON (T.id = E.thread_id AND T.object_type = "T") '
             .' WHERE E.timestamp BETWEEN '.$start.' AND '.$stop
             .' AND NOT annulled'
             .' AND E.event_id IN ('.implode(",",$event_ids).')'
@@ -181,7 +179,7 @@ function getTabularData($group='dept') {
                 ->filter(array(
                         'annulled' => 0,
                         'timestamp__range' => array($start, $stop, true),
-                        'thread__object_type' => 'T',
+                        'thread_type' => 'T',
                    ))
                 ->aggregate(array(
                     'Opened' => SqlAggregate::COUNT(

include/class.task.php

@@ -1379,6 +1379,7 @@ function delete($comments='') {
         if (!parent::delete())
             return false;
 
+        $thread->delete();
         $this->logEvent('deleted');
 
         Draft::deleteForNamespace('task.%.' . $this->getId());

include/class.thread.php

@@ -2123,6 +2123,7 @@ static function forTicket($ticket, $state, $user=false) {
         $staff = $ticket->getStaffId();
 
         $inst = self::create(array(
+            'thread_type' => ObjectModel::OBJECT_TYPE_TICKET,
             'staff_id' => $staff,
             'team_id' => $ticket->getTeamId(),
             'dept_id' => $ticket->getDeptId(),
@@ -2133,6 +2134,7 @@ static function forTicket($ticket, $state, $user=false) {
 
     static function forTask($task, $state, $user=false) {
         $inst = self::create(array(
+            'thread_type' => ObjectModel::OBJECT_TYPE_TASK,
             'staff_id' => $task->getStaffId(),
             'team_id' => $task->getTeamId(),
             'dept_id' => $task->getDeptId(),

include/class.ticket.php

@@ -3471,6 +3471,7 @@ function delete($comments='') {
         }
 
 
+        $t->delete();
         $this->logEvent('deleted');
 
         foreach (DynamicFormEntry::forTicket($this->getId()) as $form)

setup/inc/streams/core/install-mysql.sql

@@ -764,6 +764,7 @@ DROP TABLE IF EXISTS `%TABLE_PREFIX%thread_event`;
 CREATE TABLE `%TABLE_PREFIX%thread_event` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `thread_id` int(11) unsigned NOT NULL default '0',
+  `thread_type` char(1) NOT NULL DEFAULT '',
   `event_id` int(11) unsigned DEFAULT NULL,
   `staff_id` int(11) unsigned NOT NULL,
   `team_id` int(11) unsigned NOT NULL,