Associate activity with user by API key as fallback

range-of-motion · Dec 10, 2023 · c9e7b7f · c9e7b7f
1 parent 96885de
commit c9e7b7f
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 2 deletions.
diff --git a/app/Events/ImportCreated.php b/app/Events/ImportCreated.php
@@ -17,9 +17,17 @@ class ImportCreated
 
     public function __construct(Import $import)
     {
+        $userId = null;
+
+        if (Auth::check()) {
+            $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
+        }
+
         Activity::create([
             'space_id' => $import->space_id,
-            'user_id' => Auth::user()->id,
+            'user_id' => $userId,
             'entity_id' => $import->id,
             'entity_type' => 'import',
             'action' => 'import.created'

diff --git a/app/Events/ImportDeleted.php b/app/Events/ImportDeleted.php
@@ -17,9 +17,17 @@ class ImportDeleted
 
     public function __construct(Import $import)
     {
+        $userId = null;
+
+        if (Auth::check()) {
+            $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
+        }
+
         Activity::create([
             'space_id' => $import->space_id,
-            'user_id' => Auth::user()->id,
+            'user_id' => $userId,
             'entity_id' => $import->id,
             'entity_type' => 'import',
             'action' => 'import.deleted'

diff --git a/app/Events/RecurringCreated.php b/app/Events/RecurringCreated.php
@@ -21,6 +21,8 @@ public function __construct(Recurring $recurring)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/RecurringDeleted.php b/app/Events/RecurringDeleted.php
@@ -21,6 +21,8 @@ public function __construct(Recurring $recurring)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/TagCreated.php b/app/Events/TagCreated.php
@@ -21,6 +21,8 @@ public function __construct(Tag $tag)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/TagDeleted.php b/app/Events/TagDeleted.php
@@ -21,6 +21,8 @@ public function __construct(Tag $tag)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/TransactionCreated.php b/app/Events/TransactionCreated.php
@@ -22,6 +22,8 @@ public function __construct($transaction)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         if ($transaction instanceof Earning) {

diff --git a/app/Events/TransactionDeleted.php b/app/Events/TransactionDeleted.php
@@ -22,6 +22,8 @@ public function __construct($transaction)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         if ($transaction instanceof Earning) {

diff --git a/tests/Feature/Api/TransactionControllerTest.php b/tests/Feature/Api/TransactionControllerTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Api;
 
+use App\Models\Activity;
 use App\Models\ApiKey;
 use App\Models\Earning;
 use App\Models\Space;
@@ -46,5 +47,15 @@ public function testStoreEndpoint(): void
                 'amount' => 1050,
             ],
         );
+
+        $this->assertDatabaseHas(
+            Activity::class,
+            [
+                'space_id' => $space->id,
+                'user_id' => $user->id,
+                'entity_type' => 'earning', // TODO: create enum
+                'action' => 'transaction.created', // TODO: also create enum
+            ],
+        );
     }
 }