Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Associate activity with user by API key as fallback #465

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Associate activity with user by API key as fallback
range-of-motion committed Dec 10, 2023
commit c9e7b7f7cc45486d8b4d11b12fe4a132bca92563
10 changes: 9 additions & 1 deletion app/Events/ImportCreated.php
Original file line number Diff line number Diff line change
@@ -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'
10 changes: 9 additions & 1 deletion app/Events/ImportDeleted.php
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 2 additions & 0 deletions app/Events/RecurringCreated.php
Original file line number Diff line number Diff line change
@@ -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([
2 changes: 2 additions & 0 deletions app/Events/RecurringDeleted.php
Original file line number Diff line number Diff line change
@@ -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([
2 changes: 2 additions & 0 deletions app/Events/TagCreated.php
Original file line number Diff line number Diff line change
@@ -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([
2 changes: 2 additions & 0 deletions app/Events/TagDeleted.php
Original file line number Diff line number Diff line change
@@ -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([
2 changes: 2 additions & 0 deletions app/Events/TransactionCreated.php
Original file line number Diff line number Diff line change
@@ -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) {
2 changes: 2 additions & 0 deletions app/Events/TransactionDeleted.php
Original file line number Diff line number Diff line change
@@ -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) {
11 changes: 11 additions & 0 deletions tests/Feature/Api/TransactionControllerTest.php
Original file line number Diff line number Diff line change
@@ -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
],
);
}
}