From 68affe4e4c3b07622785acaa2b29789716ae73e1 Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Thu, 25 May 2023 20:04:53 +1000
Subject: [PATCH] update table field names

---
 .../Controllers/Api/AnalyticsController.php   |  9 ++++----
 app/Http/Middleware/LogRequest.php            |  6 +++---
 ...csRequest.php => AnalyticsItemRequest.php} | 21 +++++++++++++++++--
 app/Models/AnalyticsSession.php               | 12 ++++++++++-
 4 files changed, 37 insertions(+), 11 deletions(-)
 rename app/Models/{AnalyticsRequest.php => AnalyticsItemRequest.php} (78%)

diff --git a/app/Http/Controllers/Api/AnalyticsController.php b/app/Http/Controllers/Api/AnalyticsController.php
index fb015d9..f78413b 100644
--- a/app/Http/Controllers/Api/AnalyticsController.php
+++ b/app/Http/Controllers/Api/AnalyticsController.php
@@ -3,10 +3,9 @@
 namespace App\Http\Controllers\Api;
 
 use App\Conductors\AnalyticsConductor;
-use App\Conductors\Conductor;
 use App\Enum\HttpResponseCodes;
 use App\Http\Requests\AnalyticsRequest;
-use App\Models\Analytics;
+use App\Models\AnalyticsItemRequest;
 use App\Models\AnalyticsSession;
 use Illuminate\Http\Request;
 
@@ -95,16 +94,16 @@ class AnalyticsController extends ApiController
 
             $data = [
                 'type' => $request->input('type'),
-                'attribute' => $request->input('attribute', ''),
+                'path' => $request->input('path', ''),
                 'useragent' => $request->userAgent(),
                 'ip' => $request->ip()
             ];
 
             if ($user !== null && $user->hasPermission('admin/analytics') === true && $request->has('session') === true) {
                 $data['session_id'] = $request->input('session_id');
-                $analytics = AnalyticsRequest::create($data);
+                $analytics = AnalyticsItemRequest::create($data);
             } else {
-                $analytics = AnalyticsRequest::create($data);
+                $analytics = AnalyticsItemRequest::create($data);
             }
 
             return $this->respondAsResource(
diff --git a/app/Http/Middleware/LogRequest.php b/app/Http/Middleware/LogRequest.php
index 7697388..b10c4c7 100644
--- a/app/Http/Middleware/LogRequest.php
+++ b/app/Http/Middleware/LogRequest.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Http\Requests\AnalyticsRequest;
+use App\Models\AnalyticsItemRequest;
 use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
@@ -22,9 +22,9 @@ class LogRequest
         $response = $next($request);
 
         try {
-            AnalyticsRequest::create([
+            AnalyticsItemRequest::create([
                 'type' => 'apirequest',
-                'attribute' => $request->path(),
+                'path' => $request->path(),
             ]);
 
             return $response;
diff --git a/app/Models/AnalyticsRequest.php b/app/Models/AnalyticsItemRequest.php
similarity index 78%
rename from app/Models/AnalyticsRequest.php
rename to app/Models/AnalyticsItemRequest.php
index c4f9d1e..c15ae11 100644
--- a/app/Models/AnalyticsRequest.php
+++ b/app/Models/AnalyticsItemRequest.php
@@ -6,10 +6,27 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class AnalyticsRequest extends Model
+class AnalyticsItemRequest extends Model
 {
     use HasFactory;
 
+    /**
+     * The table name
+     *
+     * @var string
+     */
+    protected $table = 'analytics_requests';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'type',
+        'path'
+    ];
+
 
     /**
      * Model Boot.
@@ -20,7 +37,7 @@ class AnalyticsRequest extends Model
     {
         parent::boot();
 
-        static::creating(function (AnalyticsRequest $analytics) {
+        static::creating(function (AnalyticsItemRequest $analytics) {
             if (isset($analytics->session_id) !== true) {
                 $request = request();
                 if ($request !== null) {
diff --git a/app/Models/AnalyticsSession.php b/app/Models/AnalyticsSession.php
index 25457b4..b394129 100644
--- a/app/Models/AnalyticsSession.php
+++ b/app/Models/AnalyticsSession.php
@@ -10,13 +10,23 @@ class AnalyticsSession extends Model
 {
     use HasFactory;
 
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'ip',
+        'useragent',
+    ];
+
     /**
      * Returns the related requests for this session.
      * 
      * @return Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function requests(): HasMany {
-        return $this->hasMany(AnalyticsRequest::class, 'session_id', 'id');
+        return $this->hasMany(AnalyticsItemRequest::class, 'session_id', 'id');
     }
     
 }