add time entry filter normalizeation

app/Service/DeletionService.php

@@ -11,6 +11,7 @@ use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
+use App\Models\Passport\RefreshToken;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Report;
@@ -169,6 +170,10 @@ class DeletionService
             }
         }
 
+        // Refresh tokens are not linked to the user directly, so they need to be deleted via their access tokens.
+        // Otherwise a still-valid refresh token could be used to issue a new access token for a deleted user,
+        // which fails with a foreign key violation on oauth_access_tokens.user_id.
+        RefreshToken::query()->whereIn('access_token_id', $user->accessTokens()->pluck('id'))->delete();
         $user->accessTokens()->delete();
         $user->authCodes()->delete();
 

app/Service/Dto/ReportPropertiesDto.php

@@ -117,13 +117,13 @@ class ReportPropertiesDto implements Castable
                 $dto->end = $data->end !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->end) : null;
                 $dto->start = $data->start !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->start) : null;
                 $dto->active = $data->active;
-                $dto->memberIds = $data->memberIds !== null ? ReportPropertiesDto::idArrayToCollection($data->memberIds) : null;
+                $dto->setMemberIds($data->memberIds !== null ? (array) $data->memberIds : null);
                 $dto->billable = $data->billable;
-                $dto->clientIds = $data->clientIds !== null ? ReportPropertiesDto::idArrayToCollection($data->clientIds) : null;
+                $dto->setClientIds($data->clientIds !== null ? (array) $data->clientIds : null);
-                $dto->projectIds = $data->projectIds !== null ? ReportPropertiesDto::idArrayToCollection($data->projectIds) : null;
+                $dto->setProjectIds($data->projectIds !== null ? (array) $data->projectIds : null);
-                $dto->tagIds = $data->tagIds !== null ? ReportPropertiesDto::idArrayToCollection($data->tagIds) : null;
+                $dto->setTagIds($data->tagIds !== null ? (array) $data->tagIds : null);
                 $dto->tagMatchType = isset($data->tagMatchType) ? TagMatchType::from($data->tagMatchType) : null;
-                $dto->taskIds = $data->taskIds ? ReportPropertiesDto::idArrayToCollection($data->taskIds) : null;
+                $dto->setTaskIds($data->taskIds !== null ? (array) $data->taskIds : null);
                 $dto->group = TimeEntryAggregationType::from($data->group);
                 $dto->subGroup = TimeEntryAggregationType::from($data->subGroup);
                 $dto->historyGroup = TimeEntryAggregationTypeInterval::from($data->historyGroup);
@@ -205,7 +205,7 @@ class ReportPropertiesDto implements Castable
      */
     public function setMemberIds(?array $memberIds): void
     {
-        $this->memberIds = $memberIds !== null ? ReportPropertiesDto::idArrayToCollection($memberIds) : null;
+        $this->memberIds = $memberIds !== null && count($memberIds) > 0 ? ReportPropertiesDto::idArrayToCollection($memberIds) : null;
     }
 
     /**
@@ -213,7 +213,7 @@ class ReportPropertiesDto implements Castable
      */
     public function setClientIds(?array $clientIds): void
     {
-        $this->clientIds = $clientIds !== null ? ReportPropertiesDto::idArrayToCollection($clientIds) : null;
+        $this->clientIds = $clientIds !== null && count($clientIds) > 0 ? ReportPropertiesDto::idArrayToCollection($clientIds) : null;
     }
 
     /**
@@ -221,7 +221,7 @@ class ReportPropertiesDto implements Castable
      */
     public function setProjectIds(?array $projectIds): void
     {
-        $this->projectIds = $projectIds !== null ? ReportPropertiesDto::idArrayToCollection($projectIds) : null;
+        $this->projectIds = $projectIds !== null && count($projectIds) > 0 ? ReportPropertiesDto::idArrayToCollection($projectIds) : null;
     }
 
     /**
@@ -229,7 +229,7 @@ class ReportPropertiesDto implements Castable
      */
     public function setTagIds(?array $tagIds): void
     {
-        $this->tagIds = $tagIds !== null ? ReportPropertiesDto::idArrayToCollection($tagIds) : null;
+        $this->tagIds = $tagIds !== null && count($tagIds) > 0 ? ReportPropertiesDto::idArrayToCollection($tagIds) : null;
     }
 
     public function setTagMatchType(?TagMatchType $tagMatchType): void
@@ -242,6 +242,6 @@ class ReportPropertiesDto implements Castable
      */
     public function setTaskIds(?array $taskIds): void
     {
-        $this->taskIds = $taskIds !== null ? ReportPropertiesDto::idArrayToCollection($taskIds) : null;
+        $this->taskIds = $taskIds !== null && count($taskIds) > 0 ? ReportPropertiesDto::idArrayToCollection($taskIds) : null;
     }
 }

app/Service/TimeEntryFilter.php

@@ -111,7 +111,8 @@ class TimeEntryFilter
      */
     public function addMemberIdsFilter(?array $memberIds): self
     {
-        if ($memberIds === null) {
+        // An empty selection is no constraint, the same as null
+        if ($memberIds === null || count($memberIds) === 0) {
             return $this;
         }
         $this->builder->whereIn('member_id', $memberIds);
@@ -181,6 +182,10 @@ class TimeEntryFilter
         }
         $includeNone = in_array(self::NONE_VALUE, $clientIds, true);
         $clientIds = array_values(array_filter($clientIds, fn (string $id): bool => $id !== self::NONE_VALUE));
+        // An empty selection (no client IDs and not filtering for "none") is no constraint, so apply nothing
+        if (count($clientIds) === 0 && ! $includeNone) {
+            return $this;
+        }
 
         $this->builder->where(function (Builder $builder) use ($clientIds, $includeNone): void {
             if (count($clientIds) > 0) {
@@ -204,6 +209,10 @@ class TimeEntryFilter
         }
         $includeNone = in_array(self::NONE_VALUE, $projectIds, true);
         $projectIds = array_values(array_filter($projectIds, fn (string $id): bool => $id !== self::NONE_VALUE));
+        // An empty selection (no project IDs and not filtering for "none") is no constraint, so apply nothing
+        if (count($projectIds) === 0 && ! $includeNone) {
+            return $this;
+        }
 
         $this->builder->where(function (Builder $builder) use ($projectIds, $includeNone): void {
             if (count($projectIds) > 0) {
@@ -269,6 +278,10 @@ class TimeEntryFilter
         }
         $includeNone = in_array(self::NONE_VALUE, $taskIds, true);
         $taskIds = array_values(array_filter($taskIds, fn (string $id): bool => $id !== self::NONE_VALUE));
+        // An empty selection (no task IDs and not filtering for "none") is no constraint, so apply nothing
+        if (count($taskIds) === 0 && ! $includeNone) {
+            return $this;
+        }
 
         $this->builder->where(function (Builder $builder) use ($taskIds, $includeNone): void {
             if (count($taskIds) > 0) {

extensions/manifest.json

@@ -1,7 +1,7 @@
 {
     "Billing": {
         "repository": "solidtime-io/extension-billing",
-        "ref": "v0.0.7"
+        "ref": "v0.0.8"
     },
     "Services": {
         "repository": "solidtime-io/extension-services",

resources/js/packages/ui/src/TimeTracker/TimeTrackerEntryInput.vue

@@ -168,6 +168,10 @@ defineExpose({ submit, focusAfterStart });
         data-testid="time_entry_description"
         class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-base text-text-primary bg-transparent border-none placeholder-text-secondary focus:ring-0 transition"
         type="text"
+        autocomplete="off"
+        data-1p-ignore
+        data-lpignore="true"
+        data-form-type="other"
         @keydown.enter="submit"
         @keydown.esc="showDropdown = false"
         @blur="updateTimeEntryDescription" />

resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue

@@ -170,6 +170,10 @@ function closeAndFocusInput() {
                             : 'text-text-primary bg-card-background border-border-secondary border border-none'
                     "
                     type="text"
+                    autocomplete="off"
+                    data-1p-ignore
+                    data-lpignore="true"
+                    data-form-type="other"
                     @focusin="openModalOnTab"
                     @click="openModalOnClick"
                     @keydown.exact.tab="focusNextElement"

resources/js/utils/notification.ts

@@ -19,7 +19,7 @@ export const useNotificationsStore = defineStore('notifications', () => {
     const showActionBlockedModal = ref(false);
 
     function addNotification(type: NotificationType, title: string, message?: string) {
-        const uuid = crypto.randomUUID();
+        const uuid = Math.random().toString(36).substring(7);
         notifications.value.push({ title, message, type, uuid });
 
         setTimeout(() => {

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

@@ -606,6 +606,51 @@ class ReportEndpointTest extends ApiEndpointTestAbstract
         );
     }
 
+    public function test_store_endpoint_stores_empty_id_filters_as_null(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'reports:create',
+        ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.reports.store', [$data->organization->getKey()]), [
+            'name' => 'Test Report with empty Filters',
+            'is_public' => false,
+            'properties' => [
+                'start' => Carbon::now()->subDays(30)->toIso8601ZuluString(),
+                'end' => Carbon::now()->toIso8601ZuluString(),
+                'group' => TimeEntryAggregationType::Project->value,
+                'sub_group' => TimeEntryAggregationType::Task->value,
+                'history_group' => TimeEntryAggregationType::Day->value,
+                'member_ids' => [],
+                'project_ids' => [],
+                'client_ids' => [],
+                'tag_ids' => [],
+                'task_ids' => [],
+            ],
+        ]);
+
+        // Assert
+        $response->assertStatus(201);
+        $response->assertJson(fn (AssertableJson $json) => $json
+            ->where('data.properties.member_ids', null)
+            ->where('data.properties.project_ids', null)
+            ->where('data.properties.client_ids', null)
+            ->where('data.properties.tag_ids', null)
+            ->where('data.properties.task_ids', null)
+            ->etc()
+        );
+        /** @var Report $report */
+        $report = Report::query()->findOrFail($response->json('data.id'));
+        $this->assertNull($report->properties->memberIds);
+        $this->assertNull($report->properties->projectIds);
+        $this->assertNull($report->properties->clientIds);
+        $this->assertNull($report->properties->tagIds);
+        $this->assertNull($report->properties->taskIds);
+    }
+
     public function test_store_endpoint_creates_report_with_none_filter_values(): void
     {
         // Arrange

tests/Unit/Service/DeletionServiceTest.php

@@ -10,6 +10,9 @@ use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembe
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
+use App\Models\Passport\Client as PassportClient;
+use App\Models\Passport\RefreshToken;
+use App\Models\Passport\Token;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Report;
@@ -23,6 +26,7 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 use PHPUnit\Framework\Attributes\CoversClass;
 use Tests\TestCaseWithDatabase;
 use TiMacDonald\Log\LogEntry;
@@ -424,4 +428,45 @@ class DeletionServiceTest extends TestCaseWithDatabase
             'role' => Role::Placeholder->value,
         ]);
     }
+
+    public function test_delete_user_deletes_access_tokens_and_their_refresh_tokens_but_does_not_delete_tokens_of_other_users(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+        $otherUser = User::factory()->create();
+        $passportClient = PassportClient::factory()->create();
+
+        $userToken = Token::factory()->forUser($user)->forClient($passportClient)->create();
+        $userRefreshToken = RefreshToken::query()->create([
+            'id' => Str::random(100),
+            'access_token_id' => $userToken->getKey(),
+            'revoked' => false,
+            'expires_at' => now()->addDays(30),
+        ]);
+
+        $otherUserToken = Token::factory()->forUser($otherUser)->forClient($passportClient)->create();
+        $otherUserRefreshToken = RefreshToken::query()->create([
+            'id' => Str::random(100),
+            'access_token_id' => $otherUserToken->getKey(),
+            'revoked' => false,
+            'expires_at' => now()->addDays(30),
+        ]);
+
+        // Act
+        $this->deletionService->deleteUser($user);
+
+        // Assert
+        $this->assertDatabaseMissing(Token::class, [
+            'id' => $userToken->getKey(),
+        ]);
+        $this->assertDatabaseMissing(RefreshToken::class, [
+            'id' => $userRefreshToken->getKey(),
+        ]);
+        $this->assertDatabaseHas(Token::class, [
+            'id' => $otherUserToken->getKey(),
+        ]);
+        $this->assertDatabaseHas(RefreshToken::class, [
+            'id' => $otherUserRefreshToken->getKey(),
+        ]);
+    }
 }

tests/Unit/Service/Dto/ReportPropertiesDtoTest.php

@@ -88,4 +88,25 @@ class ReportPropertiesDtoTest extends TestCase
         $this->assertSame(TimeEntryType::Work, $dtoWork->timeEntryType);
         $this->assertSame(TimeEntryType::Break, $dtoBreak->timeEntryType);
     }
+
+    public function test_empty_id_filters_of_a_persisted_report_are_read_as_null(): void
+    {
+        // Arrange
+        $properties = $this->getBaseProperties();
+        $properties['memberIds'] = [];
+        $properties['clientIds'] = [];
+        $properties['projectIds'] = [];
+        $properties['tagIds'] = [];
+        $properties['taskIds'] = [];
+
+        // Act
+        $dto = $this->castFromJson($properties);
+
+        // Assert
+        $this->assertNull($dto->memberIds);
+        $this->assertNull($dto->clientIds);
+        $this->assertNull($dto->projectIds);
+        $this->assertNull($dto->tagIds);
+        $this->assertNull($dto->taskIds);
+    }
 }

tests/Unit/Service/TimeEntryFilterTest.php

@@ -416,6 +416,81 @@ class TimeEntryFilterTest extends TestCaseWithDatabase
         $this->assertCount(3, $builderContains->get());
     }
 
+    public function test_add_member_ids_filter_with_empty_array_applies_no_filter(): void
+    {
+        // Arrange
+        TimeEntry::factory()->createMany(2);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addMemberIdsFilter([]);
+
+        // Assert
+        $this->assertCount(2, $builder->get());
+    }
+
+    public function test_add_project_ids_filter_with_empty_array_applies_no_filter(): void
+    {
+        // Arrange
+        $project = Project::factory()->create();
+        TimeEntry::factory()->create([
+            'project_id' => $project->getKey(),
+            'organization_id' => $project->organization_id,
+        ]);
+        TimeEntry::factory()->create(['project_id' => null]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addProjectIdsFilter([]);
+
+        // Assert
+        $this->assertCount(2, $builder->get());
+    }
+
+    public function test_add_task_ids_filter_with_empty_array_applies_no_filter(): void
+    {
+        // Arrange
+        $task = Task::factory()->create();
+        TimeEntry::factory()->create([
+            'task_id' => $task->getKey(),
+            'organization_id' => $task->organization_id,
+        ]);
+        TimeEntry::factory()->create(['task_id' => null]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addTaskIdsFilter([]);
+
+        // Assert
+        $this->assertCount(2, $builder->get());
+    }
+
+    public function test_add_client_ids_filter_with_empty_array_applies_no_filter(): void
+    {
+        // Arrange
+        $client = Client::factory()->create();
+        TimeEntry::factory()->create([
+            'client_id' => $client->getKey(),
+            'organization_id' => $client->organization_id,
+        ]);
+        TimeEntry::factory()->create(['client_id' => null]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addClientIdsFilter([]);
+
+        // Assert
+        $this->assertCount(2, $builder->get());
+    }
+
     public function test_add_tag_ids_filter_with_null_match_type_defaults_to_contains(): void
     {
         // Arrange