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

feat(event): filter event dates to exclude rescheduled and suspended entries

This commit is contained in:
ncoronel 2026-09-14 16:48:06 -03:00
parent b1e09b71ad
commit c27d9628fd
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Domains/Catalog/Models/Attribute.php
View File

@ -59,6 +59,8 @@ class Attribute extends Model
public function eventDates(): HasMany public function eventDates(): HasMany
{ {
return $this->hasMany(EventDate::class, 'tenant_code', 'tenant_codigo') return $this->hasMany(EventDate::class, 'tenant_code', 'tenant_codigo')
->whereNull('rescheduled_to_event_date_id')
->whereNull('suspended_at')
->orderBy('date') ->orderBy('date')
->orderBy('time_start'); ->orderBy('time_start');
} }

20
tests/Feature/Catalog/CatalogItemDetailControllerTest.php
View File

@ -220,6 +220,18 @@ class CatalogItemDetailControllerTest extends TestCase
'time_start' => '10:00', 'time_start' => '10:00',
'time_end' => '19:00', 'time_end' => '19:00',
]); ]);
$rescheduledEventDate = $tenant->eventDates()->create([
'date' => '2026-10-08',
'time_start' => '10:00',
'time_end' => '19:00',
'rescheduled_to_event_date_id' => $unusedEventDate->id,
]);
$suspendedEventDate = $tenant->eventDates()->create([
'date' => '2026-10-11',
'time_start' => '10:00',
'time_end' => '19:00',
'suspended_at' => now(),
]);
$item = $this->createItem($tenant, 'Entry'); $item = $this->createItem($tenant, 'Entry');
$attribute = Attribute::query()->create([ $attribute = Attribute::query()->create([
'tenant_codigo' => $tenant->codigo, 'tenant_codigo' => $tenant->codigo,
@ -245,6 +257,14 @@ class CatalogItemDetailControllerTest extends TestCase
->assertJsonPath('data.attributes.0.options.0.validity_time.type', 'fixed_window') ->assertJsonPath('data.attributes.0.options.0.validity_time.type', 'fixed_window')
->assertJsonPath('data.attributes.0.options.1.id', $unusedEventDate->id) ->assertJsonPath('data.attributes.0.options.1.id', $unusedEventDate->id)
->assertJsonPath('data.attributes.0.options.1.value', (string) $unusedEventDate->id) ->assertJsonPath('data.attributes.0.options.1.value', (string) $unusedEventDate->id)
->assertJsonMissing([
'id' => $rescheduledEventDate->id,
'value' => (string) $rescheduledEventDate->id,
])
->assertJsonMissing([
'id' => $suspendedEventDate->id,
'value' => (string) $suspendedEventDate->id,
])
->assertJsonPath('data.variants.0.values.event_date.value', (string) $eventDate->id) ->assertJsonPath('data.variants.0.values.event_date.value', (string) $eventDate->id)
->assertJsonPath( ->assertJsonPath(
'data.variants.0.values.event_date.label', 'data.variants.0.values.event_date.label',