Updating the Device model

ARCANEDEV · Dec 13, 2016 · eb3a6f3 · eb3a6f3
1 parent 9a7d928
commit eb3a6f3
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/database/migrations/2016_12_01_000001_create_tracker_devices_table.php b/database/migrations/2016_12_01_000001_create_tracker_devices_table.php
@@ -36,7 +36,6 @@ public function up()
             $table->string('model', 64)->index();
             $table->string('platform', 64)->index();
             $table->string('platform_version', 16)->index();
-            $table->boolean('is_mobile')->default(false);
             $table->timestamp('created_at')->index();
             $table->timestamp('updated_at')->index();
 

diff --git a/src/Detectors/DeviceDetector.php b/src/Detectors/DeviceDetector.php
@@ -1,6 +1,7 @@
 <?php namespace Arcanedev\LaravelTracker\Detectors;
 
 use Arcanedev\LaravelTracker\Contracts\Detectors\DeviceDetector as DeviceDetectorContract;
+use Arcanedev\LaravelTracker\Models\Device;
 
 /**
  * Class     DeviceDetector
@@ -45,7 +46,6 @@ public function detect()
         return [
             'kind'      => $this->getDeviceKind(),
             'model'     => $this->agent->device() ?: '',
-            'is_mobile' => $this->agent->isMobile(),
         ];
     }
 
@@ -56,11 +56,11 @@ public function detect()
      */
     public function getDeviceKind()
     {
-        if ($this->isTablet())   return 'Tablet';
-        if ($this->isPhone())    return 'Phone';
-        if ($this->isComputer()) return 'Computer';
+        if ($this->isTablet())   return Device::KIND_TABLET;
+        if ($this->isPhone())    return Device::KIND_PHONE;
+        if ($this->isComputer()) return Device::KIND_COMPUTER;
 
-        return 'unavailable';
+        return Device::KIND_UNAVAILABLE;
     }
 
     /**

diff --git a/src/Models/Device.php b/src/Models/Device.php
@@ -11,12 +11,20 @@
  * @property  string          model
  * @property  string          platform
  * @property  string          platform_version
- * @property  bool            is_mobile
  * @property  \Carbon\Carbon  created_at
  * @property  \Carbon\Carbon  updated_at
  */
 class Device extends AbstractModel
 {
+    /* ------------------------------------------------------------------------------------------------
+     |  Constants
+     | ------------------------------------------------------------------------------------------------
+     */
+    const KIND_COMPUTER    = 'computer';
+    const KIND_PHONE       = 'phone';
+    const KIND_TABLET      = 'tablet';
+    const KIND_UNAVAILABLE = 'unavailable';
+
     /* ------------------------------------------------------------------------------------------------
      |  Properties
      | ------------------------------------------------------------------------------------------------
@@ -38,7 +46,6 @@ class Device extends AbstractModel
         'model',
         'platform',
         'platform_version',
-        'is_mobile',
     ];
 
     /**
@@ -47,12 +54,45 @@ class Device extends AbstractModel
      * @var array
      */
     protected $casts = [
-        'id'        => 'integer',
-        'is_mobile' => 'boolean',
+        'id' => 'integer',
     ];
 
     /* ------------------------------------------------------------------------------------------------
      |  Relationships
      | ------------------------------------------------------------------------------------------------
      */
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Check Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Is this a computer?
+     *
+     * @return bool
+     */
+    public function isComputer()
+    {
+        return $this->kind == static::KIND_COMPUTER;
+    }
+
+    /**
+     * Is this a phone?
+     *
+     * @return bool
+     */
+    public function isPhone()
+    {
+        return $this->kind == static::KIND_PHONE;
+    }
+
+    /**
+     * Is this a tablet?
+     *
+     * @return bool
+     */
+    public function isTablet()
+    {
+        return $this->kind == static::KIND_TABLET;
+    }
 }