updated analytics structure

app/Conductors/AnalyticsConductor.php

@@ -2,16 +2,7 @@
 
 namespace App\Conductors;
 
-use App\Models\Media;
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\InvalidCastException;
-use Illuminate\Database\Eloquent\MissingAttributeException;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
-use LogicException;
 
 class AnalyticsConductor extends Conductor
 {
@@ -19,20 +10,14 @@ class AnalyticsConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = \App\Models\Analytics::class;
+    protected $class = \App\Models\AnalyticsSession::class;
-
-    /**
-     * The default sorting field
-     * @var string
-     */
-    protected $sort = 'created_at';
 
     /**
      * The default includes to include in a request.
      *
      * @var array
      */
-    protected $includes = ['duration'];
+    protected $includes = ['requests.type','requests.path'];
 
 
     /**

app/Conductors/Conductor.php

@@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
 class Conductor
@@ -143,6 +142,7 @@ class Conductor
      *
      * @param Request    $request     The user request.
      * @param array|null $limitFields A list of fields to limit the filter request to.
+     * @return void
      */
     private function filter(Request $request, array|null $limitFields = null): void
     {
@@ -156,6 +156,7 @@ class Conductor
         }
         $filterFields += $this->defaultFilters;
 
+
         foreach ($filterFields as $field => $value) {
             if (
                 is_array($limitFields) === false ||
@@ -163,7 +164,7 @@ class Conductor
             ) {
                 $value = trim($value);
                 $operator = '';
-                $join = 'OR';
+                $join = 'AND';
 
                 // Check if value has a operator and remove it if it's a number
                 if (preg_match('/^(!?=|[<>]=?|<>|!)([^=!<>].*)*$/', $value, $matches) > 0) {
@@ -209,6 +210,8 @@ class Conductor
 
     /**
      * Apple the filter array to the collection.
+     *
+     * @return void
      */
     final public function applyFilters(): void
     {
@@ -217,6 +220,40 @@ class Conductor
             $result = null;
             $join = 'AND';
 
+            $relationFilter = [];
+
+            $buildWhereFunc = function ($query, $field, $operator, $value, $join) {
+                if ($join === 'OR') {
+                    if ($operator === '<>') {
+                        $separatorPos = strpos($value, '|');
+                        if ($separatorPos !== false) {
+                            $query->orWhereBetween(
+                                $field,
+                                [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
+                            );
+                        } else {
+                            $query->orWhere($field, '!=', $value);
+                        }
+                    } else {
+                        $query->orWhere($field, $operator, $value);
+                    }
+                } else {
+                    if ($operator === '<>') {
+                        $separatorPos = strpos($value, '|');
+                        if ($separatorPos !== false) {
+                            $query->whereBetween(
+                                $field,
+                                [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
+                            );
+                        } else {
+                            $query->where($field, '!=', $value);
+                        }
+                    } else {
+                        $query->where($field, $operator, $value);
+                    }
+                }//end if
+            };
+
             if (gettype($query) === 'array') {
                 $item = $query;
             }
@@ -288,35 +325,17 @@ class Conductor
                                 $operator = '=';
                             }
 
-                            if ($join === 'OR') {
+                            $relationSplit = strpos($field, '.');
-                                if ($operator === '<>') {
+                            if ($relationSplit !== false) {
-                                    $separatorPos = strpos($value, '|');
+                                $relation = substr($field, 0, $relationSplit);
-                                    if ($separatorPos !== false) {
+                                $field = substr($field, ($relationSplit + 1));
-                                        $query->orWhereBetween(
+
-                                            $field,
+                                if (method_exists($this->class, $relation) === true) {
-                                            [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
+                                    $relationFilter[$relation][] = [$field, $operator, $value, $join];
-                                        );
-                                    } else {
-                                        $query->orWhere($field, '!=', $value);
-                                    }
-                                } else {
-                                    $query->orWhere($field, $operator, $value);
                                 }
                             } else {
-                                if ($operator === '<>') {
+                                $buildWhereFunc($query, $field, $operator, $value, $join);
-                                    $separatorPos = strpos($value, '|');
+                            }
-                                    if ($separatorPos !== false) {
-                                        $query->whereBetween(
-                                            $field,
-                                            [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
-                                        );
-                                    } else {
-                                        $query->where($field, '!=', $value);
-                                    }
-                                } else {
-                                    $query->where($field, $operator, $value);
-                                }
-                            }//end if
                         }//end if
                     }//end if
 
@@ -338,6 +357,14 @@ class Conductor
                 }//end if
             }//end foreach
 
+            foreach ($relationFilter as $relation => $conditions) {
+                $query->whereHas($relation, function ($subQuery) use ($buildWhereFunc, $conditions) {
+                    foreach ($conditions as $condition) {
+                        $buildWhereFunc($subQuery, $condition[0], $condition[1], $condition[2], $condition[3]);
+                    }
+                });
+            }
+
             return $result;
         };
 

app/Http/Controllers/Api/AnalyticsController.php

@@ -6,13 +6,8 @@ use App\Conductors\AnalyticsConductor;
 use App\Conductors\Conductor;
 use App\Enum\HttpResponseCodes;
 use App\Http\Requests\AnalyticsRequest;
-use App\Models\Media;
 use App\Models\Analytics;
-use Illuminate\Http\JsonResponse;
+use App\Models\AnalyticsSession;
-use Carbon\Exceptions\InvalidFormatException;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Database\Eloquent\InvalidCastException;
-use Illuminate\Database\Eloquent\MassAssignmentException;
 use Illuminate\Http\Request;
 
 class AnalyticsController extends ApiController
@@ -39,27 +34,17 @@ class AnalyticsController extends ApiController
     public function index(Request $request)
     {
         if ($request->user() !== null && $request->user()?->hasPermission('admin/analytics') === true) {
-            $searchFields = ['attribute', 'type', 'useragent', 'ip'];
+            $request->rename([
+                'type' => 'requests.type',
+                'path' => 'requests.path'
+            ]);
 
-            $queryRequest = new Request();
+            list($collection, $total) = AnalyticsConductor::request($request);
-            $queryRequest->merge($request->only($searchFields));
-            foreach ($searchFields as $field) {
-                unset($request[$field]);
-            }
-
-            $query = Analytics::query()
-                ->selectRaw('session,
-                MIN(created_at) as created_at,
-                TIMESTAMPDIFF(MINUTE, MIN(created_at), MAX(created_at)) as duration');
-            $query = Conductor::filterQuery($query, $queryRequest);
-
-            list($collection, $total) = AnalyticsConductor::collection($request, $query
-            ->groupBy('session')
-            ->get());
 
             return $this->respondAsResource(
                 $collection,
-                ['isCollection' => true,
+                ['resourceName' => 'session',
+                    'isCollection' => true,
                     'appendData' => ['total' => $total]
                 ]
             );
@@ -71,22 +56,25 @@ class AnalyticsController extends ApiController
     /**
      * Display the specified resource.
      *
-     * @param \Illuminate\Http\Request $request   The endpoint request.
+     * @param \Illuminate\Http\Request     $request The endpoint request.
-     * @param  \App\Models\Analytics    $analytics The analyics model.
+     * @param  \App\Models\AnalyticsSession $session The analytics session.
      * @return \Illuminate\Http\Response
      */
-    public function show(Request $request, int $session)
+    public function show(Request $request, AnalyticsSession $session)
     {
         if ($request->user() !== null && $request->user()?->hasPermission('admin/analytics') === true) {
-            list($collection, $total) = AnalyticsConductor::collection($request, Analytics::query()
+            $session->load(['requests' => function ($query) {
-            ->where('session', $session)
+                $query->select('session_id', 'type', 'path', 'created_at');
-            ->get());
+            }
+            ]);
+
+            foreach ($session->requests as $requestItem) {
+                $requestItem->makeHidden('session_id');
+            }
 
             return $this->respondAsResource(
-                $collection,
+                $session,
-                ['isCollection' => true,
+                ['resourceName' => 'session']
-                    'appendData' => ['total' => $total]
-                ]
             );
         }
 
@@ -113,10 +101,10 @@ class AnalyticsController extends ApiController
             ];
 
             if ($user !== null && $user->hasPermission('admin/analytics') === true && $request->has('session') === true) {
-                $data['session'] = $request->input('session');
+                $data['session_id'] = $request->input('session_id');
-                $analytics = Analytics::create($data);
+                $analytics = AnalyticsRequest::create($data);
             } else {
-                $analytics = Analytics::createWithSession($data);
+                $analytics = AnalyticsRequest::create($data);
             }
 
             return $this->respondAsResource(
@@ -127,37 +115,4 @@ class AnalyticsController extends ApiController
             return $this->respondForbidden();
         }//end if
     }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \App\Http\Requests\AnalyticsRequest $request   The analytics update request.
-     * @param  \App\Models\Analytics               $analytics The specified analytics.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(AnalyticsRequest $request, Analytics $analytics)
-    {
-        if (AnalyticsConductor::updatable($analytics) === true) {
-            $analytics->update($request->all());
-            return $this->respondAsResource(AnalyticsConductor::model($request, $analytics));
-        }
-
-        return $this->respondForbidden();
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\Models\Analytics $analytics The specified analytics.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Analytics $analytics)
-    {
-        if (AnalyticsConductor::destroyable($analytics) === true) {
-            $analytics->delete();
-            return $this->respondNoContent();
-        } else {
-            return $this->respondForbidden();
-        }
-    }
 }

app/Http/Middleware/LogRequest.php

@@ -2,17 +2,19 @@
 
 namespace App\Http\Middleware;
 
+use App\Http\Requests\AnalyticsRequest;
 use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
-use App\Models\Analytics;
 
 class LogRequest
 {
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
+     * @param Illuminate\Http\Request                                                                           $request HTTP Request.
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next    Closure.
+     * @return Symfony\Component\HttpFoundation\Response
      */
     public function handle(Request $request, Closure $next): Response
     {
@@ -20,11 +22,9 @@ class LogRequest
         $response = $next($request);
 
         try {
-            Analytics::createWithSession([
+            AnalyticsRequest::create([
                 'type' => 'apirequest',
                 'attribute' => $request->path(),
-                'useragent' => $request->userAgent(),
-                'ip' => $request->ip(),
             ]);
 
             return $response;

app/Models/Analytics.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Analytics extends Model
-{
-    use HasFactory;
-
-    /**
-     * The attributes that aren't mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = [];
-
-
-    /**
-     * Create a new row in the analytics table with the given attributes,
-     * automatically assigning a session value based on previous rows.
-     *
-     * @param  array $attributes Model attributes.
-     */
-    public static function createWithSession(array $attributes): static
-    {
-        $previousRow = self::where('useragent', $attributes['useragent'])
-        ->where('ip', $attributes['ip'])
-        ->where('created_at', '>=', now()->subMinutes(30))
-        ->whereNotNull('session')
-        ->orderBy('created_at', 'desc')
-        ->first();
-
-        if ($previousRow !== null) {
-            $attributes['session'] = $previousRow->session;
-        } else {
-            $lastSession = self::max('session');
-            $attributes['session'] = ($lastSession + 1);
-        }
-
-        return static::create($attributes);
-    }
-}

app/Models/AnalyticsRequest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class AnalyticsRequest extends Model
+{
+    use HasFactory;
+
+
+    /**
+     * Model Boot.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function (AnalyticsRequest $analytics) {
+            if (isset($analytics->session_id) !== true) {
+                $request = request();
+                if ($request !== null) {
+                    $session = AnalyticsSession::where('ip', $request->ip())
+                        ->where('useragent', $request->userAgent())
+                        ->where('ended_at', '>=', now()->subMinutes(30))
+                        ->first();
+                    if ($session === null) {
+                        $session = AnalyticsSession::create([
+                            'ip'    => $request->ip(),
+                            'useragent' => $request->userAgent(),
+                            'ended_at'  => now()
+                        ]);
+                    }
+
+                    $analytics->session_id = $session->id;
+                }
+            }
+        });
+    }
+
+    /**
+     * Return the Analytics Session model.
+     *
+     * @return BelongsTo
+     */
+    public function session(): BelongsTo
+    {
+        return $this->belongsTo(AnalyticsSession::class, 'id', 'session_id');
+    }
+}

app/Models/AnalyticsSession.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class AnalyticsSession extends Model
+{
+    use HasFactory;
+
+    /**
+     * 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');
+    }
+    
+}

database/migrations/2023_05_01_045630_update_analytics_table.php

@@ -58,39 +58,6 @@ return new class extends Migration
                 $lastSessionUpdate = $sameSessionRows->first()->created_at;
             } while(true);
         } while(true);
-
-
-        // Loop through the rows and update `session` based on the logic you described
-        // foreach ($rows as $row) {
-        //     // Check if this is the first row
-        //     if ($row->created_at === $rows->first()->created_at) {
-        //         DB::table('analytics')
-        //             ->where('id', $row->id)
-        //             ->update(['session' => $session]);
-        //     } else {
-        //         // Look for a previous row with the same useragent and ip within the last 30 minutes
-        //         $previousRow = DB::table('analytics')
-        //             ->where('useragent', $row->useragent)
-        //             ->where('ip', $row->ip)
-        //             ->where('created_at', '>=', date('Y-m-d H:i:s', strtotime('-30 minutes', strtotime($row->created_at))))
-        //             ->whereNotNull('session')
-        //             ->orderBy('created_at', 'desc')
-        //             ->first();
-
-        //         if ($previousRow) {
-        //             // If a previous row is found, set the session to the same value
-        //             DB::table('analytics')
-        //                 ->where('id', $row->id)
-        //                 ->update(['session' => $previousRow->session]);
-        //         } else {
-        //             // If no previous row is found, increment the session value
-        //             $session++;
-        //             DB::table('analytics')
-        //                 ->where('id', $row->id)
-        //                 ->update(['session' => $session]);
-        //         }
-        //     }
-        // }
     }
 
     /**

database/migrations/2023_05_25_024138_split_analytics_table.php

@@ -0,0 +1,116 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('analytics_sessions', function (Blueprint $table) {
+            $table->id();
+            $table->text('useragent');
+            $table->string('ip');
+            $table->timestamps();
+            $table->timestamp('ended_at')->nullable();
+        });
+
+        Schema::create('analytics_requests', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('session_id')->unsigned();
+            $table->string('type');
+            $table->string('path');
+            $table->timestamps();
+
+            $table->foreign('session_id')->references('id')->on('analytics_sessions')->onDelete('cascade');
+        });
+
+        // Migrate old analytics table
+        $analytics = DB::table('analytics')
+            ->select(
+                'session',
+                DB::raw('MAX(useragent) as useragent'),
+                DB::raw('MAX(ip) as ip'),
+                DB::raw('MIN(created_at) as created_at'),
+                DB::raw('MIN(updated_at) as updated_at'))
+            ->groupBy('session')
+            ->get();
+        foreach ($analytics as $sessionItem) {
+            $ip         = $sessionItem->ip;
+            $useragent  = $sessionItem->useragent;
+            $session_id = $sessionItem->session;
+            $created_at = $sessionItem->created_at;
+            $updated_at = $sessionItem->updated_at;
+
+            // Create a new row in analytics_sessions
+            $new_session_id = DB::table('analytics_sessions')->insertGetId([
+                'id' => $session_id,
+                'useragent' => $useragent,
+                'ip' => $ip,
+                'created_at' => $created_at,
+                'updated_at' => $updated_at
+            ]);
+
+            $requests = DB::table('analytics')->where('session', $session_id)->select('type', 'attribute', 'created_at', 'updated_at')->get();
+            $ended_at = $sessionItem->created_at;
+                        
+            foreach($requests as $requestItem) {
+                if($ended_at < $requestItem->created_at) {
+                    $ended_at = $requestItem->created_at;
+                }
+
+                DB::table('analytics_requests')->insert([
+                    'session_id' => $new_session_id,
+                    'type' => $requestItem->type,
+                    'path' => $requestItem->attribute,
+                    'created_at' => $requestItem->created_at,
+                    'updated_at' => $requestItem->updated_at,
+                ]);
+            }
+
+            DB::table('analytics_sessions')->where('id', $new_session_id)->update(['ended_at' => $ended_at]);
+        }
+
+        Schema::dropIfExists('analytics');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::create('analytics', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('session')->nullable(false);
+            $table->string('type');
+            $table->string('attribute')->default('');
+            $table->text('useragent');
+            $table->string('ip');
+            $table->timestamps();
+        });
+
+        $sessions = DB::table('analytics_sessions')->get();
+        foreach ($sessions as $session) {
+            $requests = DB::table('analytics_requests')->where('session_id', $session->id)->get();
+            foreach($requests as $request) {
+                DB::table('analytics')->insert([
+                    'session' => $session->id,
+                    'type' => $request->type,
+                    'attribute' => $request->path,
+                    'ip' => $session->ip,
+                    'useragent' => $session->useragent,
+                    'created_at' => $request->created_at,
+                    'updated_at' => $request->updated_at,
+                ]);
+            }
+        }
+
+        Schema::dropIfExists('analytics_requests');
+        Schema::dropIfExists('analytics_sessions');
+    }
+};