Updated auditing extension to v0.0.5

.github/workflows/phpunit-extensions.yml

@@ -5,7 +5,7 @@ permissions:
 jobs:
   phpunit-extensions:
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 25
     strategy:
       matrix:
         postgres_version: [ 15, 16, 17 ]
@@ -132,5 +132,8 @@ jobs:
           php artisan key:generate
           php artisan passport:keys
 
-      - name: "Run PHPUnit"
+      - name: "Run PHPUnit (extensions)"
         run: php artisan test extensions/Billing/tests extensions/Services/tests extensions/Invoicing/tests --stop-on-failure
+
+      - name: "Run PHPUnit (core)"
+        run: php artisan test --testsuite=Unit,Feature --stop-on-failure

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -51,7 +51,6 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
@@ -614,24 +613,7 @@ class TimeEntryController extends Controller
             $this->checkPermission($organization, 'time-entries:create:all');
         }
 
-        // Lock the creation of running time entries per user, so that concurrent requests can not create more than one running time entry
-        $lock = $request->input('end') === null ? Cache::lock('time-entries:running:'.$member->user_id, 10) : null;
-        $lock?->block(5);
-
-        try {
-            return $this->storeTimeEntry($organization, $member, $request);
-        } finally {
-            $lock?->release();
-        }
-    }
-
-    /**
-     * @throws TimeEntryStillRunningApiException
-     */
-    private function storeTimeEntry(Organization $organization, Member $member, TimeEntryStoreRequest $request): JsonResource
-    {
-        // A user can only have one running time entry, across all organizations
-        if ($request->input('end') === null && TimeEntry::query()->where('user_id', $member->user_id)->whereNull('end')->exists()) {
+        if ($request->input('end') === null && TimeEntry::query()->whereBelongsTo($member, 'member')->where('end', null)->exists()) {
             throw new TimeEntryStillRunningApiException;
         }
 

extensions/manifest.json

@@ -9,10 +9,10 @@
     },
     "Invoicing": {
         "repository": "solidtime-io/extension-invoicing",
-        "ref": "v0.0.9"
+        "ref": "v0.0.10"
     },
     "Auditing": {
         "repository": "solidtime-io/extension-auditing",
-        "ref": "v0.0.4"
+        "ref": "v0.0.5"
     }
 }

tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php

@@ -24,9 +24,7 @@ use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Models\User;
 use App\Service\TimeEntryFilter;
-use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -2446,77 +2444,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response->assertJsonPath('error', true);
     }
 
-    public function test_store_endpoint_fails_if_user_already_has_active_time_entry_in_another_organization(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        $otherOrganization = Organization::factory()->create();
-        $otherMember = Member::factory()->forOrganization($otherOrganization)->forUser($data->user)->create();
-        TimeEntry::factory()->forOrganization($otherOrganization)->forMember($otherMember)->active()->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'billable' => true,
-            'start' => Carbon::now()->toIso8601ZuluString(),
-            'end' => null,
-            'member_id' => $data->member->getKey(),
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertJsonPath('key', 'time_entry_still_running');
-        $this->assertSame(0, TimeEntry::query()->whereBelongsTo($data->organization, 'organization')->count());
-    }
-
-    public function test_store_endpoint_releases_running_time_entry_lock_after_request(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'billable' => true,
-            'start' => Carbon::now()->toIso8601ZuluString(),
-            'end' => null,
-            'member_id' => $data->member->getKey(),
-        ]);
-
-        // Assert
-        $response->assertStatus(201);
-        $this->assertTrue(Cache::lock('time-entries:running:'.$data->user->getKey(), 10)->get());
-    }
-
-    public function test_store_endpoint_waits_for_running_time_entry_lock_and_fails_if_it_is_not_released(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        Cache::lock('time-entries:running:'.$data->user->getKey(), 10)->get();
-        $this->withoutExceptionHandling();
-        Passport::actingAs($data->user);
-
-        // Act
-        try {
-            $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-                'billable' => true,
-                'start' => Carbon::now()->toIso8601ZuluString(),
-                'end' => null,
-                'member_id' => $data->member->getKey(),
-            ]);
-            $this->fail('Expected LockTimeoutException');
-        } catch (LockTimeoutException) {
-            // Assert
-            $this->assertSame(0, TimeEntry::query()->count());
-        }
-    }
-
     public function test_store_endpoint_validation_fails_if_task_id_does_not_belong_to_project_id(): void
     {
         // Arrange