complete story 7.6 with qa tests
This commit is contained in:
Naser Mansour
parent
45e2be8468
commit
3bcbb13c61
|
|
@ -0,0 +1,58 @@
|
|||
schema: 1
|
||||
story: "7.6"
|
||||
story_title: "Booking Limit Indicator"
|
||||
gate: PASS
|
||||
status_reason: "All acceptance criteria met with comprehensive test coverage. Clean implementation following Laravel/Livewire best practices."
|
||||
reviewer: "Quinn (Test Architect)"
|
||||
updated: "2025-12-29T00:40:00Z"
|
||||
|
||||
waiver: { active: false }
|
||||
|
||||
top_issues: []
|
||||
|
||||
quality_score: 100
|
||||
expires: "2026-01-12T00:00:00Z"
|
||||
|
||||
evidence:
|
||||
tests_reviewed: 23
|
||||
risks_identified: 0
|
||||
trace:
|
||||
ac_covered: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
|
||||
ac_gaps: []
|
||||
|
||||
nfr_validation:
|
||||
security:
|
||||
status: PASS
|
||||
notes: "User data isolation verified. Only authenticated user's bookings visible. Eloquent ORM prevents SQL injection."
|
||||
performance:
|
||||
status: PASS
|
||||
notes: "3 efficient queries with proper filters. No N+1 issues. Calendar receives simple array."
|
||||
reliability:
|
||||
status: PASS
|
||||
notes: "All edge cases handled - cancelled/rejected bookings, multiple pending requests, loading states."
|
||||
maintainability:
|
||||
status: PASS
|
||||
notes: "Clean Volt component pattern. Well-organized code with clear separation of concerns."
|
||||
|
||||
risk_summary:
|
||||
totals: { critical: 0, high: 0, medium: 0, low: 0 }
|
||||
recommendations:
|
||||
must_fix: []
|
||||
monitor: []
|
||||
|
||||
recommendations:
|
||||
immediate: []
|
||||
future:
|
||||
- action: "Fix pre-existing date-sensitive test flakiness in AvailabilityCalendarTest.php (Story 3.3 technical debt)"
|
||||
refs: ["tests/Feature/Livewire/AvailabilityCalendarTest.php:58-65", "tests/Feature/Livewire/AvailabilityCalendarTest.php:77-86", "tests/Feature/Livewire/AvailabilityCalendarTest.php:129-140"]
|
||||
|
||||
notes: |
|
||||
Story 7.6 implementation is complete and well-tested.
|
||||
|
||||
All 16 new booking status indicator tests pass.
|
||||
All 7 new calendar booked dates tests pass.
|
||||
|
||||
3 pre-existing tests from Story 3.3 fail due to date-sensitive logic that breaks
|
||||
at month boundaries (using Carbon::now()->next(Carbon::SUNDAY) without navigating
|
||||
to the correct month). This is technical debt from Story 3.3, not introduced by
|
||||
Story 7.6.
|
||||
|
|
@ -15,27 +15,27 @@ So that **I understand when I can book consultations**.
|
|||
## Acceptance Criteria
|
||||
|
||||
### Display Locations
|
||||
- [ ] Dashboard widget showing booking status
|
||||
- [ ] Booking page status banner
|
||||
- [x] Dashboard widget showing booking status
|
||||
- [x] Booking page status banner
|
||||
|
||||
### Status Messages
|
||||
- [ ] "You can book a consultation today" (when no booking exists for today)
|
||||
- [ ] "You already have a booking for today" (when pending/approved booking exists for today)
|
||||
- [ ] "You have a pending request for [date]" (shows first pending request date)
|
||||
- [x] "You can book a consultation today" (when no booking exists for today)
|
||||
- [x] "You already have a booking for today" (when pending/approved booking exists for today)
|
||||
- [x] "You have a pending request for [date]" (shows first pending request date)
|
||||
|
||||
### Calendar Integration
|
||||
- [ ] Pass `bookedDates` array to availability calendar component
|
||||
- [ ] Calendar marks user's booked dates as unavailable (distinct styling)
|
||||
- [ ] Visual indicator differentiates "user already booked" from "no slots available"
|
||||
- [x] Pass `bookedDates` array to availability calendar component
|
||||
- [x] Calendar marks user's booked dates as unavailable (distinct styling)
|
||||
- [x] Visual indicator differentiates "user already booked" from "no slots available"
|
||||
|
||||
### Information
|
||||
- [ ] Clear messaging about 1-per-day limit
|
||||
- [ ] Bilingual messages (Arabic/English)
|
||||
- [x] Clear messaging about 1-per-day limit
|
||||
- [x] Bilingual messages (Arabic/English)
|
||||
|
||||
### Edge Cases
|
||||
- [ ] Handle multiple pending requests (show count or list)
|
||||
- [ ] Handle cancelled bookings (should not block new booking)
|
||||
- [ ] Loading state while fetching booking status
|
||||
- [x] Handle multiple pending requests (show count or list)
|
||||
- [x] Handle cancelled bookings (should not block new booking)
|
||||
- [x] Loading state while fetching booking status
|
||||
|
||||
## Technical Notes
|
||||
|
||||
|
|
@ -208,17 +208,138 @@ The calendar should style user's booked dates differently (e.g., with a badge or
|
|||
- **Epic 7 Success Criteria:** "Booking limit enforcement (1 per day)"
|
||||
|
||||
## Definition of Done
|
||||
- [ ] Booking status component created
|
||||
- [ ] Status displays on dashboard
|
||||
- [ ] Status displays on booking page
|
||||
- [ ] Calendar highlights user's booked dates
|
||||
- [ ] Messages are accurate for all states
|
||||
- [ ] Bilingual support (AR/EN)
|
||||
- [ ] Loading state implemented
|
||||
- [ ] Edge cases handled (multiple pending, cancelled)
|
||||
- [ ] Unit tests pass
|
||||
- [ ] Feature tests pass
|
||||
- [ ] Code formatted with Pint
|
||||
- [x] Booking status component created
|
||||
- [x] Status displays on dashboard
|
||||
- [x] Status displays on booking page
|
||||
- [x] Calendar highlights user's booked dates
|
||||
- [x] Messages are accurate for all states
|
||||
- [x] Bilingual support (AR/EN)
|
||||
- [x] Loading state implemented
|
||||
- [x] Edge cases handled (multiple pending, cancelled)
|
||||
- [x] Unit tests pass
|
||||
- [x] Feature tests pass
|
||||
- [x] Code formatted with Pint
|
||||
|
||||
## Estimation
|
||||
**Complexity:** Low | **Effort:** 2-3 hours
|
||||
|
||||
---
|
||||
|
||||
## Dev Agent Record
|
||||
|
||||
### Agent Model Used
|
||||
Claude Opus 4.5 (claude-opus-4-5-20251101)
|
||||
|
||||
### Completion Notes
|
||||
- Dashboard widget already existed from Story 7.2, no changes needed
|
||||
- Booking status banner integrated directly into booking page component instead of separate component
|
||||
- Calendar component updated to accept `bookedDates` prop and display user's booked dates with distinct sky-blue styling
|
||||
- User booked dates shown in legend only when the user has booked dates
|
||||
- All 23 new test assertions pass (16 booking status indicator tests + 7 calendar booked dates tests)
|
||||
|
||||
### File List
|
||||
**Modified:**
|
||||
- `resources/views/livewire/client/consultations/book.blade.php` - Added getBookingStatus method and status banner
|
||||
- `resources/views/livewire/availability-calendar.blade.php` - Added bookedDates prop and user_booked status handling
|
||||
- `lang/en/booking.php` - Added booking status translation keys
|
||||
- `lang/ar/booking.php` - Added booking status translation keys (Arabic)
|
||||
- `tests/Feature/Livewire/AvailabilityCalendarTest.php` - Added user booked dates tests
|
||||
|
||||
**Created:**
|
||||
- `tests/Feature/Client/BookingStatusIndicatorTest.php` - Comprehensive booking status indicator tests
|
||||
|
||||
### Change Log
|
||||
| Date | Change | Reason |
|
||||
|------|--------|--------|
|
||||
| 2025-12-29 | Added booking status banner to booking page | Display booking limit status to users |
|
||||
| 2025-12-29 | Added bookedDates integration to calendar | Visual indicator for user's booked dates |
|
||||
| 2025-12-29 | Added bilingual translation keys | Support AR/EN booking status messages |
|
||||
| 2025-12-29 | Created comprehensive test suite | Verify all acceptance criteria |
|
||||
|
||||
### Status
|
||||
Ready for Review
|
||||
|
||||
## QA Results
|
||||
|
||||
### Review Date: 2025-12-29
|
||||
|
||||
### Reviewed By: Quinn (Test Architect)
|
||||
|
||||
### Code Quality Assessment
|
||||
|
||||
**Overall: Excellent** - The implementation is clean, well-structured, and follows Laravel/Livewire best practices. The booking status indicator is elegantly integrated into the existing booking page component rather than creating unnecessary separate components. Code is readable, properly typed, and follows the project's Volt single-file component pattern.
|
||||
|
||||
**Highlights:**
|
||||
- Clean separation of concerns with `getBookingStatus()` method
|
||||
- Proper use of Eloquent for querying user's bookings
|
||||
- Correct handling of status enums (ConsultationStatus::Pending, ::Approved)
|
||||
- Smart calendar integration - `bookedDates` prop allows calendar to mark user's booked dates with distinct styling
|
||||
- Proper dark mode support throughout the UI
|
||||
|
||||
### Refactoring Performed
|
||||
|
||||
None required - the implementation quality is high.
|
||||
|
||||
### Compliance Check
|
||||
|
||||
- Coding Standards: ✓ Pint passes with no issues
|
||||
- Project Structure: ✓ Volt single-file component pattern followed correctly
|
||||
- Testing Strategy: ✓ Comprehensive test coverage with 16 booking status tests + 7 calendar integration tests
|
||||
- All ACs Met: ✓ All acceptance criteria are fully implemented
|
||||
|
||||
**AC Verification:**
|
||||
1. ✓ Dashboard widget showing booking status - Present in `dashboard.blade.php` (lines 196-241)
|
||||
2. ✓ Booking page status banner - Implemented in `book.blade.php` (lines 184-225)
|
||||
3. ✓ "You can book today" message - Translation key `booking.can_book_today`
|
||||
4. ✓ "Already booked today" message - Translation key `booking.already_booked_today`
|
||||
5. ✓ "Pending request for [date]" message - Translation key `booking.pending_for_date`
|
||||
6. ✓ `bookedDates` array passed to calendar - Line 231 in book.blade.php
|
||||
7. ✓ Calendar marks user's booked dates as unavailable - `user_booked` status in calendar component
|
||||
8. ✓ Visual indicator differentiates user's bookings - Sky-blue styling distinct from gray "unavailable"
|
||||
9. ✓ Clear 1-per-day limit messaging - `booking.limit_message` translation
|
||||
10. ✓ Bilingual messages (AR/EN) - Both lang files updated
|
||||
11. ✓ Multiple pending requests handling - Shows count and list up to 3
|
||||
12. ✓ Cancelled bookings don't block - Query filters by Pending/Approved only
|
||||
13. ✓ Loading state - Present via Livewire's wire:loading directives
|
||||
|
||||
### Improvements Checklist
|
||||
|
||||
- [x] All acceptance criteria implemented
|
||||
- [x] Tests pass for all new functionality (16/16 booking status tests)
|
||||
- [x] Bilingual support complete
|
||||
- [x] Calendar integration working correctly
|
||||
- [ ] **Pre-existing test flakiness** - 3 tests in `AvailabilityCalendarTest.php` fail due to date-sensitive logic (tests 58-65, 77-86, 129-140 use `Carbon::now()->next(Carbon::SUNDAY)` which resolves to January 2026 when run in late December 2025, but calendar defaults to current month). This is a **pre-existing issue from Story 3.3**, not introduced by Story 7.6.
|
||||
|
||||
### Security Review
|
||||
|
||||
**Status: PASS**
|
||||
- User data isolation verified - `getBookingStatus()` queries only the authenticated user's bookings
|
||||
- Test confirms other users' bookings are not visible (`booking status does not include other users bookings`)
|
||||
- No SQL injection risks - uses Eloquent ORM with parameterized queries
|
||||
- No XSS risks - all output properly escaped via Blade templating
|
||||
|
||||
### Performance Considerations
|
||||
|
||||
**Status: PASS**
|
||||
- `getBookingStatus()` executes 3 queries (today booking, pending requests, booked dates) - acceptable for the use case
|
||||
- Queries are properly scoped with date filters and status filters
|
||||
- No N+1 query issues detected
|
||||
- Calendar component efficiently passes booked dates as a simple array
|
||||
|
||||
### Files Modified During Review
|
||||
|
||||
None - no refactoring was required.
|
||||
|
||||
### Gate Status
|
||||
|
||||
Gate: **PASS** → `docs/qa/gates/7.6-booking-limit-indicator.yml`
|
||||
|
||||
### Recommended Status
|
||||
|
||||
✓ **Ready for Done**
|
||||
|
||||
**Notes:**
|
||||
- All 16 new booking status indicator tests pass
|
||||
- All 7 new calendar booked dates tests pass
|
||||
- The 3 failing tests are **pre-existing flaky tests from Story 3.3** (date-sensitive logic that breaks at month boundaries). These should be addressed in a separate technical debt story, not blocking Story 7.6 which did not introduce them.
|
||||
- Code is clean, well-tested, and follows all project conventions
|
||||
|
|
|
|||
|
|
@ -56,4 +56,12 @@ return [
|
|||
// Other
|
||||
'submitted_on' => 'تاريخ التقديم',
|
||||
'pending_review' => 'قيد المراجعة',
|
||||
|
||||
// Booking status
|
||||
'can_book_today' => 'يمكنك حجز استشارة اليوم',
|
||||
'already_booked_today' => 'لديك حجز بالفعل لهذا اليوم',
|
||||
'pending_for_date' => 'لديك طلب معلق بتاريخ :date',
|
||||
'pending_count' => 'لديك :count طلبات معلقة',
|
||||
'limit_message' => 'ملاحظة: يمكنك حجز استشارة واحدة كحد أقصى في اليوم.',
|
||||
'user_booked' => 'حجزك',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -56,4 +56,12 @@ return [
|
|||
// Other
|
||||
'submitted_on' => 'Submitted',
|
||||
'pending_review' => 'Pending Review',
|
||||
|
||||
// Booking status
|
||||
'can_book_today' => 'You can book a consultation today',
|
||||
'already_booked_today' => 'You already have a booking for today',
|
||||
'pending_for_date' => 'You have a pending request for :date',
|
||||
'pending_count' => 'You have :count pending requests',
|
||||
'limit_message' => 'Note: You can book a maximum of 1 consultation per day.',
|
||||
'user_booked' => 'Your booking',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -16,8 +16,11 @@ new class extends Component
|
|||
|
||||
public array $availableSlots = [];
|
||||
|
||||
public function mount(): void
|
||||
public array $bookedDates = [];
|
||||
|
||||
public function mount(array $bookedDates = []): void
|
||||
{
|
||||
$this->bookedDates = $bookedDates;
|
||||
$this->year = now()->year;
|
||||
$this->month = now()->month;
|
||||
$this->loadMonthAvailability();
|
||||
|
|
@ -57,6 +60,11 @@ new class extends Component
|
|||
|
||||
public function selectDate(string $date): void
|
||||
{
|
||||
// Prevent selecting user's already booked dates
|
||||
if (in_array($date, $this->bookedDates)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$status = $this->monthAvailability[$date] ?? 'unavailable';
|
||||
|
||||
if (in_array($status, ['available', 'partial'])) {
|
||||
|
|
@ -119,10 +127,16 @@ new class extends Component
|
|||
$current = $firstDay->copy();
|
||||
while ($current->lte($lastDay)) {
|
||||
$dateStr = $current->format('Y-m-d');
|
||||
|
||||
// Check if user has already booked this date
|
||||
$status = in_array($dateStr, $this->bookedDates)
|
||||
? 'user_booked'
|
||||
: ($this->monthAvailability[$dateStr] ?? 'unavailable');
|
||||
|
||||
$days[] = [
|
||||
'date' => $dateStr,
|
||||
'day' => $current->day,
|
||||
'status' => $this->monthAvailability[$dateStr] ?? 'unavailable',
|
||||
'status' => $status,
|
||||
];
|
||||
$current->addDay();
|
||||
}
|
||||
|
|
@ -136,6 +150,7 @@ new class extends Component
|
|||
'monthName' => Carbon::create($this->year, $this->month, 1)->translatedFormat('F Y'),
|
||||
'calendarDays' => $this->buildCalendarDays(),
|
||||
'dayHeaders' => $this->getDayHeaders(),
|
||||
'bookedDates' => $this->bookedDates,
|
||||
];
|
||||
}
|
||||
}; ?>
|
||||
|
|
@ -175,10 +190,11 @@ new class extends Component
|
|||
'h-12 rounded-lg text-center transition-colors font-medium',
|
||||
'bg-emerald-100 text-emerald-700 hover:bg-emerald-200 dark:bg-emerald-900/30 dark:text-emerald-400 dark:hover:bg-emerald-900/50' => $dayData['status'] === 'available',
|
||||
'bg-amber-100 text-amber-700 hover:bg-amber-200 dark:bg-amber-900/30 dark:text-amber-400 dark:hover:bg-amber-900/50' => $dayData['status'] === 'partial',
|
||||
'bg-sky-100 text-sky-700 cursor-not-allowed dark:bg-sky-900/30 dark:text-sky-400' => $dayData['status'] === 'user_booked',
|
||||
'bg-zinc-100 text-zinc-400 cursor-not-allowed dark:bg-zinc-800 dark:text-zinc-600' => in_array($dayData['status'], ['past', 'closed', 'blocked', 'full']),
|
||||
'ring-2 ring-amber-500 dark:ring-amber-400' => $selectedDate === $dayData['date'],
|
||||
])
|
||||
@disabled(in_array($dayData['status'], ['past', 'closed', 'blocked', 'full']))
|
||||
@disabled(in_array($dayData['status'], ['past', 'closed', 'blocked', 'full', 'user_booked']))
|
||||
>
|
||||
{{ $dayData['day'] }}
|
||||
</button>
|
||||
|
|
@ -221,6 +237,12 @@ new class extends Component
|
|||
<div class="w-4 h-4 rounded bg-amber-100 dark:bg-amber-900/30"></div>
|
||||
<span class="text-zinc-600 dark:text-zinc-400">{{ __('booking.partial') }}</span>
|
||||
</div>
|
||||
@if(count($bookedDates) > 0)
|
||||
<div class="flex items-center gap-2">
|
||||
<div class="w-4 h-4 rounded bg-sky-100 dark:bg-sky-900/30"></div>
|
||||
<span class="text-zinc-600 dark:text-zinc-400">{{ __('booking.user_booked') }}</span>
|
||||
</div>
|
||||
@endif
|
||||
<div class="flex items-center gap-2">
|
||||
<div class="w-4 h-4 rounded bg-zinc-100 dark:bg-zinc-800"></div>
|
||||
<span class="text-zinc-600 dark:text-zinc-400">{{ __('booking.unavailable') }}</span>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,36 @@ new class extends Component
|
|||
|
||||
public bool $showConfirmation = false;
|
||||
|
||||
public function getBookingStatus(): array
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
$todayBooking = $user->consultations()
|
||||
->whereDate('booking_date', today())
|
||||
->whereIn('status', [ConsultationStatus::Pending, ConsultationStatus::Approved])
|
||||
->first();
|
||||
|
||||
$pendingRequests = $user->consultations()
|
||||
->where('status', ConsultationStatus::Pending)
|
||||
->where('booking_date', '>=', today())
|
||||
->orderBy('booking_date')
|
||||
->get();
|
||||
|
||||
$bookedDates = $user->consultations()
|
||||
->whereIn('status', [ConsultationStatus::Pending, ConsultationStatus::Approved])
|
||||
->where('booking_date', '>=', today())
|
||||
->pluck('booking_date')
|
||||
->map(fn ($d) => $d->format('Y-m-d'))
|
||||
->toArray();
|
||||
|
||||
return [
|
||||
'canBookToday' => is_null($todayBooking),
|
||||
'todayBooking' => $todayBooking,
|
||||
'pendingRequests' => $pendingRequests,
|
||||
'bookedDates' => $bookedDates,
|
||||
];
|
||||
}
|
||||
|
||||
public function selectSlot(string $date, string $time): void
|
||||
{
|
||||
$this->selectedDate = $date;
|
||||
|
|
@ -141,16 +171,64 @@ new class extends Component
|
|||
$this->showConfirmation = false;
|
||||
}
|
||||
}
|
||||
|
||||
public function with(): array
|
||||
{
|
||||
return $this->getBookingStatus();
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div class="max-w-4xl mx-auto">
|
||||
<flux:heading size="xl" class="mb-6">{{ __('booking.request_consultation') }}</flux:heading>
|
||||
|
||||
{{-- Booking Status Banner --}}
|
||||
<div class="mb-6 rounded-lg border p-4 {{ $canBookToday ? 'border-green-200 bg-green-50 dark:border-green-800 dark:bg-green-900/20' : 'border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-900/20' }}">
|
||||
<div class="flex items-start gap-3">
|
||||
@if($canBookToday)
|
||||
<flux:icon name="check-circle" class="mt-0.5 h-5 w-5 flex-shrink-0 text-green-600 dark:text-green-400" />
|
||||
<div>
|
||||
<p class="font-medium text-green-700 dark:text-green-400">{{ __('booking.can_book_today') }}</p>
|
||||
</div>
|
||||
@else
|
||||
<flux:icon name="information-circle" class="mt-0.5 h-5 w-5 flex-shrink-0 text-amber-600 dark:text-amber-400" />
|
||||
<div>
|
||||
<p class="font-medium text-amber-700 dark:text-amber-400">{{ __('booking.already_booked_today') }}</p>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
@if($pendingRequests->isNotEmpty())
|
||||
<div class="mt-3 border-t border-zinc-200 pt-3 dark:border-zinc-700">
|
||||
@if($pendingRequests->count() === 1)
|
||||
<p class="text-sm text-zinc-600 dark:text-zinc-400">
|
||||
{{ __('booking.pending_for_date', ['date' => $pendingRequests->first()->booking_date->format('d/m/Y')]) }}
|
||||
</p>
|
||||
@else
|
||||
<p class="text-sm text-zinc-600 dark:text-zinc-400">
|
||||
{{ __('booking.pending_count', ['count' => $pendingRequests->count()]) }}
|
||||
</p>
|
||||
<ul class="mt-1 list-inside list-disc text-sm text-zinc-500 dark:text-zinc-400">
|
||||
@foreach($pendingRequests->take(3) as $request)
|
||||
<li>{{ $request->booking_date->format('d/m/Y') }}</li>
|
||||
@endforeach
|
||||
@if($pendingRequests->count() > 3)
|
||||
<li>...</li>
|
||||
@endif
|
||||
</ul>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<p class="mt-3 text-xs text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('booking.limit_message') }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@if(!$selectedDate || !$selectedTime)
|
||||
<!-- Step 1: Calendar Selection -->
|
||||
<div class="mt-6">
|
||||
<p class="mb-4 text-zinc-600 dark:text-zinc-400">{{ __('booking.select_date_time') }}</p>
|
||||
<livewire:availability-calendar />
|
||||
<livewire:availability-calendar :booked-dates="$bookedDates" />
|
||||
</div>
|
||||
@else
|
||||
<!-- Step 2: Problem Summary -->
|
||||
|
|
|
|||
|
|
@ -0,0 +1,254 @@
|
|||
<?php
|
||||
|
||||
use App\Models\Consultation;
|
||||
use App\Models\User;
|
||||
use App\Models\WorkingHour;
|
||||
use Livewire\Volt\Volt;
|
||||
|
||||
beforeEach(function () {
|
||||
// Setup working hours for Monday (day 1)
|
||||
WorkingHour::factory()->create([
|
||||
'day_of_week' => 1,
|
||||
'start_time' => '09:00',
|
||||
'end_time' => '17:00',
|
||||
'is_active' => true,
|
||||
]);
|
||||
});
|
||||
|
||||
// Booking Page Status Banner Tests
|
||||
test('booking page shows can book today message for new users', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee(__('booking.can_book_today'));
|
||||
});
|
||||
|
||||
test('booking page shows already booked message when user has pending booking today', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
Consultation::factory()->pending()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => today(),
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee(__('booking.already_booked_today'));
|
||||
});
|
||||
|
||||
test('booking page shows already booked message when user has approved booking today', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
Consultation::factory()->approved()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => today(),
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee(__('booking.already_booked_today'));
|
||||
});
|
||||
|
||||
test('booking page shows can book when user has only cancelled booking today', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
Consultation::factory()->cancelled()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => today(),
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee(__('booking.can_book_today'));
|
||||
});
|
||||
|
||||
test('booking page shows can book when user has only rejected booking today', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
Consultation::factory()->rejected()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => today(),
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee(__('booking.can_book_today'));
|
||||
});
|
||||
|
||||
// Pending Requests Display Tests
|
||||
test('booking page shows single pending request date', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
$pendingDate = today()->addDays(3);
|
||||
Consultation::factory()->pending()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => $pendingDate,
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee($pendingDate->format('d/m/Y'));
|
||||
});
|
||||
|
||||
test('booking page shows pending request count for multiple requests', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
Consultation::factory()->pending()->count(3)->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => today()->addDays(5),
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee(__('booking.pending_count', ['count' => 3]));
|
||||
});
|
||||
|
||||
test('booking page shows limit message', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee(__('booking.limit_message'));
|
||||
});
|
||||
|
||||
// getBookingStatus Method Tests
|
||||
test('getBookingStatus returns correct structure', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
$component = Volt::test('client.consultations.book');
|
||||
|
||||
// The component should have these view properties via with() method
|
||||
$component->assertViewHas('canBookToday', true)
|
||||
->assertViewHas('todayBooking', null)
|
||||
->assertViewHas('pendingRequests')
|
||||
->assertViewHas('bookedDates');
|
||||
});
|
||||
|
||||
test('bookedDates only includes pending and approved bookings', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
// Create bookings with different statuses
|
||||
$pendingDate = today()->addDays(1)->format('Y-m-d');
|
||||
$approvedDate = today()->addDays(2)->format('Y-m-d');
|
||||
$cancelledDate = today()->addDays(3)->format('Y-m-d');
|
||||
$rejectedDate = today()->addDays(4)->format('Y-m-d');
|
||||
|
||||
Consultation::factory()->pending()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => $pendingDate,
|
||||
]);
|
||||
Consultation::factory()->approved()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => $approvedDate,
|
||||
]);
|
||||
Consultation::factory()->cancelled()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => $cancelledDate,
|
||||
]);
|
||||
Consultation::factory()->rejected()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => $rejectedDate,
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
$component = Volt::test('client.consultations.book');
|
||||
|
||||
$bookedDates = $component->viewData('bookedDates');
|
||||
|
||||
expect($bookedDates)->toContain($pendingDate)
|
||||
->toContain($approvedDate)
|
||||
->not->toContain($cancelledDate)
|
||||
->not->toContain($rejectedDate);
|
||||
});
|
||||
|
||||
test('bookedDates does not include past bookings', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$pastDate = today()->subDays(3)->format('Y-m-d');
|
||||
$futureDate = today()->addDays(3)->format('Y-m-d');
|
||||
|
||||
Consultation::factory()->approved()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => $pastDate,
|
||||
]);
|
||||
Consultation::factory()->approved()->create([
|
||||
'user_id' => $client->id,
|
||||
'booking_date' => $futureDate,
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
$component = Volt::test('client.consultations.book');
|
||||
|
||||
$bookedDates = $component->viewData('bookedDates');
|
||||
|
||||
expect($bookedDates)->not->toContain($pastDate)
|
||||
->toContain($futureDate);
|
||||
});
|
||||
|
||||
// Bilingual Support Tests
|
||||
test('booking status messages display correctly in English', function () {
|
||||
app()->setLocale('en');
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee('You can book a consultation today');
|
||||
});
|
||||
|
||||
test('booking status messages display correctly in Arabic', function () {
|
||||
app()->setLocale('ar');
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee('يمكنك حجز استشارة اليوم');
|
||||
});
|
||||
|
||||
test('limit message displays correctly in English', function () {
|
||||
app()->setLocale('en');
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee('Note: You can book a maximum of 1 consultation per day.');
|
||||
});
|
||||
|
||||
test('limit message displays correctly in Arabic', function () {
|
||||
app()->setLocale('ar');
|
||||
$client = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
Volt::test('client.consultations.book')
|
||||
->assertSee('ملاحظة: يمكنك حجز استشارة واحدة كحد أقصى في اليوم.');
|
||||
});
|
||||
|
||||
// Data Isolation Tests
|
||||
test('booking status does not include other users bookings', function () {
|
||||
$client = User::factory()->individual()->create();
|
||||
$otherClient = User::factory()->individual()->create();
|
||||
|
||||
$otherClientDate = today()->addDays(2)->format('Y-m-d');
|
||||
Consultation::factory()->pending()->create([
|
||||
'user_id' => $otherClient->id,
|
||||
'booking_date' => $otherClientDate,
|
||||
]);
|
||||
|
||||
$this->actingAs($client);
|
||||
|
||||
$component = Volt::test('client.consultations.book');
|
||||
|
||||
$bookedDates = $component->viewData('bookedDates');
|
||||
|
||||
expect($bookedDates)->not->toContain($otherClientDate);
|
||||
});
|
||||
|
|
@ -138,3 +138,83 @@ it('allows selecting partially booked dates', function () {
|
|||
->assertSet('selectedDate', $sunday->toDateString())
|
||||
->assertNotSet('availableSlots', []);
|
||||
});
|
||||
|
||||
// User Booked Dates Tests
|
||||
it('accepts bookedDates prop on mount', function () {
|
||||
// Use a date in the current month to avoid navigating
|
||||
$bookedDate = Carbon::now()->startOfMonth()->addDays(10)->format('Y-m-d');
|
||||
|
||||
Volt::test('availability-calendar', ['bookedDates' => [$bookedDate]])
|
||||
->assertSet('bookedDates', [$bookedDate]);
|
||||
});
|
||||
|
||||
it('prevents selecting user booked dates', function () {
|
||||
$sunday = Carbon::now()->next(Carbon::SUNDAY);
|
||||
$component = Volt::test('availability-calendar', ['bookedDates' => [$sunday->format('Y-m-d')]]);
|
||||
|
||||
// Navigate to the month containing the Sunday if necessary
|
||||
if ($sunday->month !== now()->month || $sunday->year !== now()->year) {
|
||||
$component->call('nextMonth');
|
||||
}
|
||||
|
||||
$component->call('selectDate', $sunday->format('Y-m-d'))
|
||||
->assertSet('selectedDate', null);
|
||||
});
|
||||
|
||||
it('marks user booked dates with user_booked status in calendar', function () {
|
||||
$sunday = Carbon::now()->next(Carbon::SUNDAY);
|
||||
$component = Volt::test('availability-calendar', ['bookedDates' => [$sunday->format('Y-m-d')]]);
|
||||
|
||||
// Navigate to the month containing the Sunday if necessary
|
||||
if ($sunday->month !== now()->month || $sunday->year !== now()->year) {
|
||||
$component->call('nextMonth');
|
||||
}
|
||||
|
||||
$calendarDays = $component->viewData('calendarDays');
|
||||
$bookedDay = collect($calendarDays)->firstWhere('date', $sunday->format('Y-m-d'));
|
||||
|
||||
expect($bookedDay)->not->toBeNull();
|
||||
expect($bookedDay['status'])->toBe('user_booked');
|
||||
});
|
||||
|
||||
it('shows user booked legend when bookedDates is not empty', function () {
|
||||
$bookedDate = Carbon::now()->startOfMonth()->addDays(10)->format('Y-m-d');
|
||||
|
||||
Volt::test('availability-calendar', ['bookedDates' => [$bookedDate]])
|
||||
->assertSee(__('booking.user_booked'));
|
||||
});
|
||||
|
||||
it('does not show user booked legend when bookedDates is empty', function () {
|
||||
Volt::test('availability-calendar', ['bookedDates' => []])
|
||||
->assertDontSee(__('booking.user_booked'));
|
||||
});
|
||||
|
||||
it('user booked status takes precedence over available status', function () {
|
||||
$sunday = Carbon::now()->next(Carbon::SUNDAY);
|
||||
$component = Volt::test('availability-calendar', ['bookedDates' => [$sunday->format('Y-m-d')]]);
|
||||
|
||||
// Navigate to the month containing the Sunday if necessary
|
||||
if ($sunday->month !== now()->month || $sunday->year !== now()->year) {
|
||||
$component->call('nextMonth');
|
||||
}
|
||||
|
||||
$calendarDays = $component->viewData('calendarDays');
|
||||
$bookedDay = collect($calendarDays)->firstWhere('date', $sunday->format('Y-m-d'));
|
||||
|
||||
expect($bookedDay)->not->toBeNull();
|
||||
expect($bookedDay['status'])->toBe('user_booked');
|
||||
});
|
||||
|
||||
it('allows selecting dates not in bookedDates array', function () {
|
||||
$sunday = Carbon::now()->next(Carbon::SUNDAY);
|
||||
$monday = Carbon::now()->next(Carbon::MONDAY);
|
||||
$component = Volt::test('availability-calendar', ['bookedDates' => [$sunday->format('Y-m-d')]]);
|
||||
|
||||
// Navigate to the month containing the Monday if necessary
|
||||
if ($monday->month !== now()->month || $monday->year !== now()->year) {
|
||||
$component->call('nextMonth');
|
||||
}
|
||||
|
||||
$component->call('selectDate', $monday->format('Y-m-d'))
|
||||
->assertSet('selectedDate', $monday->format('Y-m-d'));
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue