adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-10 01:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use an enum for tag match type

Browse Source
This commit is contained in:
Gregor Vostrak
2026-06-25 22:14:43 +02:00
parent 767eb00f7b
commit d0f2ee7d7e
11 changed files with 85 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Service/TimeEntryFilter.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\Service;
use App\Enums\TagMatchType;
use App\Models\Member;
use App\Models\TimeEntry;
use Illuminate\Database\Eloquent\Builder;
@@ -14,10 +15,6 @@ class TimeEntryFilter
{
public const string NONE_VALUE = 'none';
public const string TAG_MATCH_TYPE_CONTAINS = 'contains';
public const string TAG_MATCH_TYPE_NOT_CONTAINS = 'not_contains';
/**
* @var Builder<TimeEntry>
*/
@@ -196,18 +193,12 @@ class TimeEntryFilter
/**
* @param array<string>|null $tagIds
*/
public function addTagIdsFilter(?array $tagIds, ?string $tagMatchType = self::TAG_MATCH_TYPE_CONTAINS): self
public function addTagIdsFilter(?array $tagIds, ?TagMatchType $tagMatchType = TagMatchType::Contains): self
{
if ($tagIds === null) {
return $this;
}
if ($tagMatchType === null) {
$tagMatchType = self::TAG_MATCH_TYPE_CONTAINS;
}
if (! in_array($tagMatchType, [self::TAG_MATCH_TYPE_CONTAINS, self::TAG_MATCH_TYPE_NOT_CONTAINS], true)) {
Log::warning('Invalid tag match type value', ['value' => $tagMatchType]);
$tagMatchType = self::TAG_MATCH_TYPE_CONTAINS;
}
$tagMatchType ??= TagMatchType::Contains;
$includeNone = in_array(self::NONE_VALUE, $tagIds, true);
$tagIds = array_values(array_filter($tagIds, fn (string $id): bool => $id !== self::NONE_VALUE));
// An empty selection (no tag IDs and not filtering for "none") is no constraint, so apply nothing.
@@ -227,7 +218,7 @@ class TimeEntryFilter
}
};
if ($tagMatchType === self::TAG_MATCH_TYPE_NOT_CONTAINS) {
if ($tagMatchType === TagMatchType::NotContains) {
$this->builder->where(function (Builder $builder) use ($tagCondition, $includeNone): void {
$builder->whereNot($tagCondition);
if (! $includeNone) {