Merge pull request #22 from tattersoftware/issue-21

Fix: Similar Rows not Detecting

Author: MGatner

src/Models/VisitModel.php

@@ -72,7 +72,7 @@ public function makeFromRequest(IncomingRequest $request): Visit
     public function findSimilar(Visit $visit): ?Visit
     {
         $config   = config('Visits');
-        $tracking = $visit->{$config->trackingMethod};
+        $tracking = $visit->toRawArray()[$config->trackingMethod] ?? null;
 
         // Required fields
         if (empty($tracking) || empty($visit->host) || empty($visit->path)) {

tests/FilterTest.php

@@ -27,7 +27,21 @@ public function testRecords(): void
         $this->seeInDatabase('visits', ['path' => '/index.php']);
     }
 
-    public function testIncrements(): void
+    public function testIpAddressIncrements(): void
+    {
+        config('Visits')->trackingMethod = 'ip_address';
+        $_SERVER['REMOTE_ADDR']          = '192.168.0.1';
+        $this->request                   = single_service('request');
+
+        $this->call();
+        $this->call();
+
+        $this->seeInDatabase('visits', ['views' => 2]);
+
+        unset($_SERVER['REMOTE_ADDR']);
+    }
+
+    public function testUserIdIncrements(): void
     {
         config('Visits')->trackingMethod = 'user_id';
         service('auth')->login(42);
@@ -38,6 +52,19 @@ public function testIncrements(): void
         $this->seeInDatabase('visits', ['views' => 2]);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testSessionIdIncrements(): void
+    {
+        config('Visits')->trackingMethod = 'session_id';
+        session_id('abc123');
+        $this->call();
+        $this->call();
+
+        $this->seeInDatabase('visits', ['views' => 2]);
+    }
+
     public function testBeforeRecords(): void
     {
         $this->call('before');

tests/ModelTest.php

@@ -125,6 +125,7 @@ public function testMakeFromRequestConvertsIp(): void
         $result = $this->model->makeFromRequest(single_service('request'));
 
         $this->assertSame($expected, $result->ipAddress);
+        $this->assertSame(ip2long($expected), $result->toRawArray()['ip_address']);
 
         unset($_SERVER['REMOTE_ADDR']);
     }