tbianchini/shopit-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ncoronel
2026-08-06 16:05:08 -03:00
parent 448ffb4102
commit b224dd8650
12 changed files with 73 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Domains/Ticket/Models/Ticket.php
View File

@@ -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();
}
}

41
app/Domains/Ticket/Models/ValidityTime.php
View File

@@ -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);
}
}