From e73334a7e0738d6e46bae7dec1e903232550c964 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 18 Jan 2016 21:46:56 -0500
Subject: Add unit test for LastLogin class

---
 app/Model/LastLogin.php | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'app')

diff --git a/app/Model/LastLogin.php b/app/Model/LastLogin.php
index 0f148ead..f5be020e 100644
--- a/app/Model/LastLogin.php
+++ b/app/Model/LastLogin.php
@@ -36,11 +36,31 @@ class LastLogin extends Base
      */
     public function create($auth_type, $user_id, $ip, $user_agent)
     {
-        // Cleanup old sessions if necessary
+        $this->cleanup($user_id);
+
+        return $this->db
+                    ->table(self::TABLE)
+                    ->insert(array(
+                        'auth_type' => $auth_type,
+                        'user_id' => $user_id,
+                        'ip' => $ip,
+                        'user_agent' => substr($user_agent, 0, 255),
+                        'date_creation' => time(),
+                    ));
+    }
+
+    /**
+     * Cleanup login history
+     *
+     * @access public
+     * @param  integer $user_id
+     */
+    public function cleanup($user_id)
+    {
         $connections = $this->db
                             ->table(self::TABLE)
                             ->eq('user_id', $user_id)
-                            ->desc('date_creation')
+                            ->desc('id')
                             ->findAllByColumn('id');
 
         if (count($connections) >= self::NB_LOGINS) {
@@ -49,16 +69,6 @@ class LastLogin extends Base
                      ->notin('id', array_slice($connections, 0, self::NB_LOGINS - 1))
                      ->remove();
         }
-
-        return $this->db
-                    ->table(self::TABLE)
-                    ->insert(array(
-                        'auth_type' => $auth_type,
-                        'user_id' => $user_id,
-                        'ip' => $ip,
-                        'user_agent' => $user_agent,
-                        'date_creation' => time(),
-                    ));
     }
 
     /**
@@ -73,7 +83,7 @@ class LastLogin extends Base
         return $this->db
                     ->table(self::TABLE)
                     ->eq('user_id', $user_id)
-                    ->desc('date_creation')
+                    ->desc('id')
                     ->columns('id', 'auth_type', 'ip', 'user_agent', 'date_creation')
                     ->findAll();
     }
-- 
cgit v1.2.3