Three related fixes, all rooted in the same flaw: authorization and scoping
decided by the caller's role instead of by the environment the data belongs to.
1. Single-appointment access (clinic operations were entirely broken)
AppointmentController::canView/canManage only knew the patient, the owning
doctor and admin -- appointment.clinic was never consulted. A clinic user could
create an appointment through /my/appointment but got 403 on detail, edit,
move, reserve transfer/replace and status change, so nearly every appointment
operation failed in clinic mode.
AppointmentAccessChecker now decides from appointment.clinic: clinic owner,
member doctor (via ClinicDoctorPermissionChecker) and assigned secretary (via
active context + DoctorSecretary) are recognised. Actions reuse the existing
permission vocabulary, so active=false remains the single source of truth for
"collaboration ended". Cancellation is gated separately and an inline status on
PATCH /appointment/{uuid} cannot bypass that gate. The patient is narrowed to
view + cancel.
Also fixed alongside: listByDoctor now serves a clinic manager but scoped to
that clinic; todayStats gained an admin branch and no longer passes an array of
doctor ids as the clinic parameter; PatientController::appointments filters on
appointment.clinic instead of current membership, so deactivating a doctor no
longer erases clinic appointment history from the case file.
The doctor-only active_slot_key was reviewed and deliberately left alone -- a
doctor is one physical person, so adding clinic to the key would permit
double-booking, not fix a bug. Reasoning recorded on the entity.
2. Appointment registration and confirmation
Panel-created appointments are born pending ("ثبت شده") instead of confirmed.
Confirming is now an explicit act: POST /appointment/{uuid}/confirm transitions
the status, files the case file for the appointment's environment (reusing an
existing record or creating one) and registers full or partial payments on the
resulting visit -- all in one transaction.
AppointmentExpiryService would have expired those pending appointments the
moment their slot time passed; findExpiredPending is now limited to online
gateway holds, which are the only pendings carrying a TTL. A pending
appointment still occupies its slot, so the time stays reserved.
The admin panel gets a "قطعی کردن نوبت" modal showing the visit fee, each
selected service, the total, and paid/remaining/status. It is wired inside
AppointmentStatusDropdown, so picking "confirmed" anywhere (timeline, detail,
reserve list, info modal) goes through it and confirmation can never silently
skip the case file and payment.
3. Clinic case-file access
PatientRecordScopeResolver replaces the single-destination role mapping: the
active context decides, so a doctor invited into a clinic finally sees their
patients' records there. A clinic record is per-patient and shared by design,
so "their own patients" is derived from appointments with that doctor in that
clinic rather than from a new column. Clinic secretaries are limited to their
assigned doctors. Read and write share one rule, and out-of-scope records
report 404 so other environments are never disclosed.
Tests: 29 new cases across the three areas (clinic appointment access, confirm
flow, clinic record access). Full suite 466 tests, 2 pre-existing failures
unchanged. API docs updated for all three.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
330 lines
13 KiB
PHP
330 lines
13 KiB
PHP
<?php
|
|
|
|
namespace App\Tests\Appointment;
|
|
|
|
use App\Appointment\Entity\Appointment;
|
|
use App\Auth\Entity\User;
|
|
use App\Auth\Repository\UserActiveContextRepository;
|
|
use App\Clinic\Entity\Clinic;
|
|
use App\Clinic\Repository\ClinicDoctorPermissionRepository;
|
|
use App\Doctor\Entity\Doctor;
|
|
use App\Secretary\Entity\DoctorSecretary;
|
|
use App\Tests\ApiTestCase;
|
|
|
|
/**
|
|
* دسترسی به «یک نوبت مشخص» بر پایهٔ محیطِ خود نوبت (appointment.clinic) است، نه نقش
|
|
* کاربر. پیش از این مسیرهای تکنوبت فقط بیمار، پزشکِ مالک و ادمین را میشناختند و
|
|
* کاربر کلینیک روی نوبتی که خودش ساخته بود ۴۰۳ میگرفت.
|
|
*/
|
|
class ClinicAppointmentAccessTest extends ApiTestCase
|
|
{
|
|
private function makeDoctor(string $name = 'دکتر تست'): Doctor
|
|
{
|
|
$user = $this->createUser(['ROLE_USER', 'ROLE_DOCTOR']);
|
|
$doctor = new Doctor($user, $name);
|
|
$doctor->setMobileNumber($user->getMobileNumber());
|
|
$this->em->persist($doctor);
|
|
$this->em->flush();
|
|
|
|
return $doctor;
|
|
}
|
|
|
|
/** @return array{0: User, 1: Clinic} */
|
|
private function makeClinicWith(Doctor ...$doctors): array
|
|
{
|
|
$owner = $this->createUser(['ROLE_USER', 'ROLE_CLINIC']);
|
|
$clinic = new Clinic($owner);
|
|
$clinic->setName('کلینیک تست');
|
|
foreach ($doctors as $d) {
|
|
$clinic->getDoctors()->add($d);
|
|
}
|
|
$this->em->persist($clinic);
|
|
$this->em->flush();
|
|
|
|
return [$owner, $clinic];
|
|
}
|
|
|
|
private function makeAppointment(Doctor $doctor, ?Clinic $clinic, ?User $patient = null): Appointment
|
|
{
|
|
$patient ??= $this->createUser();
|
|
$start = strtotime('+3 days 10:00');
|
|
|
|
$appointment = new Appointment($doctor, $patient, $start, $start + 900);
|
|
$appointment->setClinic($clinic);
|
|
$this->em->persist($appointment);
|
|
$this->em->flush();
|
|
|
|
return $appointment;
|
|
}
|
|
|
|
private function makeClinicSecretary(Clinic $clinic, Doctor $doctor, array $permissionPatch = []): User
|
|
{
|
|
$user = $this->createUser(['ROLE_USER', 'ROLE_SECRETARY']);
|
|
$secretary = new DoctorSecretary($doctor, $user, DoctorSecretary::OWNER_CLINIC, $clinic);
|
|
if ($permissionPatch !== []) {
|
|
$secretary->mergePermissions(['resources' => ['appointments' => $permissionPatch]]);
|
|
}
|
|
$this->em->persist($secretary);
|
|
$this->em->flush();
|
|
|
|
static::getContainer()->get(UserActiveContextRepository::class)->upsert($user, $clinic->getUuid());
|
|
|
|
return $user;
|
|
}
|
|
|
|
public function testClinicOwnerCanViewClinicAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $owner);
|
|
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testClinicOwnerCanUpdateAndMoveClinicAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
$newStart = strtotime('+4 days 11:00');
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}", $owner, [
|
|
'slot_start' => $newStart,
|
|
'slot_end' => $newStart + 900,
|
|
'note' => 'جابهجا شد',
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testClinicOwnerCanChangeStatusOfClinicAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}/status", $owner, [
|
|
'status' => Appointment::STATUS_CONFIRMED,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testClinicOwnerCanTransferAppointmentToReserveAndBack(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
$midnight = strtotime('+3 days 00:00');
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}", $owner, [
|
|
'is_reserve' => true,
|
|
'slot_start' => $midnight,
|
|
'slot_end' => $midnight,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
self::assertSame(200, $this->responseCode(), 'انتقال به لیست رزرو');
|
|
|
|
$this->em->clear();
|
|
$reloaded = $this->em->getRepository(Appointment::class)->find($appointment->getId());
|
|
self::assertTrue($reloaded->isReserve());
|
|
|
|
$back = strtotime('+5 days 09:00');
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$reloaded->getUuid()}", $owner, [
|
|
'is_reserve' => false,
|
|
'slot_start' => $back,
|
|
'slot_end' => $back + 900,
|
|
'version' => $reloaded->getVersion(),
|
|
]);
|
|
self::assertSame(200, $this->responseCode(), 'بازگشت از لیست رزرو');
|
|
}
|
|
|
|
public function testClinicOwnerCanReadAppointmentEvents(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}/events", $owner);
|
|
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testClinicOwnerCannotTouchDoctorPersonalAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[$owner] = $this->makeClinicWith($doctor);
|
|
$appointment = $this->makeAppointment($doctor, null);
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $owner);
|
|
|
|
self::assertSame(403, $this->responseCode(), 'مطب شخصی پزشک از دسترس کلینیک خارج است');
|
|
}
|
|
|
|
public function testForeignClinicOwnerIsDenied(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[, $clinic] = $this->makeClinicWith($doctor);
|
|
[$otherOwner] = $this->makeClinicWith($this->makeDoctor('دکتر دیگر'));
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $otherOwner);
|
|
|
|
self::assertSame(403, $this->responseCode());
|
|
}
|
|
|
|
public function testMemberDoctorLosesAccessWhenDeactivated(): void
|
|
{
|
|
$member = $this->makeDoctor('دکتر عضو');
|
|
$colleague = $this->makeDoctor('همکار');
|
|
[, $clinic] = $this->makeClinicWith($member, $colleague);
|
|
$appointment = $this->makeAppointment($colleague, $clinic);
|
|
|
|
$permissions = static::getContainer()->get(ClinicDoctorPermissionRepository::class);
|
|
$permissions->getOrCreate($clinic, $member);
|
|
$this->em->flush();
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $member->getUser());
|
|
self::assertSame(200, $this->responseCode(), 'پزشک فعالِ کلینیک نوبتهای همان کلینیک را میبیند');
|
|
|
|
$permissions->getOrCreate($clinic, $member)->setActive(false);
|
|
$this->em->flush();
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $member->getUser());
|
|
self::assertSame(403, $this->responseCode(), 'پس از پایان همکاری دسترسی قطع میشود');
|
|
}
|
|
|
|
public function testClinicSecretaryCanManageAssignedDoctorAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[, $clinic] = $this->makeClinicWith($doctor);
|
|
$secretary = $this->makeClinicSecretary($clinic, $doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $secretary);
|
|
self::assertSame(200, $this->responseCode());
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}/status", $secretary, [
|
|
'status' => Appointment::STATUS_CONFIRMED,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testClinicSecretaryCannotTouchUnassignedDoctorAppointment(): void
|
|
{
|
|
$mine = $this->makeDoctor('پزشک من');
|
|
$theirs = $this->makeDoctor('پزشک دیگر');
|
|
[, $clinic] = $this->makeClinicWith($mine, $theirs);
|
|
$secretary = $this->makeClinicSecretary($clinic, $mine);
|
|
$appointment = $this->makeAppointment($theirs, $clinic);
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $secretary);
|
|
|
|
self::assertSame(403, $this->responseCode(), 'منشی فقط پزشکان تخصیصیافتهٔ خودش را دارد');
|
|
}
|
|
|
|
public function testSecretaryCancelRequiresCancelPermission(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[, $clinic] = $this->makeClinicWith($doctor);
|
|
$secretary = $this->makeClinicSecretary($clinic, $doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}/status", $secretary, [
|
|
'status' => Appointment::STATUS_CANCELLED_BY_DOCTOR,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
|
|
self::assertSame(403, $this->responseCode(), 'لغو بهصورت پیشفرض برای منشی خاموش است');
|
|
}
|
|
|
|
public function testSecretaryWithCancelPermissionCanCancel(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[, $clinic] = $this->makeClinicWith($doctor);
|
|
$secretary = $this->makeClinicSecretary($clinic, $doctor, ['cancel' => true]);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}/status", $secretary, [
|
|
'status' => Appointment::STATUS_CANCELLED_BY_DOCTOR,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testInlineStatusCannotBypassCancelGate(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[, $clinic] = $this->makeClinicWith($doctor);
|
|
$secretary = $this->makeClinicSecretary($clinic, $doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}", $secretary, [
|
|
'status' => Appointment::STATUS_CANCELLED_BY_DOCTOR,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
|
|
self::assertSame(403, $this->responseCode(), 'status درونخطی همان گیت لغو را دارد');
|
|
}
|
|
|
|
public function testOwnerDoctorKeepsFullAccessToOwnClinicAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
[, $clinic] = $this->makeClinicWith($doctor);
|
|
$appointment = $this->makeAppointment($doctor, $clinic);
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $doctor->getUser());
|
|
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testPatientCanViewButNotRescheduleOwnAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
$patient = $this->createUser();
|
|
$appointment = $this->makeAppointment($doctor, null, $patient);
|
|
$newStart = strtotime('+6 days 10:00');
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $patient);
|
|
self::assertSame(200, $this->responseCode());
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}", $patient, [
|
|
'slot_start' => $newStart,
|
|
'slot_end' => $newStart + 900,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
self::assertSame(403, $this->responseCode(), 'بیمار نوبت خودش را جابهجا نمیکند');
|
|
}
|
|
|
|
public function testPatientCanCancelOwnAppointment(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
$patient = $this->createUser();
|
|
$appointment = $this->makeAppointment($doctor, null, $patient);
|
|
|
|
$this->authJson('PATCH', "/api/v1/appointment/{$appointment->getUuid()}/status", $patient, [
|
|
'status' => Appointment::STATUS_CANCELLED_BY_USER,
|
|
'version' => $appointment->getVersion(),
|
|
]);
|
|
|
|
self::assertSame(200, $this->responseCode());
|
|
}
|
|
|
|
public function testStrangerIsDenied(): void
|
|
{
|
|
$doctor = $this->makeDoctor();
|
|
$appointment = $this->makeAppointment($doctor, null);
|
|
$stranger = $this->createUser();
|
|
|
|
$this->authJson('GET', "/api/v1/appointment/{$appointment->getUuid()}", $stranger);
|
|
|
|
self::assertSame(403, $this->responseCode());
|
|
}
|
|
}
|