1 files changed, 18 insertions, 134 deletions
diff --git a/app/Model/ProjectActivity.php b/app/Model/ProjectActivity.php
index 74df26a1..d993015b 100644
--- a/app/Model/ProjectActivity.php
+++ b/app/Model/ProjectActivity.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use PicoDb\Table;
+
 /**
  * Project activity model
  *
@@ -51,113 +53,26 @@ class ProjectActivity extends Base
     }
 
     /**
-     * Get all events for the given project
-     *
-     * @access public
-     * @param  integer     $project_id      Project id
-     * @param  integer     $limit           Maximum events number
-     * @param  integer     $start           Timestamp of earliest activity
-     * @param  integer     $end             Timestamp of latest activity
-     * @return array
-     */
-    public function getProject($project_id, $limit = 50, $start = null, $end = null)
-    {
-        return $this->getProjects(array($project_id), $limit, $start, $end);
-    }
-
-    /**
-     * Get all events for the given projects list
+     * Get query
      *
      * @access public
-     * @param  integer[]   $project_ids     Projects id
-     * @param  integer     $limit           Maximum events number
-     * @param  integer     $start           Timestamp of earliest activity
-     * @param  integer     $end             Timestamp of latest activity
-     * @return array
+     * @return Table
      */
-    public function getProjects(array $project_ids, $limit = 50, $start = null, $end = null)
+    public function getQuery()
     {
-        if (empty($project_ids)) {
-            return array();
-        }
-
-        $query = $this
-                    ->db
-                    ->table(self::TABLE)
-                    ->columns(
-                        self::TABLE.'.*',
-                        User::TABLE.'.username AS author_username',
-                        User::TABLE.'.name AS author_name',
-                        User::TABLE.'.email'
-                    )
-                    ->in('project_id', $project_ids)
-                    ->join(User::TABLE, 'id', 'creator_id')
-                    ->desc(self::TABLE.'.id')
-                    ->limit($limit);
-
-        return $this->getEvents($query, $start, $end);
-    }
-
-    /**
-     * Get all events for the given task
-     *
-     * @access public
-     * @param  integer     $task_id         Task id
-     * @param  integer     $limit           Maximum events number
-     * @param  integer     $start           Timestamp of earliest activity
-     * @param  integer     $end             Timestamp of latest activity
-     * @return array
-     */
-    public function getTask($task_id, $limit = 50, $start = null, $end = null)
-    {
-        $query = $this
-                    ->db
-                    ->table(self::TABLE)
-                    ->columns(
-                        self::TABLE.'.*',
-                        User::TABLE.'.username AS author_username',
-                        User::TABLE.'.name AS author_name',
-                        User::TABLE.'.email'
-                    )
-                    ->eq('task_id', $task_id)
-                    ->join(User::TABLE, 'id', 'creator_id')
-                    ->desc(self::TABLE.'.id')
-                    ->limit($limit);
-
-        return $this->getEvents($query, $start, $end);
-    }
-
-    /**
-     * Common function to return events
-     *
-     * @access public
-     * @param  \PicoDb\Table   $query           PicoDb Query
-     * @param  integer         $start           Timestamp of earliest activity
-     * @param  integer         $end             Timestamp of latest activity
-     * @return array
-     */
-    private function getEvents(\PicoDb\Table $query, $start, $end)
-    {
-        if (! is_null($start)) {
-            $query->gte('date_creation', $start);
-        }
-
-        if (! is_null($end)) {
-            $query->lte('date_creation', $end);
-        }
-
-        $events = $query->findAll();
-
-        foreach ($events as &$event) {
-            $event += $this->decode($event['data']);
-            unset($event['data']);
-
-            $event['author'] = $event['author_name'] ?: $event['author_username'];
-            $event['event_title'] = $this->notification->getTitleWithAuthor($event['author'], $event['event_name'], $event);
-            $event['event_content'] = $this->getContent($event);
-        }
-
-        return $events;
+        return $this
+            ->db
+            ->table(ProjectActivity::TABLE)
+            ->columns(
+                ProjectActivity::TABLE.'.*',
+                'uc.username AS author_username',
+                'uc.name AS author_name',
+                'uc.email',
+                'uc.avatar_path'
+            )
+            ->join(Task::TABLE, 'id', 'task_id')
+            ->join(Project::TABLE, 'id', 'project_id')
+            ->left(User::TABLE, 'uc', 'id', ProjectActivity::TABLE, 'creator_id');
     }
 
     /**
@@ -175,35 +90,4 @@ class ProjectActivity extends Base
             $this->db->table(self::TABLE)->in('id', $ids)->remove();
         }
     }
-
-    /**
-     * Get the event html content
-     *
-     * @access public
-     * @param  array     $params    Event properties
-     * @return string
-     */
-    public function getContent(array $params)
-    {
-        return $this->template->render(
-            'event/'.str_replace('.', '_', $params['event_name']),
-            $params
-        );
-    }
-
-    /**
-     * Decode event data, supports unserialize() and json_decode()
-     *
-     * @access public
-     * @param  string   $data   Serialized data
-     * @return array
-     */
-    public function decode($data)
-    {
-        if ($data{0} === 'a') {
-            return unserialize($data);
-        }
-
-        return json_decode($data, true) ?: array();
-    }
 }