refactor(ticket): remove service_date field and update validity time logic

app/Domains/Ticket/Controllers/TicketController.php

@@ -22,7 +22,7 @@ class TicketController extends Controller
         $tickets = Ticket::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('user_id', $request->user()->getKey())
-            ->with('validityTime', 'tenant', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
+            ->with('validityTime', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
             ->orderByDesc('id')
             ->get();
 
@@ -36,7 +36,7 @@ class TicketController extends Controller
             ->where('tenant_code', $tenant->codigo)
             ->where('user_id', $request->user()->getKey())
             ->whereIn('id', $ticketIds)
-            ->with('validityTime', 'tenant', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
+            ->with('validityTime', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
             ->orderByDesc('id')
             ->get();
 

app/Domains/Ticket/Enums/ValidityTimeType.php

@@ -4,7 +4,7 @@ namespace App\Domains\Ticket\Enums;
 
 enum ValidityTimeType: string
 {
-    case ServiceDateWindow = 'service_date_window';
+    case TimeWindow = 'time_window';
     case FixedWindow = 'fixed_window';
 
     /** @return list<string> */

app/Domains/Ticket/Models/Ticket.php

@@ -22,7 +22,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
     'source_catalog_item_id',
     'source_variant_id',
     'validity_time_id',
-    'service_date',
     'used_at',
     'scanner_user_id',
     'user_id',
@@ -46,7 +45,6 @@ class Ticket extends Model
             'source_variant_id' => 'integer',
             'source_purchase_id' => 'integer',
             'validity_time_id' => 'integer',
-            'service_date' => 'date',
             'used_at' => 'datetime',
             'scanner_user_id' => 'integer',
             'user_id' => 'integer',
@@ -97,13 +95,11 @@ class Ticket extends Model
 
     public function isValid(): bool
     {
-        $now = now();
-        $startsAt = $this->getEffectiveStartsAt();
-        $expiresAt = $this->getEffectiveExpiresAt();
-
         return $this->used_at === null
-            && ($startsAt === null || $startsAt->lessThanOrEqualTo($now))
-            && ($expiresAt === null || $expiresAt->greaterThan($now));
+            && (
+                $this->validityTime === null
+                || $this->validityTime->isValid()
+            );
     }
 
     public function getIsValidAttribute(): bool
@@ -127,17 +123,11 @@ class Ticket extends Model
 
     public function getEffectiveStartsAt(): ?CarbonInterface
     {
-        return $this->validityTime?->startsAt(
-            $this->service_date,
-            $this->tenant?->timezone ?? config('app.timezone'),
-        );
+        return $this->validityTime?->startsAt();
     }
 
     public function getEffectiveExpiresAt(): ?CarbonInterface
     {
-        return $this->validityTime?->expiresAt(
-            $this->service_date,
-            $this->tenant?->timezone ?? config('app.timezone'),
-        );
+        return $this->validityTime?->expiresAt();
     }
 }

app/Domains/Ticket/Models/ValidityTime.php

@@ -52,36 +52,49 @@ class ValidityTime extends Model
         return $this->hasMany(Ticket::class);
     }
 
-    public function startsAt(?CarbonInterface $serviceDate, string $timezone): ?CarbonInterface
-    {
+    public function startsAt(
+        ?CarbonInterface $at = null,
+    ): ?CarbonInterface {
         if ($this->type === ValidityTimeType::FixedWindow) {
             return $this->fixed_starts_at;
         }
 
-        return $this->atServiceDate($serviceDate, $this->start_time, $timezone);
+        return $this->atCurrentDate($this->start_time, $at);
     }
 
-    public function expiresAt(?CarbonInterface $serviceDate, string $timezone): ?CarbonInterface
-    {
+    public function expiresAt(
+        ?CarbonInterface $at = null,
+    ): ?CarbonInterface {
         if ($this->type === ValidityTimeType::FixedWindow) {
             return $this->fixed_expires_at;
         }
 
-        return $this->atServiceDate($serviceDate, $this->end_time, $timezone);
+        return $this->atCurrentDate($this->end_time, $at);
     }
 
-    private function atServiceDate(
-        ?CarbonInterface $serviceDate,
+    public function isValid(
+        ?CarbonInterface $at = null,
+    ): bool {
+        $at ??= now();
+        $startsAt = $this->startsAt($at);
+        $expiresAt = $this->expiresAt($at);
+
+        return ($startsAt === null || $startsAt->lessThanOrEqualTo($at))
+            && ($expiresAt === null || $expiresAt->greaterThan($at));
+    }
+
+    private function atCurrentDate(
         ?string $time,
-        string $timezone,
+        ?CarbonInterface $at,
     ): ?CarbonInterface {
-        if ($serviceDate === null || $time === null) {
+        if ($time === null) {
             return null;
         }
 
-        return CarbonImmutable::parse(
-            $serviceDate->format('Y-m-d').' '.$time,
-            $timezone,
-        )->utc();
+        $at ??= now();
+        $localDate = CarbonImmutable::instance($at)
+            ->format('Y-m-d');
+
+        return CarbonImmutable::parse($localDate.' '.$time);
     }
 }

app/Domains/Ticket/Services/TicketGeneratorService.php

@@ -5,7 +5,6 @@ namespace App\Domains\Ticket\Services;
 use App\Domains\Auth\Models\User;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
-use App\Domains\Ticket\Enums\ValidityTimeType;
 use App\Domains\Ticket\Exceptions\TicketGenerationException;
 use App\Domains\Ticket\Models\Ticket;
 use App\Domains\Ticket\Models\ValidityTime;
@@ -53,9 +52,6 @@ class TicketGeneratorService
                     'source_catalog_item_id' => $item->getKey(),
                     'source_variant_id' => $variant?->getKey(),
                     'validity_time_id' => $validityTime?->getKey(),
-                    'service_date' => $validityTime?->type === ValidityTimeType::ServiceDateWindow
-                        ? ($variant?->eventDate?->date ?? now($item->tenant->timezone)->toDateString())
-                        : null,
                     'used_at' => null,
                     'user_id' => $user->getKey(),
                 ]);