From 6102a7aceabddfdff52bb2e6d7a83ad8a87659ec Mon Sep 17 00:00:00 2001
From: Quentin Renard <quentin@area17.com>
Date: Fri, 26 Jan 2024 03:07:50 +0100
Subject: [PATCH] Preserve compatibility with Laravel 9

Twill can't do anything about the fact that spatie/laravel-analytics doesn't support GA4 with PHP 8.0 and Laravel 9, but we still need to keep v4 of laravel-analytics around, to avoid composer incompatibility issues when installing Twill on Laravel 9. We will drop support for Laravel 9 in Twill 4.
---
 composer.json                                 |  2 +-
 docs/content/1_docs/11_dashboard/index.md     |  2 +-
 .../Controllers/Admin/DashboardController.php | 61 +++++++++++++------
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index 35c541a3e..b2aa7fcca 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
     "myclabs/php-enum": "^1.5",
     "pragmarx/google2fa-qrcode": "^2.0",
     "spatie/laravel-activitylog": "^4.0",
-    "spatie/laravel-analytics": "^5.0",
+    "spatie/laravel-analytics": "^4.0|^5.0",
     "spatie/once": "^3.0"
   },
   "require-dev": {
diff --git a/docs/content/1_docs/11_dashboard/index.md b/docs/content/1_docs/11_dashboard/index.md
index 8589e62c9..2374abb45 100644
--- a/docs/content/1_docs/11_dashboard/index.md
+++ b/docs/content/1_docs/11_dashboard/index.md
@@ -48,7 +48,7 @@ return [
 
 It is using Spatie's [Laravel Analytics](https://github.com/spatie/laravel-analytics) package.
 
-Follow [Spatie's documentation](https://github.com/spatie/laravel-analytics#how-to-obtain-the-credentials-to-communicate-with-google-analytics) to set up a Google service account and download a json file containing your credentials, and provide your Analytics view ID using the `ANALYTICS_VIEW_ID` environment variable.
+Follow [Spatie's documentation](https://github.com/spatie/laravel-analytics#how-to-obtain-the-credentials-to-communicate-with-google-analytics) to set up a Google service account and download a json file containing your credentials, and provide your Analytics view ID using the `ANALYTICS_PROPERTY_ID` environment variable.
 
 ## User activity
 
diff --git a/src/Http/Controllers/Admin/DashboardController.php b/src/Http/Controllers/Admin/DashboardController.php
index ba32a92fc..20bfa0f52 100644
--- a/src/Http/Controllers/Admin/DashboardController.php
+++ b/src/Http/Controllers/Admin/DashboardController.php
@@ -287,30 +287,57 @@ private function formatAuthActivity(Activity $activity): array
      */
     private function getFacts()
     {
-        /** @var Analytics $analytics */
-        $analytics = app()->makeWith(Analytics::class, ['propertyId' => config('analytics.property_id')]);
+        // TODO: cleanup when dropping support for Laravel 9
+        $useV5API = true;
+        if (class_exists('Spatie\Analytics\Facades\Analytics')) {
+            /** @var Analytics $analytics */
+            $analytics = app()->makeWith(Analytics::class, ['propertyId' => config('analytics.property_id')]);
+        } else {
+            /** @var Analytics $analytics */
+            $analytics = app(Analytics::class);
+            $useV5API = false;
+        }
+
         try {
-            $response = $analytics->get(
-                Period::days(60),
-                ['totalUsers', 'screenPageViews', 'bounceRate', 'screenPageViewsPerSession'],
-                ['date']
-            );
+            if ($useV5API) {
+                $response = $analytics->get(
+                    Period::days(60),
+                    ['totalUsers', 'screenPageViews', 'bounceRate', 'screenPageViewsPerSession'],
+                    ['date']
+                );
+
+                $statsByDate = $response->map(function (array $item) {
+                    return [
+                        'date' => $item['date'],
+                        'users' => (int) $item['totalUsers'],
+                        'pageViews' => (int) $item['screenPageViews'],
+                        'bounceRate' => $item['bounceRate'],
+                        'pageviewsPerSession' => $item['screenPageViewsPerSession'],
+                    ];
+                })->reverse()->values();
+            } else {
+                $response = $analytics->performQuery(
+                    Period::days(60),
+                    'ga:users,ga:pageviews,ga:bouncerate,ga:pageviewsPerSession',
+                    ['dimensions' => 'ga:date']
+                );
+
+                $statsByDate = Collection::make($response['rows'] ?? [])->map(function (array $dateRow) {
+                    return [
+                        'date' => $dateRow[0],
+                        'users' => (int)$dateRow[1],
+                        'pageViews' => (int)$dateRow[2],
+                        'bounceRate' => $dateRow[3],
+                        'pageviewsPerSession' => $dateRow[4],
+                    ];
+                });
+            }
         } catch (InvalidConfiguration $exception) {
             $this->logger->error($exception);
 
             return [];
         }
 
-        $statsByDate = $response->map(function (array $item) {
-            return [
-                'date' => $item['date'],
-                'users' => (int) $item['totalUsers'],
-                'pageViews' => (int) $item['screenPageViews'],
-                'bounceRate' => $item['bounceRate'],
-                'pageviewsPerSession' => $item['screenPageViewsPerSession'],
-            ];
-        })->reverse()->values();
-
         $dummyData = null;
         if ($statsByDate->isEmpty()) {
             $dummyData = [