Actually send the session_id to GA4

Author: LukeTowers

src/Jobs/SendEventToAnalytics.php

@@ -20,11 +20,14 @@ class SendEventToAnalytics implements ShouldQueue
 
     public ?string $userId;
 
-    public function __construct($event, string $clientId = null, string $userId = null)
+    public ?string $sessionId;
+
+    public function __construct($event, string $clientId = null, string $userId = null, string $sessionId = null)
     {
         $this->event = $event;
         $this->clientId = $clientId;
         $this->userId = $userId;
+        $this->sessionId = $sessionId;
     }
 
     public function handle(EventBroadcaster $broadcaster)
@@ -37,6 +40,10 @@ public function handle(EventBroadcaster $broadcaster)
             $broadcaster->withParameters(fn (GA4 $GA4) => $GA4->setUserId($this->userId));
         }
 
+        if ($this->sessionId) {
+            $broadcaster->withParameters(fn (GA4 $GA4) => $GA4->setSessionId($this->sessionId));
+        }
+
         $broadcaster->handle($this->event);
     }
 }

src/Listeners/DispatchAnalyticsJob.php

@@ -3,6 +3,7 @@
 namespace DevPro\GA4EventTracking\Listeners;
 
 use DevPro\GA4EventTracking\Http\ClientIdRepository;
+use DevPro\GA4EventTracking\Http\SessionIdRepository;
 use DevPro\GA4EventTracking\Jobs\SendEventToAnalytics;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Auth;
@@ -12,15 +13,17 @@ class DispatchAnalyticsJob
     use InteractsWithQueue;
 
     public ClientIdRepository $clientIdRepository;
+    public SessionIdRepository $sessionIdRepository;
 
-    public function __construct(ClientIdRepository $clientIdRepository)
+    public function __construct(ClientIdRepository $clientIdRepository, SessionIdRepository $sessionIdRepository)
     {
         $this->clientIdRepository = $clientIdRepository;
+        $this->sessionIdRepository = $sessionIdRepository;
     }
 
     public function handle($event): void
     {
-        $job = new SendEventToAnalytics($event, $this->clientIdRepository->get(), $this->userId());
+        $job = new SendEventToAnalytics($event, $this->clientIdRepository->get(), $this->userId(), $this->sessionIdRepository->get());
         if ($queueName = config('ga4-event-tracking.tracking.queue_name')) {
             $job->onQueue($queueName);
         }