hamedandClaude Opus 4.8
aa87b4a9cb
A non-unique index on (doctor_id, slot_start) plus a count-then-insert check left a TOCTOU race: two concurrent requests could both pass isSlotTaken and both insert. wrapInTransaction alone doesn't stop the phantom under InnoDB REPEATABLE-READ. Add a nullable, unique active_slot_key on Appointment = "doctorId:slotStart" while the booking occupies the slot (pending/confirmed — in lockstep with isSlotTaken); NULL once expired/completed/no_show/cancelled (NULLs don't collide in a MySQL unique index, so released slots rebook freely). bookAtomically now: catches the unique violation -> SlotTakenException, and expires lapsed pendings in-transaction so the ~1-min window before the expiry cron doesn't wrongly block rebooking. All three booking paths (online / my / admin) routed through it. Migration backfills one row per (doctor, slot) — the latest id — so the index builds even on dirty historical data without destructively cancelling bookings. (Backfill surfaced a real pre-existing double-booked slot in dev data.) Regression: tests/Appointment/SlotUniquenessTest. Adjusted the expiry-service test fixture to use distinct slots (one live booking per slot is now enforced). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
55 lines
1.9 KiB
PHP
55 lines
1.9 KiB
PHP
<?php
|
|
|
|
namespace App\Tests\Appointment;
|
|
|
|
use App\Appointment\Entity\Appointment;
|
|
use App\Appointment\Service\AppointmentExpiryService;
|
|
use App\Doctor\Entity\Doctor;
|
|
use App\Payment\Entity\Payment;
|
|
use App\Tests\ApiTestCase;
|
|
|
|
/**
|
|
* Covers AppointmentExpiryService: stale pending bookings are expired and their
|
|
* pending payments cancelled. Also guards the N+1 fix (batch payment fetch) by
|
|
* exercising several appointments at once.
|
|
*/
|
|
class AppointmentExpiryServiceTest extends ApiTestCase
|
|
{
|
|
public function testExpiresStaleAndCancelsPendingPayments(): void
|
|
{
|
|
$owner = $this->createUser(['ROLE_DOCTOR']);
|
|
$doctor = new Doctor($owner, 'دکتر تست');
|
|
$this->em->persist($doctor);
|
|
|
|
$past = time() - 3600;
|
|
$appointments = [];
|
|
for ($i = 0; $i < 5; $i++) {
|
|
$patient = $this->createUser(['ROLE_USER']);
|
|
// distinct past slots — one live booking per (doctor, slot)
|
|
$slotStart = $past - $i * 1000;
|
|
$appt = new Appointment($doctor, $patient, $slotStart, $slotStart + 900);
|
|
$this->em->persist($appt);
|
|
|
|
$payment = new Payment($patient, 100_000, 'mellat', 'appointment');
|
|
$payment->setAppointment($appt);
|
|
$this->em->persist($payment);
|
|
|
|
$appointments[] = [$appt, $payment];
|
|
}
|
|
$this->em->flush();
|
|
|
|
$service = static::getContainer()->get(AppointmentExpiryService::class);
|
|
$count = $service->expireStale();
|
|
|
|
$this->assertSame(5, $count);
|
|
|
|
$this->em->clear();
|
|
foreach ($appointments as [$appt, $payment]) {
|
|
$freshAppt = $this->em->getRepository(Appointment::class)->find($appt->getId());
|
|
$freshPay = $this->em->getRepository(Payment::class)->find($payment->getId());
|
|
$this->assertSame(Appointment::STATUS_EXPIRED, $freshAppt->getStatus());
|
|
$this->assertSame(Payment::STATUS_CANCELED, $freshPay->getStatus());
|
|
}
|
|
}
|
|
}
|