mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-10-17 02:03:16 +01:00
Compare commits
3 Commits
ded56c0798
...
feature/ex
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ff77f6027 | ||
|
|
a40327298c | ||
|
|
fffb438963 |
@@ -11,7 +11,6 @@ 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;
|
||||
@@ -170,10 +169,6 @@ 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();
|
||||
|
||||
|
||||
@@ -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->setMemberIds($data->memberIds !== null ? (array) $data->memberIds : null);
|
||||
$dto->memberIds = $data->memberIds !== null ? ReportPropertiesDto::idArrayToCollection($data->memberIds) : null;
|
||||
$dto->billable = $data->billable;
|
||||
$dto->setClientIds($data->clientIds !== null ? (array) $data->clientIds : null);
|
||||
$dto->setProjectIds($data->projectIds !== null ? (array) $data->projectIds : null);
|
||||
$dto->setTagIds($data->tagIds !== null ? (array) $data->tagIds : null);
|
||||
$dto->clientIds = $data->clientIds !== null ? ReportPropertiesDto::idArrayToCollection($data->clientIds) : null;
|
||||
$dto->projectIds = $data->projectIds !== null ? ReportPropertiesDto::idArrayToCollection($data->projectIds) : null;
|
||||
$dto->tagIds = $data->tagIds !== null ? ReportPropertiesDto::idArrayToCollection($data->tagIds) : null;
|
||||
$dto->tagMatchType = isset($data->tagMatchType) ? TagMatchType::from($data->tagMatchType) : null;
|
||||
$dto->setTaskIds($data->taskIds !== null ? (array) $data->taskIds : null);
|
||||
$dto->taskIds = $data->taskIds ? ReportPropertiesDto::idArrayToCollection($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 && count($memberIds) > 0 ? ReportPropertiesDto::idArrayToCollection($memberIds) : null;
|
||||
$this->memberIds = $memberIds !== null ? ReportPropertiesDto::idArrayToCollection($memberIds) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -213,7 +213,7 @@ class ReportPropertiesDto implements Castable
|
||||
*/
|
||||
public function setClientIds(?array $clientIds): void
|
||||
{
|
||||
$this->clientIds = $clientIds !== null && count($clientIds) > 0 ? ReportPropertiesDto::idArrayToCollection($clientIds) : null;
|
||||
$this->clientIds = $clientIds !== null ? ReportPropertiesDto::idArrayToCollection($clientIds) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -221,7 +221,7 @@ class ReportPropertiesDto implements Castable
|
||||
*/
|
||||
public function setProjectIds(?array $projectIds): void
|
||||
{
|
||||
$this->projectIds = $projectIds !== null && count($projectIds) > 0 ? ReportPropertiesDto::idArrayToCollection($projectIds) : null;
|
||||
$this->projectIds = $projectIds !== null ? ReportPropertiesDto::idArrayToCollection($projectIds) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -229,7 +229,7 @@ class ReportPropertiesDto implements Castable
|
||||
*/
|
||||
public function setTagIds(?array $tagIds): void
|
||||
{
|
||||
$this->tagIds = $tagIds !== null && count($tagIds) > 0 ? ReportPropertiesDto::idArrayToCollection($tagIds) : null;
|
||||
$this->tagIds = $tagIds !== null ? 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 && count($taskIds) > 0 ? ReportPropertiesDto::idArrayToCollection($taskIds) : null;
|
||||
$this->taskIds = $taskIds !== null ? ReportPropertiesDto::idArrayToCollection($taskIds) : null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,8 +111,7 @@ class TimeEntryFilter
|
||||
*/
|
||||
public function addMemberIdsFilter(?array $memberIds): self
|
||||
{
|
||||
// An empty selection is no constraint, the same as null
|
||||
if ($memberIds === null || count($memberIds) === 0) {
|
||||
if ($memberIds === null) {
|
||||
return $this;
|
||||
}
|
||||
$this->builder->whereIn('member_id', $memberIds);
|
||||
@@ -182,10 +181,6 @@ 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) {
|
||||
@@ -209,10 +204,6 @@ 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) {
|
||||
@@ -278,10 +269,6 @@ 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) {
|
||||
|
||||
79
composer.lock
generated
79
composer.lock
generated
@@ -429,24 +429,23 @@
|
||||
},
|
||||
{
|
||||
"name": "brick/math",
|
||||
"version": "1.0.0",
|
||||
"version": "0.19.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/brick/math.git",
|
||||
"reference": "2effe05d2177c451b86c6a073196a4034c02f211"
|
||||
"reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/brick/math/zipball/2effe05d2177c451b86c6a073196a4034c02f211",
|
||||
"reference": "2effe05d2177c451b86c6a073196a4034c02f211",
|
||||
"url": "https://api.github.com/repos/brick/math/zipball/a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",
|
||||
"reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^8.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpstan/phpstan": "2.2.13",
|
||||
"phpstan/phpstan-phpunit": "2.0.18",
|
||||
"phpstan/phpstan": "2.1.22",
|
||||
"phpunit/phpunit": "^11.5"
|
||||
},
|
||||
"type": "library",
|
||||
@@ -477,7 +476,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/brick/math/issues",
|
||||
"source": "https://github.com/brick/math/tree/1.0.0"
|
||||
"source": "https://github.com/brick/math/tree/0.19.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -485,7 +484,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2026-09-12T10:28:18+00:00"
|
||||
"time": "2026-08-08T23:03:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "brick/money",
|
||||
@@ -4219,16 +4218,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/fortify",
|
||||
"version": "v1.40.0",
|
||||
"version": "v1.39.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/fortify.git",
|
||||
"reference": "fe0fce8814660317df0684f2c7be3b573def67d3"
|
||||
"reference": "b1fc50707bbe007fd92165d8b7d460ab549b355a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/fortify/zipball/fe0fce8814660317df0684f2c7be3b573def67d3",
|
||||
"reference": "fe0fce8814660317df0684f2c7be3b573def67d3",
|
||||
"url": "https://api.github.com/repos/laravel/fortify/zipball/b1fc50707bbe007fd92165d8b7d460ab549b355a",
|
||||
"reference": "b1fc50707bbe007fd92165d8b7d460ab549b355a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4279,24 +4278,24 @@
|
||||
"issues": "https://github.com/laravel/fortify/issues",
|
||||
"source": "https://github.com/laravel/fortify"
|
||||
},
|
||||
"time": "2026-09-10T11:52:08+00:00"
|
||||
"time": "2026-08-23T07:46:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v13.33.0",
|
||||
"version": "v13.32.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359"
|
||||
"reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/91188a17ceaa3dbace6e8a5f7abd0d042e466359",
|
||||
"reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/cdd8b33c246719acdd118c705ce8c7ab5ef48a96",
|
||||
"reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19 || ^0.20 || ^1.0",
|
||||
"brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19",
|
||||
"composer-runtime-api": "^2.2",
|
||||
"doctrine/inflector": "^2.0.5",
|
||||
"dragonmantank/cron-expression": "^3.4",
|
||||
@@ -4510,20 +4509,20 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2026-09-22T14:12:33+00:00"
|
||||
"time": "2026-09-15T14:55:30+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/octane",
|
||||
"version": "v2.20.0",
|
||||
"version": "v2.19.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/octane.git",
|
||||
"reference": "df4c38dcddc5f51e36e7f1d788841130c4fb8f45"
|
||||
"reference": "68a2516a0318baba0de0e4648f61e335c5e69dca"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/octane/zipball/df4c38dcddc5f51e36e7f1d788841130c4fb8f45",
|
||||
"reference": "df4c38dcddc5f51e36e7f1d788841130c4fb8f45",
|
||||
"url": "https://api.github.com/repos/laravel/octane/zipball/68a2516a0318baba0de0e4648f61e335c5e69dca",
|
||||
"reference": "68a2516a0318baba0de0e4648f61e335c5e69dca",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4599,7 +4598,7 @@
|
||||
"issues": "https://github.com/laravel/octane/issues",
|
||||
"source": "https://github.com/laravel/octane"
|
||||
},
|
||||
"time": "2026-08-23T17:25:20+00:00"
|
||||
"time": "2026-08-13T13:58:52+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/passkeys",
|
||||
@@ -4805,16 +4804,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/serializable-closure",
|
||||
"version": "v2.1.0",
|
||||
"version": "v2.0.16",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/serializable-closure.git",
|
||||
"reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5"
|
||||
"reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2d5869a838bbcf37e0d8b0568fc41914e81374b5",
|
||||
"reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5",
|
||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
|
||||
"reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4862,7 +4861,7 @@
|
||||
"issues": "https://github.com/laravel/serializable-closure/issues",
|
||||
"source": "https://github.com/laravel/serializable-closure"
|
||||
},
|
||||
"time": "2026-09-22T14:32:34+00:00"
|
||||
"time": "2026-08-18T20:28:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/tinker",
|
||||
@@ -15338,16 +15337,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/sail",
|
||||
"version": "v1.68.0",
|
||||
"version": "v1.67.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/sail.git",
|
||||
"reference": "2bc304083d515065b03944e425e62cb3c526c33e"
|
||||
"reference": "639e03ac12cf23def171770bcab05758045b2642"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/sail/zipball/2bc304083d515065b03944e425e62cb3c526c33e",
|
||||
"reference": "2bc304083d515065b03944e425e62cb3c526c33e",
|
||||
"url": "https://api.github.com/repos/laravel/sail/zipball/639e03ac12cf23def171770bcab05758045b2642",
|
||||
"reference": "639e03ac12cf23def171770bcab05758045b2642",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -15397,7 +15396,7 @@
|
||||
"issues": "https://github.com/laravel/sail/issues",
|
||||
"source": "https://github.com/laravel/sail"
|
||||
},
|
||||
"time": "2026-09-18T14:34:46+00:00"
|
||||
"time": "2026-08-12T13:55:56+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/sentinel",
|
||||
@@ -15457,16 +15456,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/telescope",
|
||||
"version": "v5.25.0",
|
||||
"version": "v5.24.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/telescope.git",
|
||||
"reference": "65fe6724f8688de01dfa74b28a0edc191bc3caa8"
|
||||
"reference": "50cbcf4553ddfd8d4bd456b04f97dfed923007d9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/telescope/zipball/65fe6724f8688de01dfa74b28a0edc191bc3caa8",
|
||||
"reference": "65fe6724f8688de01dfa74b28a0edc191bc3caa8",
|
||||
"url": "https://api.github.com/repos/laravel/telescope/zipball/50cbcf4553ddfd8d4bd456b04f97dfed923007d9",
|
||||
"reference": "50cbcf4553ddfd8d4bd456b04f97dfed923007d9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -15519,9 +15518,9 @@
|
||||
"monitoring"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/laravel/telescope/tree/v5.25.0"
|
||||
"source": "https://github.com/laravel/telescope/tree/v5.24.0"
|
||||
},
|
||||
"time": "2026-09-09T14:16:19+00:00"
|
||||
"time": "2026-09-08T16:15:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mockery/mockery",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"Billing": {
|
||||
"repository": "solidtime-io/extension-billing",
|
||||
"ref": "v0.0.8"
|
||||
"ref": "v0.0.7"
|
||||
},
|
||||
"Services": {
|
||||
"repository": "solidtime-io/extension-services",
|
||||
|
||||
@@ -111,8 +111,6 @@ export function useEventResize(params: {
|
||||
edge: 'start' | 'end',
|
||||
dayStr: string
|
||||
) {
|
||||
if (e.button !== 0) return;
|
||||
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
|
||||
@@ -168,10 +168,6 @@ 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" />
|
||||
|
||||
@@ -170,10 +170,6 @@ 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"
|
||||
|
||||
@@ -19,7 +19,7 @@ export const useNotificationsStore = defineStore('notifications', () => {
|
||||
const showActionBlockedModal = ref(false);
|
||||
|
||||
function addNotification(type: NotificationType, title: string, message?: string) {
|
||||
const uuid = Math.random().toString(36).substring(7);
|
||||
const uuid = crypto.randomUUID();
|
||||
notifications.value.push({ title, message, type, uuid });
|
||||
|
||||
setTimeout(() => {
|
||||
|
||||
@@ -606,51 +606,6 @@ 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
|
||||
|
||||
@@ -10,9 +10,6 @@ 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;
|
||||
@@ -26,7 +23,6 @@ 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;
|
||||
@@ -428,45 +424,4 @@ 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(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,25 +88,4 @@ 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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -416,81 +416,6 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user