feat(migrations): add clinic_id context to weekly_schedules, date_overrides, and holidays
- Introduced clinic_id to weekly_schedules, date_overrides, and holidays to differentiate between personal and clinic schedules. - Updated unique constraints and indexes to accommodate the new clinic context. feat(command): create AssignScheduleClinicCommand to move schedules - Added a command to move a doctor's personal weekly schedule into a clinic context. - Implemented checks to ensure sessions align with the target clinic. feat(context): implement EntityContext and EntityContextResolver - Created EntityContext to represent the effective working environment of a request (doctor or clinic). - Developed EntityContextResolver to determine the execution context based on user roles and active contexts. test: add ServiceModeContextTest for appointment scheduling - Implemented tests to ensure service booking respects clinic and personal contexts. - Verified that financial data is omitted in clinic contexts in InvitedDoctorDashboardScopeTest.
This commit is contained in:
hamed
@@ -0,0 +1,445 @@
|
||||
# جداسازی Context کلینیک و محیط شخصی پزشک در تنظیمات نوبتدهی
|
||||
|
||||
## پروژه
|
||||
|
||||
`clinicpro` (Backend Symfony + پنل ادمین React)
|
||||
|
||||
## زمینه
|
||||
|
||||
در مسیر `admin/doctors/{doctorUuid}` (پنل کلینیک) هنگام ذخیرهٔ تنظیمات نوبتدهی برای پزشک عضو کلینیک (دکتر تست، موبایل `09100652121`، کلینیک `41e325c4-e825-4067-8438-5d828ecaee09`) با انتخاب حالت «نوبتدهی سرویسی» خطای زیر برمیگردد:
|
||||
|
||||
> برای نوبتدهی سرویسی حداقل یک سرویس با «نمایش در نوبتدهی» لازم است
|
||||
|
||||
در حالی که کلینیک سرویسهای bookable دارد. علت: شمارش سرویسها همیشه با `entity_type='doctor'` انجام میشود و هیچوقت سرویسهای کلینیک را نمیبیند.
|
||||
|
||||
اما این فقط علامتِ یک مشکل معماری بزرگتر است: **کل مدل تنظیمات نوبتدهی، context ندارد.** `WeeklySchedule` یک رابطهٔ `OneToOne` با `doctor` دارد و یک unique constraint روی `doctor_id`؛ یعنی یک پزشک که هم مطب شخصی دارد و هم عضو یک یا چند کلینیک است، فقط **یک** برنامهٔ نوبتدهی در کل سیستم دارد. سرویسها ولی polymorphic هستند (`service_sections.entity_type` = `doctor|clinic`) و کاملاً از هم جدا.
|
||||
|
||||
## مشکل / هدف
|
||||
|
||||
دو Context باید کاملاً از هم جدا شوند:
|
||||
|
||||
| Context | مالک تنظیمات | سرویسهای قابل استفاده | آدرسهای قابل انتخاب |
|
||||
|---|---|---|---|
|
||||
| محیط شخصی پزشک | `doctor` | فقط `entity_type='doctor', entity_id=doctor.id` | فقط `DoctorAddress` با `type=personal` (یا `clinic_id IS NULL`) |
|
||||
| محیط مدیریت کلینیک | `(doctor, clinic)` | فقط `entity_type='clinic', entity_id=clinic.id` | فقط آدرسهای همان کلینیک |
|
||||
|
||||
قوانین:
|
||||
|
||||
1. پزشک در محیط شخصی **نباید** به سرویسها، آدرسها یا تنظیمات کلینیک دسترسی داشته باشد.
|
||||
2. کلینیک در محیط خودش برای پزشک عضو، **باید** بتواند از سرویسهای کلینیک استفاده کند.
|
||||
3. یک پزشک باید بتواند برای مطب شخصی و برای هر کلینیک، برنامهٔ نوبتدهی مستقل داشته باشد.
|
||||
4. `booking_mode` (slot/service) در هر context مستقل قفل میشود، نه سراسری.
|
||||
|
||||
## فایلهای مرتبط
|
||||
|
||||
| فایل | نقش |
|
||||
|---|---|
|
||||
| `src/Appointment/Entity/WeeklySchedule.php` | Entity تنظیمات نوبتدهی — `OneToOne` با doctor، بدون clinic |
|
||||
| `src/Appointment/Controller/AppointmentSettingsController.php` | همهٔ endpointهای تنظیمات؛ محل خطا و محل authorization |
|
||||
| `src/ClinicService/Repository/ServiceItemRepository.php` | `countBookableByEntity()` / `findBookableByEntity()` |
|
||||
| `src/ClinicService/Entity/ServiceSection.php` | مالکیت polymorphic سرویس (`entityType`/`entityId`) |
|
||||
| `src/ClinicService/Entity/ServiceItem.php` | فلگ `bookable` |
|
||||
| `src/ClinicService/Controller/ClinicServiceController.php` | `resolveEntity()` — تشخیص context از روی role |
|
||||
| `src/Doctor/Entity/DoctorAddress.php` | آدرس با `clinicId` و `type` |
|
||||
| `src/Appointment/Controller/AppointmentController.php:234-262` | لیست عمومی سرویسهای bookable پزشک |
|
||||
| `src/Auth/Entity/UserActiveContext.php` | context فعال کاربر (فقط `db_uuid`) |
|
||||
| `assets/admin/pages/AppointmentSettingsPage.tsx` | صفحهٔ شخصی پزشک |
|
||||
| `assets/admin/pages/ClinicAppointmentSettingsPage.tsx` | صفحهٔ کلینیک، تب به ازای هر پزشک |
|
||||
| `assets/admin/components/schedule/ScheduleSection.tsx` | کامپوننت مشترک هر دو صفحه |
|
||||
| `assets/admin/stores/authStore.ts` | `context: {type: 'doctor'|'clinic'}` |
|
||||
|
||||
## وضعیت فعلی
|
||||
|
||||
### ۱. شمارش سرویس با `doctor` هاردکد
|
||||
|
||||
`src/Appointment/Controller/AppointmentSettingsController.php:57-61`:
|
||||
|
||||
```php
|
||||
private function serviceModeHasNoBookable(array $meta, \App\Doctor\Entity\Doctor $doctor): bool
|
||||
{
|
||||
return ($meta['booking_mode'] ?? WeeklySchedule::MODE_SLOT) === WeeklySchedule::MODE_SERVICE
|
||||
&& $this->itemRepo->countBookableByEntity('doctor', $doctor->getId()) === 0;
|
||||
}
|
||||
```
|
||||
|
||||
فراخوانی در `:101-103` (POST) و `:144-146` (PATCH):
|
||||
|
||||
```php
|
||||
if ($this->serviceModeHasNoBookable($schedule->getMeta(), $doctor)) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'برای نوبتدهی سرویسی حداقل یک سرویس با «نمایش در نوبتدهی» لازم است', 422, 'booking_mode');
|
||||
}
|
||||
```
|
||||
|
||||
### ۲. Entity بدون clinic
|
||||
|
||||
`src/Appointment/Entity/WeeklySchedule.php:13-49`:
|
||||
|
||||
```php
|
||||
#[ORM\Entity(repositoryClass: WeeklyScheduleRepository::class)]
|
||||
#[ORM\Table(name: 'weekly_schedules')]
|
||||
#[ORM\UniqueConstraint(name: 'idx_weekly_schedules_doctor', columns: ['doctor_id'])]
|
||||
class WeeklySchedule
|
||||
{
|
||||
public const MODE_SLOT = 'slot';
|
||||
public const MODE_SERVICE = 'service';
|
||||
...
|
||||
#[ORM\OneToOne(targetEntity: Doctor::class)]
|
||||
#[ORM\JoinColumn(name: 'doctor_id', onDelete: 'CASCADE')]
|
||||
private Doctor $doctor;
|
||||
|
||||
#[ORM\Column(type: 'json')]
|
||||
private array $setting = [];
|
||||
```
|
||||
|
||||
### ۳. تشخیص context فقط از روی role (و doctor برنده است)
|
||||
|
||||
`src/ClinicService/Controller/ClinicServiceController.php:492-505` — این متد در ۹+ کنترلر تکرار شده:
|
||||
|
||||
```php
|
||||
private function resolveEntity(User $user): array
|
||||
{
|
||||
if ($user->hasRole('ROLE_DOCTOR')) {
|
||||
$doctor = $this->doctorRepo->findByUser($user);
|
||||
return $doctor !== null ? ['doctor', $doctor->getId()] : ['doctor', null];
|
||||
}
|
||||
|
||||
if ($user->hasRole('ROLE_CLINIC')) {
|
||||
$clinic = $this->clinicRepo->findByUser($user);
|
||||
return $clinic !== null ? ['clinic', $clinic->getId()] : ['clinic', null];
|
||||
}
|
||||
|
||||
return ['unknown', null];
|
||||
}
|
||||
```
|
||||
|
||||
کاربری که هر دو role را دارد، همیشه بهعنوان doctor حل میشود و هرگز سرویسهای کلینیکش را نمیبیند.
|
||||
|
||||
### ۴. Authorization از کلینیک عبور میکند ولی context را حمل نمیکند
|
||||
|
||||
`src/Appointment/Controller/AppointmentSettingsController.php:437-450`:
|
||||
|
||||
```php
|
||||
private function denyDoctorAccess(\App\Doctor\Entity\Doctor $doctor, User $user, string $action): ?JsonResponse
|
||||
{
|
||||
if ($user->hasRole('ROLE_ADMIN') || $doctor->getUser()->getId() === $user->getId()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
foreach ($this->clinicRepo->findByDoctor($doctor) as $clinic) {
|
||||
if ($this->permChecker->can($user, $clinic, 'appointment_settings', $action)) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return $this->error(ErrorCodes::ERR_AUTH_006, 'دسترسی ممنوع', 403);
|
||||
}
|
||||
```
|
||||
|
||||
مالک کلینیک مجاز است بنویسد، اما هیچجا مشخص نمیشود که این نوشتن «در context کلینیک» است.
|
||||
|
||||
### ۵. فرانت context را ارسال نمیکند
|
||||
|
||||
`assets/admin/components/schedule/ScheduleSection.tsx:546-563`:
|
||||
|
||||
```tsx
|
||||
? api.patch<ApiResponse<any>>(`/api/v1/appointment-settings/weekly-schedule/${doctorUuid}`, { schedule: scheduleMap, meta })
|
||||
: api.post<ApiResponse<any>>('/api/v1/appointment-settings/weekly-schedule', { doctor_uuid: doctorUuid, schedule: scheduleMap, meta });
|
||||
```
|
||||
|
||||
هر دو صفحهٔ شخصی و کلینیک دقیقاً همین `ScheduleSection` را رندر میکنند و هیچ تفاوتی در payload ندارند.
|
||||
|
||||
## وظایف
|
||||
|
||||
### ۱. مدلسازی Context در `WeeklySchedule`
|
||||
|
||||
ستون `clinic_id` (nullable) به `weekly_schedules` اضافه شود:
|
||||
|
||||
- `clinic_id IS NULL` → context شخصی پزشک
|
||||
- `clinic_id = X` → context کلینیک X برای همین پزشک
|
||||
|
||||
تغییرات لازم در `src/Appointment/Entity/WeeklySchedule.php`:
|
||||
|
||||
```php
|
||||
#[ORM\Entity(repositoryClass: WeeklyScheduleRepository::class)]
|
||||
#[ORM\Table(name: 'weekly_schedules')]
|
||||
#[ORM\UniqueConstraint(name: 'idx_weekly_schedules_doctor_clinic', columns: ['doctor_id', 'clinic_id'])]
|
||||
class WeeklySchedule
|
||||
{
|
||||
// OneToOne → ManyToOne (یک پزشک چند برنامه دارد: شخصی + هر کلینیک)
|
||||
#[ORM\ManyToOne(targetEntity: Doctor::class)]
|
||||
#[ORM\JoinColumn(name: 'doctor_id', nullable: false, onDelete: 'CASCADE')]
|
||||
private Doctor $doctor;
|
||||
|
||||
#[ORM\ManyToOne(targetEntity: Clinic::class)]
|
||||
#[ORM\JoinColumn(name: 'clinic_id', nullable: true, onDelete: 'CASCADE')]
|
||||
private ?Clinic $clinic = null;
|
||||
```
|
||||
|
||||
نکته دربارهٔ unique در MySQL/MariaDB: `NULL` در unique index تکراری مجاز است، پس `(doctor_id, NULL)` چند بار میتواند ثبت شود. برای جلوگیری، یا در سطح Repository قبل از insert چک کن، یا بهجای NULL از `clinic_id = 0` استفاده کن. **گزینهٔ توصیهشده: nullable نگهدار و یکتایی را در سرویس/Repository تضمین کن** (سازگارتر با FK).
|
||||
|
||||
Migration بنویس. برای رکوردهای موجود `clinic_id = NULL` بگذار (همه بهعنوان تنظیمات شخصی تفسیر میشوند) — و در توضیح migration این تصمیم را ذکر کن.
|
||||
|
||||
#### تصمیم قطعی دربارهٔ `DateOverride` و `Holiday`
|
||||
|
||||
این دو **معنای متفاوتی** دارند و رفتارشان یکسان نیست:
|
||||
|
||||
**`DateOverride` → همیشه per-context (`clinic_id` مطابق schedule).**
|
||||
یک override یعنی «ساعت کاری این روزِ خاص با برنامهٔ عادی فرق دارد». ساعت کاری خودش per-context است، پس استثنای آن هم per-context است. اگر پزشک در کلینیک پنجشنبه را تا ۱۲ کار کند، هیچ ربطی به مطب شخصیاش ندارد. ستون `clinic_id` nullable اضافه شود و **همیشه با `clinic_id` همان `WeeklySchedule` مقداردهی شود** (NULL = context شخصی). عملاً بهتر است `DateOverride` به `WeeklySchedule` رفرنس بدهد نه به `Doctor`، ولی برای کمکردن ریسک migration، `(doctor_id, clinic_id)` کافی است.
|
||||
|
||||
**`Holiday` → پیشفرض سراسری (doctor-level)، با امکان محدودسازی به یک context.**
|
||||
تعطیلی یعنی «پزشک آن روز نیست» — یک واقعیت فیزیکی است. پزشکی که در سفر یا مرخصی است، همزمان در مطب شخصی و در کلینیک غایب است؛ اگر per-context باشد، پزشک باید یک مرخصی را N بار ثبت کند و فراموشکردن یکی از آنها = نوبتگرفتن بیمار برای روزی که پزشک نیست. این بدترین خطای ممکن در این دامنه است.
|
||||
|
||||
پس `clinic_id` nullable با این معنا:
|
||||
|
||||
| `clinic_id` | معنی |
|
||||
|---|---|
|
||||
| `NULL` | پزشک آن روز در **هیچ** محلی نیست — روی همهٔ contextها اثر میگذارد |
|
||||
| `X` | پزشک آن روز فقط در کلینیک X نیست (مطب شخصی و بقیه کلینیکها باز) |
|
||||
|
||||
محاسبهٔ تعطیلی مؤثر برای یک context، **اجتماع** دو مجموعه است:
|
||||
|
||||
```php
|
||||
// در HolidayRepository
|
||||
->where('h.doctor = :doctor')
|
||||
->andWhere('h.clinic IS NULL OR h.clinic = :clinic')
|
||||
```
|
||||
|
||||
قواعد نوشتن (اجباری، در سرویس اعمال شود):
|
||||
|
||||
- مالک/کارمند کلینیک فقط میتواند `Holiday` با `clinic_id = <کلینیک خودش>` بسازد یا حذف کند. تلاش برای ساخت تعطیلی سراسری (`clinic_id = NULL`) → 403. دلیل: کلینیک نباید بتواند مطب شخصی پزشک را تعطیل کند.
|
||||
- خودِ پزشک در context شخصی میتواند هر دو نوع را بسازد، ولی UI باید صریح بپرسد. یک انتخاب دوتایی در فرم ثبت تعطیلی:
|
||||
- «در همهٔ محلها نیستم» → `clinic_id = NULL` (پیشفرض)
|
||||
- «فقط در …» → انتخاب یک محل
|
||||
- تعطیلی سراسریِ ساختهشده توسط پزشک، در پنل کلینیک **فقط-خواندنی** نمایش داده شود (کلینیک باید ببیند پزشک نیست، ولی نتواند حذفش کند).
|
||||
|
||||
Migration: همهٔ رکوردهای موجود `Holiday` و `DateOverride` با `clinic_id = NULL` بمانند — برای `Holiday` معنایش دقیقاً همان رفتار فعلی است (سراسری)، برای `DateOverride` یعنی به context شخصی نسبت داده میشوند که با تصمیم بند ۱ سازگار است.
|
||||
|
||||
نکتهٔ مرزی: «کلینیک کلاً تعطیل است» (برای همهٔ پزشکان) با این مدل بیان نمیشود و نیاز به یک `ClinicHoliday` جدا دارد. **خارج از scope این تسک** — فقط در `docs/` بهعنوان کار بعدی ثبت شود.
|
||||
|
||||
### ۲. یک سرویس مرکزی برای حل Context
|
||||
|
||||
بهجای تکرار `resolveEntity()` در ۹ کنترلر، یک سرویس بساز:
|
||||
|
||||
`src/Common/Service/EntityContextResolver.php` (یا محل مناسب مطابق ساختار موجود):
|
||||
|
||||
```php
|
||||
final class EntityContextResolver
|
||||
{
|
||||
/**
|
||||
* context مؤثر را برمیگرداند: ['doctor'|'clinic', id, ?Clinic]
|
||||
* اولویت: clinic_uuid صریح در request > UserActiveContext > role
|
||||
*/
|
||||
public function resolve(User $user, ?string $clinicUuid = null): EntityContext;
|
||||
|
||||
/** آیا این کاربر مجاز است در context کلینیک دادهشده عمل کند؟ */
|
||||
public function assertCanActAs(User $user, EntityContext $ctx): void;
|
||||
}
|
||||
```
|
||||
|
||||
قواعد:
|
||||
|
||||
- اگر `clinic_uuid` در درخواست آمد → context کلینیک، **مشروط به** اینکه `permChecker->can($user, $clinic, ...)` مجاز باشد؛ در غیر این صورت 403.
|
||||
- اگر نیامد → از `UserActiveContext` بخوان (`src/Auth/Entity/UserActiveContext.php`).
|
||||
- اگر آن هم نبود → fallback به منطق فعلی مبتنی بر role.
|
||||
|
||||
**مهم:** اولویت فعلی که `ROLE_DOCTOR` را بر `ROLE_CLINIC` مقدم میکند، برای کاربر دو-نقشی اشتباه است. با این سرویس، `UserActiveContext` باید تعیینکننده باشد.
|
||||
|
||||
سپس `resolveEntity()` را در کنترلرهای موجود (ClinicService, Inventory, Patient, Staff, Billing, Insurance, Subscription, Tag, Sms) با این سرویس جایگزین کن. اگر ریسک این refactor بزرگ بود، **حداقل `ClinicServiceController` و `AppointmentSettingsController` را مهاجرت بده** و بقیه را در یک TODO مستند کن.
|
||||
|
||||
### ۳. اصلاح validation سرویس bookable بر اساس Context
|
||||
|
||||
در `AppointmentSettingsController`:
|
||||
|
||||
```php
|
||||
private function serviceModeHasNoBookable(array $meta, EntityContext $ctx): bool
|
||||
{
|
||||
if (($meta['booking_mode'] ?? WeeklySchedule::MODE_SLOT) !== WeeklySchedule::MODE_SERVICE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $this->itemRepo->countBookableByEntity($ctx->type, $ctx->id) === 0;
|
||||
}
|
||||
```
|
||||
|
||||
و پیام خطا بسته به context، دقیقتر شود:
|
||||
|
||||
```php
|
||||
$msg = $ctx->type === 'clinic'
|
||||
? 'برای نوبتدهی سرویسی، کلینیک باید حداقل یک سرویس با «نمایش در نوبتدهی» داشته باشد'
|
||||
: 'برای نوبتدهی سرویسی حداقل یک سرویس با «نمایش در نوبتدهی» لازم است';
|
||||
```
|
||||
|
||||
### ۴. محدودسازی آدرسها بر اساس Context
|
||||
|
||||
`GET /api/v1/appointment-settings/available-locations/{doctorUuid}` (`:399`) الان همهٔ آدرسهای شخصی + همهٔ کلینیکها را union میکند:
|
||||
|
||||
```php
|
||||
$clinics = $this->clinicRepo->findByDoctor($doctor);
|
||||
$clinicIds = array_map(fn(Clinic $c) => $c->getId(), $clinics);
|
||||
$addresses = $this->addressRepo->findAvailableForDoctor($doctor, $clinicIds);
|
||||
```
|
||||
|
||||
باید پارامتر `?clinic_uuid=` بپذیرد:
|
||||
|
||||
- با `clinic_uuid` → فقط آدرسهای همان کلینیک
|
||||
- بدون آن (context شخصی) → فقط `DoctorAddress` با `type = TYPE_PERSONAL` / `clinicId IS NULL`
|
||||
|
||||
همچنین در `validateSessionsHaveLocation()` (`:456-466`) اضافه کن که `location_id` انتخابشده حتماً متعلق به همان context باشد؛ الان هر آدرسی پذیرفته میشود.
|
||||
|
||||
### ۵. لیست سرویسها برای context
|
||||
|
||||
الان هیچ endpointای برای «سرویسهای bookable یک پزشک در یک کلینیک» وجود ندارد؛ `GET /api/v1/service-items` (`ClinicServiceController:217`) owner را از کاربر لاگینشده میگیرد.
|
||||
|
||||
- `GET /api/v1/service-items` باید `?clinic_uuid=` بپذیرد و از `EntityContextResolver` استفاده کند.
|
||||
- `AppointmentController.php:234-262` که `findBookableByEntity('doctor', ...)` را هاردکد کرده، باید context را از `WeeklySchedule` مربوطه (که حالا `clinic` دارد) استخراج کند — نه از role. این مسیر عمومی است و `nobat724_front` مصرفکنندهٔ آن است.
|
||||
|
||||
### ۶. تغییرات endpointهای تنظیمات نوبتدهی
|
||||
|
||||
همهٔ endpointهای `AppointmentSettingsController` باید context بپذیرند:
|
||||
|
||||
- POST `/api/v1/appointment-settings/weekly-schedule` → بدنه `clinic_uuid` اختیاری
|
||||
- GET/PATCH `/api/v1/appointment-settings/weekly-schedule/{uuid}` → query `?clinic_uuid=`
|
||||
- `WeeklyScheduleRepository` متد `findOneByDoctorAndClinic(Doctor $d, ?Clinic $c)` بگیرد؛ همهٔ `findOneBy(['doctor' => ...])`ها بهروز شوند.
|
||||
- `assertModeImmutable()` باید mode را از schedule همان context بخواند، نه از تنها schedule پزشک.
|
||||
|
||||
پاسخها طبق `BaseController` با `$this->success()` / `$this->error()` بمانند.
|
||||
|
||||
### ۷. پنل ادمین React
|
||||
|
||||
- `assets/admin/components/schedule/ScheduleSection.tsx` یک prop جدید `clinicUuid?: string` بگیرد و در هر دو فراخوانی POST/PATCH و در query key و در fetch آدرسها آن را ارسال کند.
|
||||
- `AppointmentSettingsPage.tsx` (شخصی) → `clinicUuid` ندهد.
|
||||
- `ClinicAppointmentSettingsPage.tsx` → `clinicUuid={clinicUuid}` بدهد.
|
||||
- query keyهای React Query حتماً شامل `clinicUuid` شوند، وگرنه cache بین دو context نشت میکند.
|
||||
- متن راهنمای `ScheduleSection.tsx:715` بسته به context متفاوت شود: در کلینیک به بخش سرویسهای کلینیک ارجاع دهد.
|
||||
|
||||
### ۸. مستندات و تست
|
||||
|
||||
- فایلهای `docs/api/` مربوط به appointment-settings و service-items با پارامتر جدید `clinic_uuid` بهروز شوند (قانون ثابت پروژه).
|
||||
- تست موجود `tests/Appointment/AppointmentSettingsListOwnershipTest.php` را گسترش بده؛ حداقل این سناریوها:
|
||||
1. پزشک عضو کلینیک، در context شخصی، mode=service با صفر سرویس شخصی → 422.
|
||||
2. همان پزشک در context کلینیک که کلینیک سرویس bookable دارد → 200.
|
||||
3. پزشک در context شخصی نمیتواند `location_id` متعلق به کلینیک را انتخاب کند → 422.
|
||||
4. دو schedule مستقل برای یک پزشک (شخصی + کلینیک) همزمان ذخیره میشوند و mode مستقل قفل میشود.
|
||||
5. کاربری بدون permission روی کلینیک، با `clinic_uuid` آن کلینیک → 403.
|
||||
|
||||
### ۹. داشبورد پزشک دعوتشده در context کلینیک
|
||||
|
||||
**مشکل مشاهدهشده:** پزشک دعوتشده («دکتر دعوت تست ۲») وقتی داخل محیط کلینیک «علی بهروزی» است، داشبورد کاملِ پزشک را میبیند: «میزان درآمد»، «کل پرداختیها»، «پرداختیهای امروز»، «تعداد کل مراجعین» و کارت «کلینیکهای من». این دادهها به context شخصی پزشک تعلق دارند و نباید در محیط کلینیک نمایش داده شوند. علاوه بر این، پزشک دعوتشده اصلاً نباید اطلاعات مالی ببیند.
|
||||
|
||||
**ریشه:** انتخاب داشبورد فقط بر اساس `primaryRole` است و `context.scope` نادیده گرفته میشود.
|
||||
|
||||
`assets/admin/pages/DashboardPage.tsx:1116`:
|
||||
|
||||
```tsx
|
||||
export default function DashboardPage() {
|
||||
const primaryRole = useAuthStore(s => s.primaryRole);
|
||||
if (!primaryRole) return <LoadingSkeleton />;
|
||||
if (primaryRole === 'admin') return <AdminDashboard />;
|
||||
if (primaryRole === 'clinic') return <ClinicDashboard />;
|
||||
if (primaryRole === 'doctor') return <DoctorDashboard />;
|
||||
...
|
||||
```
|
||||
|
||||
در حالی که Sidebar **دقیقاً همین تمایز را میشناسد** — `assets/admin/components/layout/Sidebar.tsx:60-83`:
|
||||
|
||||
```tsx
|
||||
if (primaryRole === "doctor" && scope === "clinic") {
|
||||
const items: SectionItem[] = [
|
||||
{ to: "/admin/dashboard", icon: ChartBarIcon, label: "داشبورد" },
|
||||
];
|
||||
if (can("appointments", "view")) { ... }
|
||||
if (can("patients", "view")) { ... }
|
||||
return [{ label: "عمومی", items }];
|
||||
}
|
||||
```
|
||||
|
||||
منبع `scope`: `src/Auth/Controller/AuthController.php:700-729` — پزشک دعوتشده `role='doctor'`, `scope='clinic'`, `permissions` از `ClinicDoctorPermission`؛ مالک کلینیک `role='clinic'`, `scope=null`, `permissions=null`.
|
||||
|
||||
**وظایف:**
|
||||
|
||||
1. در `DashboardPage.tsx` قبل از dispatch، `scope` را هم بخوان و یک شاخهٔ جدید اضافه کن:
|
||||
|
||||
```tsx
|
||||
const primaryRole = useAuthStore(s => s.primaryRole);
|
||||
const scope = useAuthStore(s => s.context?.scope ?? null);
|
||||
...
|
||||
if (primaryRole === 'doctor' && scope === 'clinic') return <InvitedDoctorDashboard />;
|
||||
if (primaryRole === 'doctor') return <DoctorDashboard />;
|
||||
```
|
||||
|
||||
2. `InvitedDoctorDashboard` فقط اینها را نشان دهد:
|
||||
- «تعداد نوبتهای امروز» (محدود به نوبتهای همین پزشک در همین کلینیک)
|
||||
- «لیست نوبتهای جدید» همین پزشک در همین کلینیک
|
||||
- در صورت داشتن `can('patients','view')`، «تعداد مراجعین» همین context
|
||||
|
||||
و اینها **حذف** شوند: «میزان درآمد»، «کل پرداختیها»، «پرداختیهای امروز»، «نمودار درآمد»، کارت «کلینیکهای من» (`DashboardPage.tsx:851`)، و کارت دعوتهای کلینیک (`DoctorClinicInvitationsCard`, `:709`) — دعوتها فقط در context شخصی معنا دارند.
|
||||
|
||||
کارتها بر اساس `permissions` همان context نمایش داده شوند (همان `usePermissions()` که Sidebar استفاده میکند)، نه صرفاً hardcode.
|
||||
|
||||
3. **Backend مهمتر است — مخفیکردن در UI کافی نیست.** `src/Dashboard/Controller/DashboardController.php:180-182` (`GET /api/v1/dashboard/doctor`) داده را از `doctorRepo->findByUser($user)` میگیرد و روی **همهٔ کلینیکها + مطب شخصی** جمع میزند؛ `UserActiveContextRepository` تزریق شده (`:34`) ولی مصرف نمیشود. پزشک دعوتشده الان میتواند مستقیماً این endpoint را صدا بزند و درآمد شخصیاش را بگیرد.
|
||||
|
||||
- `?clinic_uuid=` بپذیرد و از `EntityContextResolver` (وظیفهٔ ۲) استفاده کند.
|
||||
- وقتی context کلینیک است: فیلدهای مالی (`revenue_period_rials`, `today_payments_rials`, `charts.revenue_by_day`) در پاسخ **قرار نگیرند** مگر اینکه `permChecker` مجوز مالی (`billing`/`payments` view) برای آن پزشک در آن کلینیک بدهد.
|
||||
- آمار نوبت/بیمار به نوبتهای همان پزشک در همان کلینیک محدود شود، نه همهٔ کلینیکها.
|
||||
- `sms_balance` هم در context کلینیک نباید از کیف پول شخصی پزشک خوانده شود.
|
||||
|
||||
4. مسیر `/admin/dashboard` در `assets/admin/App.tsx:171` هیچ role gate ندارد؛ لازم نیست gate اضافه شود (خود صفحه dispatch میکند) اما مطمئن شو `RoleRoute` مسیرهای مالی را برای `scope === 'clinic'` مسدود میکند.
|
||||
|
||||
5. تست: پزشک دعوتشده در context کلینیک، `GET /api/v1/dashboard/doctor?clinic_uuid=...` → پاسخ نباید هیچ فیلد مالی داشته باشد؛ و بدون `clinic_uuid` وقتی active context کلینیک است، نتیجه باید همان محدودیت را داشته باشد.
|
||||
|
||||
### ۱۰. قرارداد عمومی برای چند schedule (مصرفکننده: `nobat724_front`)
|
||||
|
||||
**تصمیم قطعی: همهٔ scheduleها نمایش داده شوند، تفکیکشده بر اساس محل نوبتدهی.**
|
||||
|
||||
انتخاب یکی و پنهانکردن بقیه یعنی حذف ظرفیت واقعی پزشک از سایت — پزشکی که سهشنبهها فقط در کلینیک است، آن روز اصلاً قابل رزرو نخواهد بود. ضمناً قیمت و سرویسها بین محلها فرق میکند، پس بیمار باید محل را آگاهانه انتخاب کند، نه اینکه سیستم بهجایش تصمیم بگیرد.
|
||||
|
||||
قرارداد API عمومی — بهجای یک آبجکت، آرایهای از «محلهای نوبتدهی» برگردد:
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": {
|
||||
"doctor": { "uuid": "...", "name": "..." },
|
||||
"booking_locations": [
|
||||
{
|
||||
"location_uuid": "...",
|
||||
"type": "personal",
|
||||
"title": "مطب شخصی",
|
||||
"address": "...",
|
||||
"clinic_uuid": null,
|
||||
"booking_mode": "slot",
|
||||
"services": [],
|
||||
"next_available_at": 1755000000
|
||||
},
|
||||
{
|
||||
"location_uuid": "...",
|
||||
"type": "clinic",
|
||||
"title": "کلینیک علی بهروزی",
|
||||
"address": "...",
|
||||
"clinic_uuid": "41e325c4-...",
|
||||
"booking_mode": "service",
|
||||
"services": [ { "uuid": "...", "name": "...", "price_rials": 0, "duration_minutes": 20 } ],
|
||||
"next_available_at": 1754900000
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
قواعد:
|
||||
|
||||
- **پیشفرض انتخابشده:** محلی با کمترین `next_available_at` (زودترین نوبت آزاد). این هم برای بیمار بهترین است و هم نیاز به قاعدهٔ دلبخواهی «شخصی اول یا کلینیک اول» را حذف میکند. اگر هیچ محلی نوبت آزاد نداشت، ترتیب: شخصی، سپس کلینیکها بر اساس نام.
|
||||
- **لینک مستقیم:** `/doctor/{uuid}?location={location_uuid}` تا هر محل قابل اشتراکگذاری و ایندکس باشد. بدون پارامتر → پیشفرض بالا.
|
||||
- **endpointهای اسلات و ثبت نوبت** باید `location_uuid` (یا `clinic_uuid`) اجباری بگیرند. الان محل را از تنها schedule پزشک استنتاج میکنند؛ با چند schedule این استنتاج غلط میشود و **بیسروصدا نوبت را به محل اشتباه ثبت میکند**. این را بهعنوان یک شکست خاموش جدی در نظر بگیر: تا وقتی این پارامتر اجباری نشده، migration بند ۱ را روی production اجرا نکن.
|
||||
- **سازگاری عقبرو:** تا وقتی `nobat724_front` بهروز نشده، اگر پزشک فقط یک schedule دارد (اکثریت مطلق دادههای فعلی)، پاسخ قدیمی هم در کنار `booking_locations` برگردانده شود؛ بعد از استقرار فرانت حذف شود. این را در `docs/api/appointment.md` صریح علامت بزن.
|
||||
- **JSON-LD:** بهجای یک `openingHoursSpecification`، برای هر محل یک entry جدا با `location` مشخص. یک نود `Physician` با چند `availableAtOrFrom`. پرامپت همتا در `nobat724_front` لازم است.
|
||||
|
||||
## نکات مهم
|
||||
|
||||
- **سازگاری با داده موجود:** هر پزشکی که الان schedule دارد، بعد از migration باید دقیقاً همان رفتار را در context شخصی ببیند. اگر آن schedule عملاً برای کلینیک تنظیم شده بوده (sessionهایش `location_id` کلینیکی دارند)، migration نمیتواند خودکار تشخیص دهد — این را بهعنوان محدودیت شناختهشده مستند کن و یک اسکریپت console برای انتقال دستی بنویس.
|
||||
- سرویسها polymorphic هستند و **هرگز** بین doctor و clinic مشترک نمیشوند؛ هیچجا سرویسهای دو context را union نکن.
|
||||
- تاریخها Unix timestamp صحیح بمانند؛ رشتههای جدید فارسی و تاریخها شمسی.
|
||||
- در پنل ادمین از `SearchableSelect` استفاده کن، نه `<select>` بومی.
|
||||
- **نشت داده مالی:** وظیفهٔ ۹ فقط یک مسئلهٔ UI نیست — `GET /api/v1/dashboard/doctor` الان درآمد شخصی پزشک را بدون هیچ فیلتر contextی برمیگرداند. اصلاح backend اجباری است.
|
||||
- ترتیب پیادهسازی پیشنهادی: (۱) Entity + migration → (۲) `EntityContextResolver` → (۳) کنترلر تنظیمات + validation → (۴) آدرسها و سرویسها → (۵) فرانت → (۶) `AppointmentController` عمومی → (۷) داشبورد پزشک دعوتشده (وظیفهٔ ۹) → (۸) تست و docs. هر مرحله جدا تست شود. وظیفهٔ ۹ به `EntityContextResolver` وابسته است ولی مستقل از migration قابل شروع است.
|
||||
- کاربر تست: `09390039833 / 09390039833`. سناریوی باگ: دکتر تست `09100652121` در کلینیک `41e325c4-e825-4067-8438-5d828ecaee09`.
|
||||
@@ -493,7 +493,14 @@ function SessionEditor({ session, onChange, onRemove, addresses, serviceMode = f
|
||||
|
||||
// ── Weekly Schedule Tab ────────────────────────────────────────────────────
|
||||
|
||||
export function WeeklyScheduleTab({ doctorUuid, addresses, readOnly = false }: { doctorUuid: string; addresses: AddressData[]; readOnly?: boolean }) {
|
||||
/**
|
||||
* هر درخواست تنظیمات نوبتدهی باید محیطش را حمل کند: بدون clinic_uuid یعنی مطب
|
||||
* شخصی پزشک، و با آن یعنی همان پزشک داخل آن کلینیک. این دو دادهی جدا دارند.
|
||||
*/
|
||||
const withClinic = (url: string, clinicUuid?: string | null): string =>
|
||||
clinicUuid ? `${url}${url.includes('?') ? '&' : '?'}clinic_uuid=${encodeURIComponent(clinicUuid)}` : url;
|
||||
|
||||
export function WeeklyScheduleTab({ doctorUuid, clinicUuid, addresses, readOnly = false }: { doctorUuid: string; clinicUuid?: string | null; addresses: AddressData[]; readOnly?: boolean }) {
|
||||
const qc = useQueryClient();
|
||||
const [scheduleMap, setScheduleMap] = useState<NewScheduleMap>(EMPTY_NEW_SCHEDULE);
|
||||
const [scheduleUuid, setScheduleUuid] = useState<string | null>(null);
|
||||
@@ -504,8 +511,8 @@ export function WeeklyScheduleTab({ doctorUuid, addresses, readOnly = false }: {
|
||||
const [confirmMode, setConfirmMode] = useState(false);
|
||||
|
||||
const scheduleQ = useQuery({
|
||||
queryKey: ['doctor-schedule', doctorUuid],
|
||||
queryFn: () => api.get<ApiResponse<any>>(`/api/v1/appointment-settings/weekly-schedule/${doctorUuid}`),
|
||||
queryKey: ['doctor-schedule', doctorUuid, clinicUuid ?? null],
|
||||
queryFn: () => api.get<ApiResponse<any>>(withClinic(`/api/v1/appointment-settings/weekly-schedule/${doctorUuid}`, clinicUuid)),
|
||||
staleTime: 0,
|
||||
retry: (count, err) => !(err instanceof ApiError && err.status === 404),
|
||||
});
|
||||
@@ -550,15 +557,15 @@ export function WeeklyScheduleTab({ doctorUuid, addresses, readOnly = false }: {
|
||||
if (hasAnyOverlap) throw new Error('تداخل زمانی در برنامه وجود دارد');
|
||||
if (missingLocation) throw new Error('مکان مطب برای همه بازههای فعال الزامی است');
|
||||
return scheduleUuid
|
||||
? api.patch<ApiResponse<any>>(`/api/v1/appointment-settings/weekly-schedule/${doctorUuid}`, { schedule: scheduleMap, meta })
|
||||
: api.post<ApiResponse<any>>('/api/v1/appointment-settings/weekly-schedule', { doctor_uuid: doctorUuid, schedule: scheduleMap, meta });
|
||||
? api.patch<ApiResponse<any>>(`/api/v1/appointment-settings/weekly-schedule/${doctorUuid}`, { schedule: scheduleMap, meta, clinic_uuid: clinicUuid ?? null })
|
||||
: api.post<ApiResponse<any>>('/api/v1/appointment-settings/weekly-schedule', { doctor_uuid: doctorUuid, schedule: scheduleMap, meta, clinic_uuid: clinicUuid ?? null });
|
||||
},
|
||||
onSuccess: (res) => {
|
||||
const d: WeeklyScheduleData = res?.data?.data ?? res?.data;
|
||||
if (d?.uuid && !scheduleUuid) setScheduleUuid(d.uuid);
|
||||
setModeLocked(true); // پس از ثبت، نوع نوبتدهی قفل میشود
|
||||
toast.success('برنامه هفتگی ذخیره شد');
|
||||
qc.invalidateQueries({ queryKey: ['doctor-schedule', doctorUuid] });
|
||||
qc.invalidateQueries({ queryKey: ['doctor-schedule', doctorUuid, clinicUuid ?? null] });
|
||||
},
|
||||
onError: (e: Error) => toast.error(e.message),
|
||||
});
|
||||
@@ -712,7 +719,7 @@ export function WeeklyScheduleTab({ doctorUuid, addresses, readOnly = false }: {
|
||||
<span className="text-sm text-slate-600 dark:text-slate-400">دقیقه</span>
|
||||
</div>
|
||||
<p className="text-xs text-slate-400 dark:text-slate-500 leading-relaxed">
|
||||
مدت هر نوبت از «مدت سرویس» انتخابشده تعیین میشود. لازم است حداقل یک سرویس با «نمایش در نوبتدهی» در بخش <span className="font-medium">سرویسها</span> تعریف کنید، وگرنه ذخیره نمیشود.
|
||||
مدت هر نوبت از «مدت سرویس» انتخابشده تعیین میشود. لازم است حداقل یک سرویس با «نمایش در نوبتدهی» در بخش <span className="font-medium">{clinicUuid ? 'سرویسهای کلینیک' : 'سرویسها'}</span> تعریف کنید، وگرنه ذخیره نمیشود.
|
||||
</p>
|
||||
</>
|
||||
) : (
|
||||
@@ -875,9 +882,9 @@ export function WeeklyScheduleTab({ doctorUuid, addresses, readOnly = false }: {
|
||||
|
||||
// ── Date Override Modal ────────────────────────────────────────────────────
|
||||
|
||||
function DateOverrideModal({ open, onClose, existing, doctorUuid, onSaved, addresses }: {
|
||||
function DateOverrideModal({ open, onClose, existing, doctorUuid, clinicUuid, onSaved, addresses }: {
|
||||
open: boolean; onClose: () => void;
|
||||
existing: DateOverrideData | null; doctorUuid: string;
|
||||
existing: DateOverrideData | null; doctorUuid: string; clinicUuid?: string | null;
|
||||
onSaved: () => void; addresses: AddressData[];
|
||||
}) {
|
||||
const [dateStr, setDateStr] = useState('');
|
||||
@@ -917,7 +924,7 @@ function DateOverrideModal({ open, onClose, existing, doctorUuid, onSaved, addre
|
||||
const body = { date: dateStr, active, reason: reason || undefined, custom_slots: active ? slots : [] };
|
||||
if (existing)
|
||||
return api.patch<ApiResponse<any>>(`/api/v1/appointment-settings/date-override/${existing.uuid}`, body);
|
||||
return api.post<ApiResponse<any>>('/api/v1/appointment-settings/date-override', { ...body, doctor_uuid: doctorUuid });
|
||||
return api.post<ApiResponse<any>>('/api/v1/appointment-settings/date-override', { ...body, doctor_uuid: doctorUuid, clinic_uuid: clinicUuid ?? null });
|
||||
},
|
||||
onSuccess: () => { toast.success(existing ? 'ویرایش شد' : 'تاریخ خاص اضافه شد'); onSaved(); onClose(); },
|
||||
onError: (e: Error) => toast.error(e.message),
|
||||
@@ -1015,15 +1022,15 @@ function DateOverrideModal({ open, onClose, existing, doctorUuid, onSaved, addre
|
||||
|
||||
// ── Date Overrides Tab ─────────────────────────────────────────────────────
|
||||
|
||||
function DateOverridesTab({ doctorUuid, addresses, readOnly = false }: { doctorUuid: string; addresses: AddressData[]; readOnly?: boolean }) {
|
||||
function DateOverridesTab({ doctorUuid, clinicUuid, addresses, readOnly = false }: { doctorUuid: string; clinicUuid?: string | null; addresses: AddressData[]; readOnly?: boolean }) {
|
||||
const qc = useQueryClient();
|
||||
const [modalOpen, setModalOpen] = useState(false);
|
||||
const [editing, setEditing] = useState<DateOverrideData | null>(null);
|
||||
const [deletingUuid, setDeletingUuid] = useState<string | null>(null);
|
||||
|
||||
const listQ = useQuery({
|
||||
queryKey: ['doctor-overrides', doctorUuid],
|
||||
queryFn: () => api.get<ApiResponse<any>>(`/api/v1/appointment-settings/date-override/list/${doctorUuid}`),
|
||||
queryKey: ['doctor-overrides', doctorUuid, clinicUuid ?? null],
|
||||
queryFn: () => api.get<ApiResponse<any>>(withClinic(`/api/v1/appointment-settings/date-override/list/${doctorUuid}`, clinicUuid)),
|
||||
staleTime: 0,
|
||||
});
|
||||
const overrides: DateOverrideData[] = useMemo(
|
||||
@@ -1032,7 +1039,7 @@ function DateOverridesTab({ doctorUuid, addresses, readOnly = false }: { doctorU
|
||||
|
||||
const deleteMut = useMutation({
|
||||
mutationFn: (uuid: string) => api.delete<ApiResponse<any>>(`/api/v1/appointment-settings/date-override/${uuid}`),
|
||||
onSuccess: () => { toast.success('حذف شد'); setDeletingUuid(null); qc.invalidateQueries({ queryKey: ['doctor-overrides', doctorUuid] }); },
|
||||
onSuccess: () => { toast.success('حذف شد'); setDeletingUuid(null); qc.invalidateQueries({ queryKey: ['doctor-overrides', doctorUuid, clinicUuid ?? null] }); },
|
||||
onError: (e: Error) => toast.error(e.message),
|
||||
});
|
||||
|
||||
@@ -1103,8 +1110,8 @@ function DateOverridesTab({ doctorUuid, addresses, readOnly = false }: { doctorU
|
||||
</div>
|
||||
)}
|
||||
<DateOverrideModal open={modalOpen} onClose={() => { setModalOpen(false); setEditing(null); }}
|
||||
existing={editing} doctorUuid={doctorUuid} addresses={addresses}
|
||||
onSaved={() => qc.invalidateQueries({ queryKey: ['doctor-overrides', doctorUuid] })} />
|
||||
existing={editing} doctorUuid={doctorUuid} clinicUuid={clinicUuid} addresses={addresses}
|
||||
onSaved={() => qc.invalidateQueries({ queryKey: ['doctor-overrides', doctorUuid, clinicUuid ?? null] })} />
|
||||
<ConfirmDialog open={!!deletingUuid} title="حذف تاریخ خاص" message="آیا از حذف این تاریخ خاص اطمینان دارید؟"
|
||||
confirmLabel="بله، حذف کن" danger loading={deleteMut.isPending}
|
||||
onConfirm={() => deletingUuid && deleteMut.mutate(deletingUuid)} onCancel={() => setDeletingUuid(null)} />
|
||||
@@ -1114,9 +1121,9 @@ function DateOverridesTab({ doctorUuid, addresses, readOnly = false }: { doctorU
|
||||
|
||||
// ── Holiday Modal ──────────────────────────────────────────────────────────
|
||||
|
||||
function HolidayModal({ open, onClose, existing, doctorUuid, onSaved }: {
|
||||
function HolidayModal({ open, onClose, existing, doctorUuid, clinicUuid, onSaved }: {
|
||||
open: boolean; onClose: () => void;
|
||||
existing: HolidayData | null; doctorUuid: string;
|
||||
existing: HolidayData | null; doctorUuid: string; clinicUuid?: string | null;
|
||||
onSaved: () => void;
|
||||
}) {
|
||||
const [startDate, setStartDate] = useState('');
|
||||
@@ -1143,7 +1150,7 @@ function HolidayModal({ open, onClose, existing, doctorUuid, onSaved }: {
|
||||
const body = { start_date: startDate, end_date: endDate, reason: reason || undefined };
|
||||
if (existing)
|
||||
return api.patch<ApiResponse<any>>(`/api/v1/appointment-settings/holidays/${existing.uuid}`, body);
|
||||
return api.post<ApiResponse<any>>('/api/v1/appointment-settings/holidays', { ...body, doctor_uuid: doctorUuid });
|
||||
return api.post<ApiResponse<any>>('/api/v1/appointment-settings/holidays', { ...body, doctor_uuid: doctorUuid, clinic_uuid: clinicUuid ?? null });
|
||||
},
|
||||
onSuccess: () => { toast.success(existing ? 'تعطیلات ویرایش شد' : 'تعطیلات اضافه شد'); onSaved(); onClose(); },
|
||||
onError: (e: Error) => toast.error(e.message),
|
||||
@@ -1187,15 +1194,15 @@ function HolidayModal({ open, onClose, existing, doctorUuid, onSaved }: {
|
||||
|
||||
// ── Holidays Tab ───────────────────────────────────────────────────────────
|
||||
|
||||
function HolidaysTab({ doctorUuid, readOnly = false }: { doctorUuid: string; readOnly?: boolean }) {
|
||||
function HolidaysTab({ doctorUuid, clinicUuid, readOnly = false }: { doctorUuid: string; clinicUuid?: string | null; readOnly?: boolean }) {
|
||||
const qc = useQueryClient();
|
||||
const [modalOpen, setModalOpen] = useState(false);
|
||||
const [editing, setEditing] = useState<HolidayData | null>(null);
|
||||
const [deletingUuid, setDeletingUuid] = useState<string | null>(null);
|
||||
|
||||
const listQ = useQuery({
|
||||
queryKey: ['doctor-holidays', doctorUuid],
|
||||
queryFn: () => api.get<ApiResponse<any>>(`/api/v1/appointment-settings/holidays/list/${doctorUuid}`),
|
||||
queryKey: ['doctor-holidays', doctorUuid, clinicUuid ?? null],
|
||||
queryFn: () => api.get<ApiResponse<any>>(withClinic(`/api/v1/appointment-settings/holidays/list/${doctorUuid}`, clinicUuid)),
|
||||
staleTime: 0,
|
||||
});
|
||||
const holidays: HolidayData[] = useMemo(
|
||||
@@ -1204,13 +1211,13 @@ function HolidaysTab({ doctorUuid, readOnly = false }: { doctorUuid: string; rea
|
||||
|
||||
const deleteMut = useMutation({
|
||||
mutationFn: (uuid: string) => api.delete<ApiResponse<any>>(`/api/v1/appointment-settings/holidays/${uuid}`),
|
||||
onSuccess: () => { toast.success('حذف شد'); setDeletingUuid(null); qc.invalidateQueries({ queryKey: ['doctor-holidays', doctorUuid] }); },
|
||||
onSuccess: () => { toast.success('حذف شد'); setDeletingUuid(null); qc.invalidateQueries({ queryKey: ['doctor-holidays', doctorUuid, clinicUuid ?? null] }); },
|
||||
onError: (e: Error) => toast.error(e.message),
|
||||
});
|
||||
|
||||
const toggleMut = useMutation({
|
||||
mutationFn: (h: HolidayData) => api.patch<ApiResponse<any>>(`/api/v1/appointment-settings/holidays/${h.uuid}`, { active: !h.active }),
|
||||
onSuccess: () => { toast.success('وضعیت بروز شد'); qc.invalidateQueries({ queryKey: ['doctor-holidays', doctorUuid] }); },
|
||||
onSuccess: () => { toast.success('وضعیت بروز شد'); qc.invalidateQueries({ queryKey: ['doctor-holidays', doctorUuid, clinicUuid ?? null] }); },
|
||||
onError: (e: Error) => toast.error(e.message),
|
||||
});
|
||||
|
||||
@@ -1284,8 +1291,8 @@ function HolidaysTab({ doctorUuid, readOnly = false }: { doctorUuid: string; rea
|
||||
</div>
|
||||
)}
|
||||
<HolidayModal open={modalOpen} onClose={() => { setModalOpen(false); setEditing(null); }}
|
||||
existing={editing} doctorUuid={doctorUuid}
|
||||
onSaved={() => qc.invalidateQueries({ queryKey: ['doctor-holidays', doctorUuid] })} />
|
||||
existing={editing} doctorUuid={doctorUuid} clinicUuid={clinicUuid}
|
||||
onSaved={() => qc.invalidateQueries({ queryKey: ['doctor-holidays', doctorUuid, clinicUuid ?? null] })} />
|
||||
<ConfirmDialog open={!!deletingUuid} title="حذف تعطیلات" message="آیا از حذف این تعطیلات اطمینان دارید؟"
|
||||
confirmLabel="بله، حذف کن" danger loading={deleteMut.isPending}
|
||||
onConfirm={() => deletingUuid && deleteMut.mutate(deletingUuid)} onCancel={() => setDeletingUuid(null)} />
|
||||
@@ -1301,12 +1308,12 @@ const SCHEDULE_TABS = [
|
||||
{ id: 'holidays' as const, label: 'تعطیلات' },
|
||||
];
|
||||
|
||||
export function ScheduleSection({ doctorUuid, readOnly = false }: { doctorUuid: string; readOnly?: boolean }) {
|
||||
export function ScheduleSection({ doctorUuid, clinicUuid, readOnly = false }: { doctorUuid: string; clinicUuid?: string | null; readOnly?: boolean }) {
|
||||
const [tab, setTab] = useState<'weekly' | 'overrides' | 'holidays'>('weekly');
|
||||
|
||||
const locationsQ = useQuery({
|
||||
queryKey: ['available-locations', doctorUuid],
|
||||
queryFn: () => api.get<ApiResponse<any>>(`/api/v1/appointment-settings/available-locations/${doctorUuid}`),
|
||||
queryKey: ['available-locations', doctorUuid, clinicUuid ?? null],
|
||||
queryFn: () => api.get<ApiResponse<any>>(withClinic(`/api/v1/appointment-settings/available-locations/${doctorUuid}`, clinicUuid)),
|
||||
enabled: !!doctorUuid,
|
||||
staleTime: 30_000,
|
||||
});
|
||||
@@ -1327,9 +1334,9 @@ export function ScheduleSection({ doctorUuid, readOnly = false }: { doctorUuid:
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
{tab === 'weekly' && <WeeklyScheduleTab doctorUuid={doctorUuid} addresses={availableLocations} readOnly={readOnly} />}
|
||||
{tab === 'overrides' && <DateOverridesTab doctorUuid={doctorUuid} addresses={availableLocations} readOnly={readOnly} />}
|
||||
{tab === 'holidays' && <HolidaysTab doctorUuid={doctorUuid} readOnly={readOnly} />}
|
||||
{tab === 'weekly' && <WeeklyScheduleTab doctorUuid={doctorUuid} clinicUuid={clinicUuid} addresses={availableLocations} readOnly={readOnly} />}
|
||||
{tab === 'overrides' && <DateOverridesTab doctorUuid={doctorUuid} clinicUuid={clinicUuid} addresses={availableLocations} readOnly={readOnly} />}
|
||||
{tab === 'holidays' && <HolidaysTab doctorUuid={doctorUuid} clinicUuid={clinicUuid} readOnly={readOnly} />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ function ClinicAppointmentSettingsContent() {
|
||||
<span style={{ fontWeight: 600 }}>{selectedDoctor?.name}</span>
|
||||
</div>
|
||||
<FreeVisitPrice doctorUuid={selected} />
|
||||
<ScheduleSection doctorUuid={selected} />
|
||||
<ScheduleSection doctorUuid={selected} clinicUuid={clinicUuid} />
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
|
||||
@@ -13,6 +13,8 @@ import { formatNumber, formatRial, formatDateTime } from '../lib/utils';
|
||||
import { useAuthStore } from '../stores/authStore';
|
||||
import InviteDoctorModal from '../components/ui/InviteDoctorModal';
|
||||
import { TauriDashboardView } from '../components/dashboard/TauriDashboardView';
|
||||
import { NewAppointmentsTable } from '../components/dashboard/NewAppointmentsTable';
|
||||
import { usePermissions } from '../hooks/usePermissions';
|
||||
|
||||
// ── Shared Status Maps ────────────────────────────────────────────────────
|
||||
|
||||
@@ -1111,14 +1113,72 @@ function RepresentationDashboard() {
|
||||
);
|
||||
}
|
||||
|
||||
// ── Invited-Doctor Dashboard (doctor working inside a clinic) ─────────────
|
||||
|
||||
/**
|
||||
* پزشکی که با دعوت وارد یک کلینیک شده، در محیط آن کلینیک فقط کار خودش را میبیند.
|
||||
* ارقام مالی اینجا نمایش داده نمیشوند و backend هم آنها را برنمیگرداند؛ این
|
||||
* کامپوننت لایهٔ دوم است، نه تنها محافظ.
|
||||
*/
|
||||
function InvitedDoctorDashboard() {
|
||||
const dbUuid = useAuthStore(s => s.dbUuid);
|
||||
const { can } = usePermissions();
|
||||
|
||||
const q = useQuery({
|
||||
queryKey: ['dashboard-doctor-clinic', dbUuid],
|
||||
queryFn: () => api.get<ApiResponse<DoctorDashboardData>>(
|
||||
`/api/v1/dashboard/doctor${dbUuid ? `?clinic_uuid=${encodeURIComponent(dbUuid)}` : ''}`
|
||||
),
|
||||
staleTime: 60_000,
|
||||
});
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const d = useMemo<DoctorDashboardData | undefined>(() => (q.data?.data as any)?.data ?? q.data?.data, [q.data]);
|
||||
|
||||
if (q.isLoading) return <LoadingSkeleton />;
|
||||
|
||||
const tiles: Array<{ label: string; value: string }> = [
|
||||
{ label: 'نوبتهای امروز', value: formatNumber(d?.stats.today_appointments ?? 0) },
|
||||
{ label: 'نوبتهای فردا', value: formatNumber(d?.stats.tomorrow_appointments ?? 0) },
|
||||
{ label: 'نوبتهای این ماه', value: formatNumber(d?.stats.this_month_appointments ?? 0) },
|
||||
];
|
||||
|
||||
return (
|
||||
<div className="fade-in">
|
||||
<div className="grid grid-cols-1 sm:grid-cols-3 gap-[var(--gap)]">
|
||||
{tiles.map(t => (
|
||||
<div key={t.label} className="card card-pad">
|
||||
<b style={{ fontSize: 22 }}>{t.value}</b>
|
||||
<p className="muted" style={{ fontSize: 13.5, marginTop: 6 }}>{t.label}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{can('appointments', 'view') && (
|
||||
<div className="card card-pad" style={{ marginTop: 'var(--gap)' }}>
|
||||
<div className="card-title-row">
|
||||
<h3 style={{ fontSize: 16 }}>لیست نوبتهای جدید</h3>
|
||||
<Link to="/admin/appointments" className="muted" style={{ fontSize: 13 }}>نوبتها</Link>
|
||||
</div>
|
||||
<NewAppointmentsTable rows={d?.today_appointments ?? []} loading={q.isFetching} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Main Dispatcher ───────────────────────────────────────────────────────
|
||||
|
||||
export default function DashboardPage() {
|
||||
const primaryRole = useAuthStore(s => s.primaryRole);
|
||||
const scope = useAuthStore(s => s.context?.scope ?? null);
|
||||
|
||||
if (!primaryRole) return <LoadingSkeleton />;
|
||||
if (primaryRole === 'admin') return <AdminDashboard />;
|
||||
if (primaryRole === 'clinic') return <ClinicDashboard />;
|
||||
// پزشکِ دعوتشده داخل کلینیک، داشبورد شخصیاش را نمیبیند: نه درآمد، نه کیف پول،
|
||||
// نه فهرست کلینیکها — فقط نوبتهای خودش در همان کلینیک.
|
||||
if (primaryRole === 'doctor' && scope === 'clinic') return <InvitedDoctorDashboard />;
|
||||
if (primaryRole === 'doctor') return <DoctorDashboard />;
|
||||
if (primaryRole === 'secretary') return <SecretaryDashboard />;
|
||||
if (primaryRole === 'representation') return <RepresentationDashboard />;
|
||||
|
||||
@@ -1137,10 +1137,20 @@ export default function DoctorDetailPage({ isOwnProfile = false }: { isOwnProfil
|
||||
const primaryRole = useAuthStore(s => s.primaryRole);
|
||||
const dbUuid = useAuthStore(s => s.dbUuid);
|
||||
const doctorUuid = useAuthStore(s => s.doctorUuid);
|
||||
const context = useAuthStore(s => s.context);
|
||||
const availableContexts = useAuthStore(s => s.availableContexts);
|
||||
const uuid = isOwnProfile ? (doctorUuid ?? dbUuid ?? undefined) : paramUuid;
|
||||
// نماینده فقط مشاهده میکند؛ هیچ بخشی قابل ویرایش نیست.
|
||||
const isReadOnly = primaryRole === 'representation';
|
||||
|
||||
// صفحهٔ پزشک در پنل کلینیک، تنظیمات نوبتدهیِ همان کلینیک را ویرایش میکند — نه
|
||||
// برنامهٔ مطب شخصی پزشک، که فقط خودش به آن دسترسی دارد.
|
||||
const scheduleClinicUuid = useMemo(() => {
|
||||
if (isOwnProfile) return null;
|
||||
if (context?.type === 'clinic') return dbUuid;
|
||||
return availableContexts.find(c => c.type === 'clinic')?.db_uuid ?? null;
|
||||
}, [isOwnProfile, context, dbUuid, availableContexts]);
|
||||
|
||||
const [editOpen, setEditOpen] = useState(searchParams.get('edit') === '1');
|
||||
const [deleteOpen, setDeleteOpen] = useState(false);
|
||||
const [toggleConfirm, setToggleConfirm] = useState(false);
|
||||
@@ -1589,7 +1599,7 @@ export default function DoctorDetailPage({ isOwnProfile = false }: { isOwnProfil
|
||||
)}
|
||||
</div>
|
||||
|
||||
{uuid && !isOwnProfile && <ScheduleSection doctorUuid={uuid} readOnly={isReadOnly} />}
|
||||
{uuid && !isOwnProfile && <ScheduleSection doctorUuid={uuid} clinicUuid={scheduleClinicUuid} readOnly={isReadOnly} />}
|
||||
|
||||
{isOwnProfile && <ClinicInvitationsSection />}
|
||||
|
||||
|
||||
@@ -5,24 +5,47 @@
|
||||
|
||||
Doctors configure their availability via three resources: **weekly schedule**, **date overrides**, and **holidays**.
|
||||
|
||||
## Booking context (`clinic_uuid`)
|
||||
|
||||
Every endpoint in this file operates inside **one booking context**, selected by the optional
|
||||
`clinic_uuid` parameter (query string on `GET`/`DELETE`, body field on `POST`/`PATCH`):
|
||||
|
||||
| `clinic_uuid` | Context | Services usable | Addresses selectable |
|
||||
|---|---|---|---|
|
||||
| omitted / `null` | the doctor's **personal practice** | `entity_type='doctor'` | the doctor's own `personal` addresses |
|
||||
| a clinic uuid | that **doctor inside that clinic** | `entity_type='clinic'` | that clinic's addresses |
|
||||
|
||||
A doctor holds **one schedule per context** — a personal one plus one per clinic — and they are
|
||||
fully independent: separate sessions, separate `booking_mode` lock, separate date overrides.
|
||||
Services never cross the boundary (they are polymorphic on `service_sections.entity_type`).
|
||||
|
||||
If the doctor is not a member of the given clinic → `422 ERR_VALIDATION_001`
|
||||
(«این پزشک عضو کلینیک انتخابشده نیست»). Unknown clinic → `404 ERR_VALIDATION_002`.
|
||||
|
||||
## Access rule
|
||||
|
||||
All 14 endpoints in this file share a single check. Given the target doctor (resolved from the path/body uuid, or from the parent schedule/override/holiday), access is granted when the caller is:
|
||||
Given the target doctor and the resolved context, access is granted when the caller is:
|
||||
|
||||
1. `ROLE_ADMIN`, **or**
|
||||
2. the doctor themselves, **or**
|
||||
3. the **owner of a clinic** the doctor belongs to, **or**
|
||||
4. a **doctor member of that clinic** holding the `appointment_settings` permission — `view` for `GET`, `update` for `POST`/`PATCH`/`DELETE` (see `docs/api/clinic.md` → *Clinic Doctor Permissions*)
|
||||
3. in a **clinic context only**, someone holding that clinic's `appointment_settings` permission —
|
||||
`view` for `GET`, `update` for `POST`/`PATCH`/`DELETE` (see `docs/api/clinic.md` →
|
||||
*Clinic Doctor Permissions*). The clinic owner always passes this check.
|
||||
|
||||
Anything else → `403 ERR_AUTH_006`. This is what lets the clinic panel manage every member doctor's booking settings from `تنظیمات → نوبتدهی`, one tab per doctor, using the same endpoints the doctor's own panel calls.
|
||||
Anything else → `403 ERR_AUTH_006`.
|
||||
|
||||
A doctor's own settings are never affected by clinic permissions — rule 2 short-circuits before any permission lookup.
|
||||
> **Breaking change (2026-07):** a clinic owner can no longer read or write a member doctor's
|
||||
> **personal** schedule. Without `clinic_uuid` the request targets the personal context, which only
|
||||
> the doctor and an admin may touch. The clinic panel must send `clinic_uuid`; the admin SPA already
|
||||
> does (`ScheduleSection` takes a `clinicUuid` prop).
|
||||
|
||||
---
|
||||
|
||||
## Weekly Schedule
|
||||
|
||||
Each doctor has **one** weekly schedule (upsert). The schedule is keyed by **day index** (0=Saturday ... 6=Friday), each day containing a `sessions` array.
|
||||
Each doctor has **one weekly schedule per context** (upsert keyed by `doctor_id` + `clinic_id`).
|
||||
The schedule is keyed by **day index** (0=Saturday ... 6=Friday), each day containing a `sessions`
|
||||
array.
|
||||
|
||||
### Day Index Convention
|
||||
|
||||
@@ -45,11 +68,16 @@ Create or update the weekly schedule for a doctor (upsert).
|
||||
**Permission:** `AUTH` — see [Access rule](#access-rule)
|
||||
|
||||
> **الزام آدرس:** هر session با `active=true` باید `location_id` (آدرس مطب/کلینیک) داشته باشد. در غیر این صورت `422 ERR_VALIDATION_001` («برای هر شیفت فعال باید آدرس انتخاب شود»). این آدرس هنگام رزرو خودکار روی نوبت ذخیره میشود.
|
||||
>
|
||||
> **الزام محیط:** آدرس انتخابشده باید به همان context تعلق داشته باشد. آدرس کلینیک در محیط شخصی (و برعکس) → `422 ERR_VALIDATION_001` («آدرس انتخابشده متعلق به این کلینیک نیست»).
|
||||
>
|
||||
> **نوبتدهی سرویسی:** با `meta.booking_mode = "service"` صاحبِ همان context باید حداقل یک سرویس با `bookable = true` داشته باشد؛ وگرنه `422 ERR_VALIDATION_001` روی فیلد `booking_mode`. پیام در محیط کلینیک به کلینیک اشاره میکند.
|
||||
|
||||
### Request Body (`application/json`)
|
||||
```json
|
||||
{
|
||||
"doctor_uuid": "550e8400-e29b-41d4-a716-446655440000",
|
||||
"clinic_uuid": null,
|
||||
"schedule": {
|
||||
"0": {
|
||||
"sessions": [
|
||||
@@ -648,3 +676,49 @@ Returns all locations a doctor can assign as `location_id` in their schedule ses
|
||||
| Code | HTTP | Description |
|
||||
|------|------|-------------|
|
||||
| `ERR_VALIDATION_002` | 404 | Doctor not found |
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Context additions (2026-07)
|
||||
|
||||
### Response fields
|
||||
|
||||
`WeeklySchedule.toArray()` now also returns:
|
||||
|
||||
| Field | Type | Meaning |
|
||||
|---|---|---|
|
||||
| `clinic_uuid` | `string\|null` | the clinic this schedule belongs to; `null` = personal practice |
|
||||
| `context` | `"personal" \| "clinic"` | convenience mirror of the above |
|
||||
|
||||
`DateOverride.toArray()` returns the same two fields. `Holiday.toArray()` returns `clinic_uuid`
|
||||
plus `scope` (`"global" | "clinic"`), and the list endpoint adds `editable` (see below).
|
||||
|
||||
### Holidays are global by default
|
||||
|
||||
A holiday means "the doctor is not there", which is a physical fact — so unlike schedules and date
|
||||
overrides it is **not** per-context by default:
|
||||
|
||||
| `clinic_id` | Meaning |
|
||||
|---|---|
|
||||
| `NULL` | the doctor is absent **everywhere** — applies to the personal practice and every clinic |
|
||||
| set | the doctor is absent in that clinic only |
|
||||
|
||||
`GET /holidays/list/{doctorUuid}?clinic_uuid=…` returns the **union**: the clinic's own holidays plus
|
||||
the doctor's global ones. Global rows come back with `editable: false` — a clinic must see that the
|
||||
doctor is away but may not delete that fact.
|
||||
|
||||
`POST /holidays` **without** `clinic_uuid` creates a global holiday and is restricted to the doctor
|
||||
themselves and admins → otherwise `403 ERR_ACCESS_DENIED` («کلینیک فقط میتواند تعطیلی مخصوص خودش را
|
||||
ثبت کند»). A clinic closing for *all* its doctors is not expressible in this model and needs a
|
||||
separate `ClinicHoliday` entity — **not implemented**.
|
||||
|
||||
### Date overrides are always per-context
|
||||
|
||||
`GET /date-override/list/{doctorUuid}?clinic_uuid=…` returns only that context's overrides — no
|
||||
union, because an override changes working hours and working hours are themselves per-context.
|
||||
|
||||
### `GET /available-locations/{doctorUuid}`
|
||||
|
||||
Now takes `?clinic_uuid=`. Without it, only the doctor's `personal` addresses are returned; with it,
|
||||
only that clinic's addresses. The two sets are never merged (they used to be).
|
||||
|
||||
@@ -685,3 +685,92 @@ Extra optional body fields: `service_section_uuid`, `service_item_uuid`, `staff_
|
||||
|
||||
### GET `/api/v1/my/appointments` (extended)
|
||||
New query param `reserve=1` → returns only reserve-list entries; without it only regular slot bookings are returned. Each row now also includes: `patient_uuid`, `is_reserve`, `deposit_required`, `deposit_amount_rials`, `note`, `service_section`, `service_item`, `staff` (each `{uuid, name|full_name}` or null).
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Booking context (2026-07)
|
||||
|
||||
A doctor may now hold several booking schedules — one for the personal practice and one per clinic.
|
||||
Every public booking endpoint therefore accepts an optional **`clinic_uuid`**:
|
||||
|
||||
| Endpoint | Where |
|
||||
|---|---|
|
||||
| `GET /api/v1/appointment-slots` | query |
|
||||
| `GET /api/v1/appointment-service-slots` | query |
|
||||
| `GET /api/v1/appointment-booking-services/{doctorUuid}` | query |
|
||||
| `GET /api/v1/appointment-settings/month-availability/{doctorUuid}` | query |
|
||||
| `POST /api/v1/appointment` | body |
|
||||
|
||||
Omitting it means the **personal practice** — it is never a wildcard. If the doctor is not a member
|
||||
of the given clinic → `404 ERR_VALIDATION_002` («محل نوبتدهی یافت نشد»). All four `GET`s echo back
|
||||
`clinic_uuid` so a client can tell which context answered.
|
||||
|
||||
On `POST /api/v1/appointment`, any `service_item_uuids` must belong to the same context, otherwise
|
||||
`422 ERR_VALIDATION_001` («سرویس انتخابشده به این محل نوبتدهی تعلق ندارد»). The appointment's
|
||||
`address_id` is resolved from that context's schedule.
|
||||
|
||||
> **Silent-failure warning:** before this change the location was inferred from the doctor's single
|
||||
> schedule. A client that does not send `clinic_uuid` will now book into the personal practice —
|
||||
> which is correct, but is a behaviour change for any doctor who also works in a clinic. Update
|
||||
> callers before relying on the default.
|
||||
|
||||
### GET `/api/v1/appointment-booking-locations/{doctorUuid}`
|
||||
|
||||
**Permission:** public.
|
||||
|
||||
Lists every place the doctor can be booked at. The site should show **all** of them, grouped by
|
||||
location — picking one and hiding the rest removes real capacity from the doctor.
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": {
|
||||
"doctor_uuid": "550e8400-e29b-41d4-a716-446655440000",
|
||||
"booking_locations": [
|
||||
{
|
||||
"location_uuid": "0f0b…",
|
||||
"type": "personal",
|
||||
"title": "مطب شخصی",
|
||||
"address": "یزد، خیابان …",
|
||||
"clinic_uuid": null,
|
||||
"booking_mode": "slot",
|
||||
"buffer_minutes": 0,
|
||||
"services": [],
|
||||
"next_available_at": 1755000000
|
||||
},
|
||||
{
|
||||
"location_uuid": "7c21…",
|
||||
"type": "clinic",
|
||||
"title": "کلینیک علی بهروزی",
|
||||
"address": "یزد، بلوار …",
|
||||
"clinic_uuid": "41e325c4-e825-4067-8438-5d828ecaee09",
|
||||
"booking_mode": "service",
|
||||
"buffer_minutes": 10,
|
||||
"services": [
|
||||
{ "uuid": "…", "name": "ویزیت", "duration_minutes": 20, "price_rials": 500000,
|
||||
"service_section": { "uuid": "…", "name": "عمومی" } }
|
||||
],
|
||||
"next_available_at": 1754900000
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
| Field | Type | Notes |
|
||||
|---|---|---|
|
||||
| `location_uuid` | `string\|null` | the `DoctorAddress` uuid; `null` when the context has no address yet |
|
||||
| `type` | `"personal" \| "clinic"` | |
|
||||
| `booking_mode` | `"slot" \| "service"` | per-context — the same doctor can differ between locations |
|
||||
| `services` | `array` | populated only in `service` mode, scoped to that context's owner |
|
||||
| `next_available_at` | `int\|null` | Unix timestamp of the earliest free slot within 30 days |
|
||||
|
||||
Sorted by `next_available_at` ascending, so `booking_locations[0]` is the sensible default
|
||||
selection; locations with no capacity sort last. Deep links should carry the chosen location
|
||||
(`/doctor/{uuid}?location={location_uuid}`).
|
||||
|
||||
**Status codes:** `200`, `404 ERR_VALIDATION_002` (doctor not found).
|
||||
|
||||
**Consumer:** `nobat724_front` — the doctor page must render one booking block per entry and pass the
|
||||
matching `clinic_uuid` into the slot and booking calls.
|
||||
|
||||
@@ -327,3 +327,26 @@ refresh مستقیم هم کار کند، بنابراین فیلترکردن س
|
||||
|------|------|-------|
|
||||
| ERR_SERVICE_NOT_FOUND | 404 | سرویس یافت نشد |
|
||||
| ERR_VALIDATION_001 | 422 | سال نامعتبر |
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Owner resolution (2026-07)
|
||||
|
||||
Every endpoint in this file resolves its owner through `App\Shared\Context\EntityContextResolver`
|
||||
instead of reading the caller's role directly. Precedence:
|
||||
|
||||
1. an explicit **`clinic_uuid`** on the request (query string, or body on `POST`/`PATCH`/`PUT`) —
|
||||
403 if the caller may not act in that clinic;
|
||||
2. the caller's stored active context (`user_active_context`);
|
||||
3. their role.
|
||||
|
||||
This fixes a user who is both a doctor and a clinic owner: they used to always resolve as `doctor`
|
||||
and could never reach their own clinic's services.
|
||||
|
||||
`GET /api/v1/service-items?clinic_uuid=…` therefore returns that clinic's services rather than the
|
||||
caller's personal ones.
|
||||
|
||||
> **TODO:** `Inventory`, `Patient`, `Staff`, `Billing`, `Insurance`, `Subscription`, `Tag` and `Sms`
|
||||
> controllers still carry their own private `resolveEntity()` copy with the old role-first logic.
|
||||
> They should be migrated to `EntityContextResolver` too.
|
||||
|
||||
@@ -266,3 +266,34 @@ Returns time-series chart data for admin dashboard. All series are filtered to t
|
||||
- `appointment_status` — all-time counts, not filtered by period
|
||||
- `top_specialties` — top 8 by appointment volume, all-time
|
||||
- `subscription_sales_by_plan` — subscriptions created in period, grouped by plan; `revenue` sums only payments with status `received`
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Doctor dashboard is context-scoped (2026-07)
|
||||
|
||||
`GET /api/v1/dashboard/doctor` now accepts an optional **`clinic_uuid`**. When absent it falls back
|
||||
to the caller's stored active context (`user_active_context`), then to their role.
|
||||
|
||||
In a **clinic context** the response is restricted to that clinic:
|
||||
|
||||
* appointment counts and `today_appointments` only include appointments whose `address_id` belongs
|
||||
to that clinic;
|
||||
* the financial fields are **omitted entirely** — `revenue_period_rials`, `today_payments_rials`,
|
||||
`week_payments_rials`, `sms_wallet_balance`, `unique_patients_count`, `total_patients`, and
|
||||
`charts.revenue_by_day`. They describe the doctor's personal practice and have no meaning inside
|
||||
someone else's clinic. They return only in the personal context, or for the clinic's own owner
|
||||
holding `payments.view`;
|
||||
* `clinics` comes back as `[]` — the "کلینیکهای من" list belongs to the personal dashboard.
|
||||
|
||||
A `clinic_uuid` the caller has no access to is ignored and the personal context is used.
|
||||
|
||||
New response field:
|
||||
|
||||
```json
|
||||
"context": { "type": "personal" | "clinic", "clinic_uuid": "…|null", "clinic_name": "…|null" }
|
||||
```
|
||||
|
||||
The admin SPA dispatches on this: `primaryRole === 'doctor' && context.scope === 'clinic'` renders
|
||||
`InvitedDoctorDashboard` (appointment tiles + today's list only) instead of the full doctor
|
||||
dashboard. Hiding the cards client-side was not enough — the endpoint is directly callable.
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Adds a booking context (clinic_id) to weekly_schedules, date_overrides and holidays.
|
||||
*
|
||||
* NULL means the doctor's personal practice; a non-NULL value means the same doctor
|
||||
* inside that clinic. Existing rows keep clinic_id = NULL, i.e. every schedule and
|
||||
* override that exists today is interpreted as personal — the pre-change behaviour.
|
||||
*
|
||||
* Known limitation: a schedule that was in practice used for a clinic (its sessions
|
||||
* point at a clinic address) cannot be detected automatically. Move those with
|
||||
* `php bin/console app:schedule:assign-clinic`.
|
||||
*
|
||||
* weekly_schedules loses its UNIQUE(doctor_id) so a doctor can hold one schedule per
|
||||
* context. MySQL/MariaDB treat NULLs as distinct in a unique index, so
|
||||
* UNIQUE(doctor_id, clinic_id) does not by itself prevent two personal schedules —
|
||||
* WeeklyScheduleRepository::findByDoctorAndClinic() is the guard for that.
|
||||
*/
|
||||
final class Version20260718092903 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Add clinic_id booking context to weekly_schedules, date_overrides and holidays';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE weekly_schedules ADD clinic_id INT DEFAULT NULL');
|
||||
$this->addSql('ALTER TABLE weekly_schedules ADD CONSTRAINT FK_69C327F2CC22AD4 FOREIGN KEY (clinic_id) REFERENCES clinics (id) ON DELETE CASCADE');
|
||||
$this->addSql('CREATE INDEX IDX_69C327F2CC22AD4 ON weekly_schedules (clinic_id)');
|
||||
$this->addSql('ALTER TABLE weekly_schedules DROP INDEX idx_weekly_schedules_doctor, ADD INDEX IDX_69C327F287F4FB17 (doctor_id)');
|
||||
$this->addSql('ALTER TABLE weekly_schedules ADD clinic_key INT AS (IFNULL(clinic_id, 0)) STORED');
|
||||
$this->addSql('CREATE UNIQUE INDEX idx_weekly_schedules_doctor_clinic ON weekly_schedules (doctor_id, clinic_key)');
|
||||
|
||||
$this->addSql('ALTER TABLE date_overrides ADD clinic_id INT DEFAULT NULL');
|
||||
$this->addSql('ALTER TABLE date_overrides ADD CONSTRAINT FK_F49AE94ECC22AD4 FOREIGN KEY (clinic_id) REFERENCES clinics (id) ON DELETE CASCADE');
|
||||
$this->addSql('CREATE INDEX IDX_F49AE94ECC22AD4 ON date_overrides (clinic_id)');
|
||||
$this->addSql('DROP INDEX uniq_date_override_doctor_date ON date_overrides');
|
||||
$this->addSql('ALTER TABLE date_overrides ADD clinic_key INT AS (IFNULL(clinic_id, 0)) STORED');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_date_override_doctor_clinic_date ON date_overrides (doctor_id, clinic_key, date)');
|
||||
|
||||
$this->addSql('ALTER TABLE holidays ADD clinic_id INT DEFAULT NULL');
|
||||
$this->addSql('ALTER TABLE holidays ADD CONSTRAINT FK_3A66A10CCC22AD4 FOREIGN KEY (clinic_id) REFERENCES clinics (id) ON DELETE CASCADE');
|
||||
$this->addSql('CREATE INDEX IDX_3A66A10CCC22AD4 ON holidays (clinic_id)');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE holidays DROP FOREIGN KEY FK_3A66A10CCC22AD4');
|
||||
$this->addSql('DROP INDEX IDX_3A66A10CCC22AD4 ON holidays');
|
||||
$this->addSql('ALTER TABLE holidays DROP clinic_id');
|
||||
|
||||
$this->addSql('ALTER TABLE date_overrides DROP FOREIGN KEY FK_F49AE94ECC22AD4');
|
||||
$this->addSql('DROP INDEX IDX_F49AE94ECC22AD4 ON date_overrides');
|
||||
$this->addSql('DROP INDEX uniq_date_override_doctor_clinic_date ON date_overrides');
|
||||
$this->addSql('ALTER TABLE date_overrides DROP clinic_key');
|
||||
$this->addSql('ALTER TABLE date_overrides DROP clinic_id');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_date_override_doctor_date ON date_overrides (doctor_id, date)');
|
||||
|
||||
$this->addSql('ALTER TABLE weekly_schedules DROP FOREIGN KEY FK_69C327F2CC22AD4');
|
||||
$this->addSql('DROP INDEX IDX_69C327F2CC22AD4 ON weekly_schedules');
|
||||
$this->addSql('DROP INDEX idx_weekly_schedules_doctor_clinic ON weekly_schedules');
|
||||
$this->addSql('ALTER TABLE weekly_schedules DROP clinic_key');
|
||||
$this->addSql('ALTER TABLE weekly_schedules DROP clinic_id');
|
||||
$this->addSql('ALTER TABLE weekly_schedules DROP INDEX IDX_69C327F287F4FB17, ADD UNIQUE INDEX idx_weekly_schedules_doctor (doctor_id)');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
<?php
|
||||
|
||||
namespace App\Appointment\Command;
|
||||
|
||||
use App\Appointment\Repository\WeeklyScheduleRepository;
|
||||
use App\Clinic\Repository\ClinicRepository;
|
||||
use App\Doctor\Repository\DoctorAddressRepository;
|
||||
use App\Doctor\Repository\DoctorRepository;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Component\Console\Attribute\AsCommand;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||
|
||||
/**
|
||||
* Moves an existing weekly schedule from the personal context into a clinic.
|
||||
*
|
||||
* The clinic_id migration marks every pre-existing schedule as personal, because
|
||||
* nothing in the data says otherwise. A schedule whose sessions actually point at
|
||||
* a clinic address needs to be moved by hand — this command does that, and refuses
|
||||
* when the sessions do not agree with the target clinic.
|
||||
*/
|
||||
#[AsCommand(name: 'app:schedule:assign-clinic', description: 'Move a doctor\'s personal weekly schedule into a clinic context')]
|
||||
class AssignScheduleClinicCommand extends Command
|
||||
{
|
||||
public function __construct(
|
||||
private readonly WeeklyScheduleRepository $scheduleRepo,
|
||||
private readonly DoctorRepository $doctorRepo,
|
||||
private readonly ClinicRepository $clinicRepo,
|
||||
private readonly DoctorAddressRepository $addressRepo,
|
||||
private readonly EntityManagerInterface $em,
|
||||
) {
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
protected function configure(): void
|
||||
{
|
||||
$this
|
||||
->addArgument('doctor-uuid', InputArgument::REQUIRED, 'Doctor uuid')
|
||||
->addArgument('clinic-uuid', InputArgument::REQUIRED, 'Target clinic uuid')
|
||||
->addOption('force', null, InputOption::VALUE_NONE, 'Move even when some sessions use an address outside the clinic');
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
$io = new SymfonyStyle($input, $output);
|
||||
|
||||
$doctor = $this->doctorRepo->findByUuid((string) $input->getArgument('doctor-uuid'));
|
||||
$clinic = $this->clinicRepo->findByUuid((string) $input->getArgument('clinic-uuid'));
|
||||
|
||||
if ($doctor === null || $clinic === null) {
|
||||
$io->error('Doctor or clinic not found.');
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
if (!$clinic->hasDoctor($doctor)) {
|
||||
$io->error('This doctor is not a member of that clinic.');
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, null);
|
||||
if ($schedule === null) {
|
||||
$io->warning('This doctor has no personal schedule to move.');
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
if ($this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic) !== null) {
|
||||
$io->error('A schedule already exists for this doctor in that clinic; merge it manually.');
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$foreign = $this->sessionsOutsideClinic($schedule->getDaySchedule(), $doctor, $clinic->getId());
|
||||
if ($foreign !== [] && !$input->getOption('force')) {
|
||||
$io->error(sprintf(
|
||||
'Sessions use address ids outside the clinic: %s. Re-run with --force to move anyway.',
|
||||
implode(', ', $foreign)
|
||||
));
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$schedule->setClinic($clinic);
|
||||
$this->em->flush();
|
||||
|
||||
$io->success(sprintf('Schedule %s moved to clinic "%s".', $schedule->getUuid(), $clinic->getName()));
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
/** @return int[] address ids referenced by the schedule that the clinic does not own */
|
||||
private function sessionsOutsideClinic(array $daySchedule, \App\Doctor\Entity\Doctor $doctor, int $clinicId): array
|
||||
{
|
||||
$owned = [];
|
||||
foreach ($this->addressRepo->findForContext($doctor, $clinicId) as $address) {
|
||||
$owned[(int) $address->getId()] = true;
|
||||
}
|
||||
|
||||
$foreign = [];
|
||||
foreach ($daySchedule as $day) {
|
||||
foreach (($day['sessions'] ?? []) as $session) {
|
||||
$id = (int) ($session['location_id'] ?? 0);
|
||||
if ($id > 0 && !isset($owned[$id])) {
|
||||
$foreign[$id] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return array_keys($foreign);
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ use App\Appointment\Repository\AppointmentRepository;
|
||||
use App\Appointment\Repository\SlotTakenException;
|
||||
use App\Appointment\Repository\WeeklyScheduleRepository;
|
||||
use App\Appointment\Service\SlotCalculatorService;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use App\Auth\Entity\User;
|
||||
use App\Doctor\Repository\DoctorRepository;
|
||||
@@ -32,6 +33,8 @@ class AppointmentController extends BaseController
|
||||
private readonly SlotCalculatorService $slotCalculator,
|
||||
private readonly PatientService $patientService,
|
||||
private readonly WeeklyScheduleRepository $scheduleRepo,
|
||||
private readonly \App\Clinic\Repository\ClinicRepository $clinicRepo,
|
||||
private readonly \App\Doctor\Repository\DoctorAddressRepository $addressRepo,
|
||||
private readonly \App\Representation\Service\DomainContextResolver $domainResolver,
|
||||
private readonly \App\ClinicService\Repository\ServiceSectionRepository $sectionRepo,
|
||||
private readonly \App\ClinicService\Repository\ServiceItemRepository $itemRepo,
|
||||
@@ -153,10 +156,12 @@ class AppointmentController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'فرمت تاریخ نادرست است (Y-m-d)', 422, 'date');
|
||||
}
|
||||
|
||||
$sessions = $this->slotCalculator->getAllSlotsWithAvailability($doctor, $date);
|
||||
$clinic = $this->bookingClinic($doctor, $request->query->get('clinic_uuid'));
|
||||
$sessions = $this->slotCalculator->getAllSlotsWithAvailability($doctor, $date, $clinic);
|
||||
|
||||
return $this->success([
|
||||
'doctor_uuid' => $doctorUuid,
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'date' => $date,
|
||||
'sessions' => $sessions,
|
||||
]);
|
||||
@@ -182,7 +187,8 @@ class AppointmentController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'فرمت تاریخ نادرست است (Y-m-d)', 422, 'date');
|
||||
}
|
||||
|
||||
$schedule = $this->scheduleRepo->findByDoctor($doctor);
|
||||
$clinic = $this->bookingClinic($doctor, $request->query->get('clinic_uuid'));
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
$mode = ($schedule ? $schedule->getMeta() : WeeklySchedule::DEFAULT_META)['booking_mode'] ?? WeeklySchedule::MODE_SLOT;
|
||||
if ($mode !== WeeklySchedule::MODE_SERVICE) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'این پزشک در حالت نوبتدهی سرویسی نیست', 422);
|
||||
@@ -221,7 +227,8 @@ class AppointmentController extends BaseController
|
||||
'date' => $date,
|
||||
'total_duration_minutes' => $totalMinutes,
|
||||
'buffer_minutes' => (int) $meta['buffer_minutes'],
|
||||
'start_times' => $this->slotCalculator->getServiceStartTimes($doctor, $date, $totalMinutes),
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'start_times' => $this->slotCalculator->getServiceStartTimes($doctor, $date, $totalMinutes, $clinic),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -232,32 +239,68 @@ class AppointmentController extends BaseController
|
||||
* GET /api/v1/appointment-booking-services/{doctorUuid}
|
||||
*/
|
||||
#[Route('/api/v1/appointment-booking-services/{doctorUuid}', methods: ['GET'])]
|
||||
public function bookingServices(string $doctorUuid): JsonResponse
|
||||
public function bookingServices(string $doctorUuid, Request $request): JsonResponse
|
||||
{
|
||||
$doctor = $this->doctorRepo->findByUuid($doctorUuid);
|
||||
if ($doctor === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
$schedule = $this->scheduleRepo->findByDoctor($doctor);
|
||||
$clinic = $this->bookingClinic($doctor, $request->query->get('clinic_uuid'));
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
$meta = $schedule ? $schedule->getMeta() : WeeklySchedule::DEFAULT_META;
|
||||
|
||||
$services = array_map(function (\App\ClinicService\Entity\ServiceItem $i) {
|
||||
$section = $i->getSection();
|
||||
return [
|
||||
'uuid' => $i->getUuid(),
|
||||
'name' => $i->getName(),
|
||||
'duration_minutes' => $i->getDurationMinutes(),
|
||||
'price_rials' => $i->getPriceRials(),
|
||||
'service_section' => ['uuid' => $section->getUuid(), 'name' => $section->getName()],
|
||||
];
|
||||
}, $this->itemRepo->findBookableByEntity('doctor', $doctor->getId()));
|
||||
|
||||
return $this->success([
|
||||
'doctor_uuid' => $doctorUuid,
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'booking_mode' => $meta['booking_mode'],
|
||||
'buffer_minutes' => (int) $meta['buffer_minutes'],
|
||||
'services' => $services,
|
||||
'services' => $this->bookableServices($doctor, $clinic),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* عمومی: همهٔ محلهای نوبتدهی یک پزشک — مطب شخصی و هر کلینیکی که در آن برنامهٔ
|
||||
* فعال دارد. سایت باید همه را نشان دهد؛ انتخاب یکی و پنهانکردن بقیه یعنی حذف
|
||||
* بخشی از ظرفیت واقعی پزشک.
|
||||
*
|
||||
* GET /api/v1/appointment-booking-locations/{doctorUuid}
|
||||
*/
|
||||
#[Route('/api/v1/appointment-booking-locations/{doctorUuid}', methods: ['GET'])]
|
||||
public function bookingLocations(string $doctorUuid): JsonResponse
|
||||
{
|
||||
$doctor = $this->doctorRepo->findByUuid($doctorUuid);
|
||||
if ($doctor === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
$locations = [];
|
||||
foreach ($this->scheduleRepo->findAllByDoctor($doctor) as $schedule) {
|
||||
$clinic = $schedule->getClinic();
|
||||
$meta = $schedule->getMeta();
|
||||
$address = $this->addressRepo->findForContext($doctor, $clinic?->getId())[0] ?? null;
|
||||
|
||||
$locations[] = [
|
||||
'location_uuid' => $address?->getUuid(),
|
||||
'type' => $clinic === null ? 'personal' : 'clinic',
|
||||
'title' => $clinic?->getName() ?? ($address?->getName() ?: 'مطب شخصی'),
|
||||
'address' => $address?->getAddress(),
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'booking_mode' => $meta['booking_mode'],
|
||||
'buffer_minutes' => (int) $meta['buffer_minutes'],
|
||||
'services' => $meta['booking_mode'] === WeeklySchedule::MODE_SERVICE
|
||||
? $this->bookableServices($doctor, $clinic)
|
||||
: [],
|
||||
'next_available_at' => $this->nextAvailableAt($doctor, $clinic),
|
||||
];
|
||||
}
|
||||
|
||||
// پیشفرضِ سایت = زودترین نوبت آزاد؛ محلهای بدون ظرفیت به انتها میروند.
|
||||
usort($locations, fn(array $a, array $b) => ($a['next_available_at'] ?? PHP_INT_MAX) <=> ($b['next_available_at'] ?? PHP_INT_MAX));
|
||||
|
||||
return $this->success([
|
||||
'doctor_uuid' => $doctorUuid,
|
||||
'booking_locations' => $locations,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -275,24 +318,26 @@ class AppointmentController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'سال یا ماه نامعتبر است', 422, 'month');
|
||||
}
|
||||
|
||||
$clinic = $this->bookingClinic($doctor, $request->query->get('clinic_uuid'));
|
||||
$daysInMonth = (int) date('t', (int) strtotime(sprintf('%04d-%02d-01', $year, $month)));
|
||||
|
||||
$disabled = [];
|
||||
$enabled = [];
|
||||
for ($day = 1; $day <= $daysInMonth; $day++) {
|
||||
$date = sprintf('%04d-%02d-%02d', $year, $month, $day);
|
||||
if ($this->slotCalculator->hasAnyAvailability($doctor, $date)) {
|
||||
if ($this->slotCalculator->hasAnyAvailability($doctor, $date, $clinic)) {
|
||||
$enabled[] = $date;
|
||||
} else {
|
||||
$disabled[] = $date;
|
||||
}
|
||||
}
|
||||
|
||||
$schedule = $this->scheduleRepo->findByDoctor($doctor);
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
$meta = $schedule ? $schedule->getMeta() : WeeklySchedule::DEFAULT_META;
|
||||
|
||||
return $this->success([
|
||||
'year' => $year,
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'month' => $month,
|
||||
'disabled_dates' => $disabled,
|
||||
'enabled_dates' => $enabled,
|
||||
@@ -348,6 +393,7 @@ class AppointmentController extends BaseController
|
||||
$doctorUuid = trim($data['doctor_uuid'] ?? '');
|
||||
$slotStart = (int) ($data['slot_start'] ?? 0);
|
||||
$slotEnd = (int) ($data['slot_end'] ?? 0);
|
||||
$clinicUuid = $data['clinic_uuid'] ?? null;
|
||||
|
||||
// حالت نوبتدهی سرویسی: مدت نوبت = مجموع مدت سرویسهای bookableِ انتخابشده،
|
||||
// و slot_end سمت سرور محاسبه میشود (به مقدار کلاینت اعتماد نمیشود).
|
||||
@@ -385,6 +431,14 @@ class AppointmentController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
$bookingClinic = $this->bookingClinic($doctor, $clinicUuid);
|
||||
|
||||
// سرویس باید متعلق به همان محلی باشد که نوبت در آن ثبت میشود؛ وگرنه بیمار
|
||||
// میتوانست سرویس کلینیک را روی نوبت مطب شخصی بنشاند.
|
||||
if ($serviceItem !== null && ($err = $this->assertServicesMatchContext($serviceUuids, $doctor, $bookingClinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
$forSelf = (bool) ($data['for_self'] ?? true);
|
||||
|
||||
// کد ملی و جنسیت بیمار همیشه الزامی است (چه برای خود، چه برای دیگری).
|
||||
@@ -420,7 +474,7 @@ class AppointmentController extends BaseController
|
||||
}
|
||||
|
||||
// آدرس نوبت از روی session متناظر در برنامهی هفتگی تعیین میشود (location_id).
|
||||
$locationId = $this->resolveSlotLocationId($doctor, $slotStart);
|
||||
$locationId = $this->slotCalculator->resolveSlotLocationId($doctor, $slotStart, $bookingClinic);
|
||||
if ($locationId !== null) {
|
||||
$appointment->setAddressId($locationId);
|
||||
}
|
||||
@@ -610,11 +664,75 @@ class AppointmentController extends BaseController
|
||||
|| $user->hasRole('ROLE_ADMIN');
|
||||
}
|
||||
|
||||
private function resolveSlotLocationId(Doctor $doctor, int $slotStart): ?int
|
||||
/**
|
||||
* محلِ نوبتدهی این درخواست. بدون clinic_uuid یعنی مطب شخصی پزشک — نه «هر محلی
|
||||
* که پیدا شد»: با چند برنامهٔ همزمان، حدسزدن محل یعنی ثبت خاموشِ نوبت در جای
|
||||
* اشتباه.
|
||||
*/
|
||||
private function bookingClinic(Doctor $doctor, ?string $clinicUuid): ?Clinic
|
||||
{
|
||||
return $this->slotCalculator->resolveSlotLocationId($doctor, $slotStart);
|
||||
if ($clinicUuid === null || trim($clinicUuid) === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
$clinic = $this->clinicRepo->findByUuid(trim($clinicUuid));
|
||||
if ($clinic === null || !$clinic->hasDoctor($doctor)) {
|
||||
throw new \App\Shared\Exception\AppException(ErrorCodes::ERR_VALIDATION_002, 'محل نوبتدهی یافت نشد', 404);
|
||||
}
|
||||
|
||||
return $clinic;
|
||||
}
|
||||
|
||||
private function assertServicesMatchContext(array $serviceUuids, Doctor $doctor, ?Clinic $clinic): ?JsonResponse
|
||||
{
|
||||
[$type, $id] = $clinic !== null
|
||||
? ['clinic', $clinic->getId()]
|
||||
: ['doctor', $doctor->getId()];
|
||||
|
||||
foreach ($serviceUuids as $uuid) {
|
||||
$section = $this->itemRepo->findByUuid($uuid)?->getSection();
|
||||
if ($section === null || $section->getEntityType() !== $type || $section->getEntityId() !== $id) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'سرویس انتخابشده به این محل نوبتدهی تعلق ندارد', 422, 'service_item_uuids');
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/** @return array<int, array<string, mixed>> */
|
||||
private function bookableServices(Doctor $doctor, ?Clinic $clinic): array
|
||||
{
|
||||
[$type, $id] = $clinic !== null
|
||||
? ['clinic', $clinic->getId()]
|
||||
: ['doctor', $doctor->getId()];
|
||||
|
||||
return array_map(function (\App\ClinicService\Entity\ServiceItem $i): array {
|
||||
$section = $i->getSection();
|
||||
return [
|
||||
'uuid' => $i->getUuid(),
|
||||
'name' => $i->getName(),
|
||||
'duration_minutes' => $i->getDurationMinutes(),
|
||||
'price_rials' => $i->getPriceRials(),
|
||||
'service_section' => ['uuid' => $section->getUuid(), 'name' => $section->getName()],
|
||||
];
|
||||
}, $this->itemRepo->findBookableByEntity($type, $id));
|
||||
}
|
||||
|
||||
/** زودترین اسلات آزاد در ۳۰ روز آینده، یا null اگر ظرفیتی نباشد. */
|
||||
private function nextAvailableAt(Doctor $doctor, ?Clinic $clinic): ?int
|
||||
{
|
||||
for ($i = 0; $i < 30; $i++) {
|
||||
$date = date('Y-m-d', strtotime("today +{$i} day"));
|
||||
$slots = $this->slotCalculator->getAvailableSlots($doctor, $date, $clinic);
|
||||
if (!empty($slots)) {
|
||||
return (int) $slots[0]['start'];
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
#[OA\Patch(
|
||||
path: '/api/v1/appointment/{uuid}/status',
|
||||
summary: 'Update the status of an appointment',
|
||||
|
||||
@@ -11,11 +11,14 @@ use App\Appointment\Repository\WeeklyScheduleRepository;
|
||||
use App\Auth\Entity\User;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Clinic\Repository\ClinicRepository;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use App\Doctor\Entity\DoctorAddress;
|
||||
use App\Doctor\Repository\DoctorAddressRepository;
|
||||
use App\Doctor\Repository\DoctorRepository;
|
||||
use App\Shared\Constant\ErrorCodes;
|
||||
use App\Shared\Context\EntityContext;
|
||||
use App\Shared\Controller\BaseController;
|
||||
use App\Shared\Exception\AppException;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
@@ -39,12 +42,9 @@ class AppointmentSettingsController extends BaseController
|
||||
) {}
|
||||
|
||||
/**
|
||||
* در حالت نوبتدهی سرویسی، پزشک باید حداقل یک سرویسِ «نمایش در نوبتدهی»
|
||||
* (bookable) داشته باشد؛ وگرنه هیچ نوبتی قابلمحاسبه نیست.
|
||||
*/
|
||||
/**
|
||||
* نوع نوبتدهی پس از اولین ثبت غیرقابلتغییر است. اگر قبلاً mode ذخیره شده بود
|
||||
* ($prevMode !== null) و meta جدید آن را تغییر دهد، خطای 422 برمیگرداند.
|
||||
* نوع نوبتدهی پس از اولین ثبت غیرقابلتغییر است — اما فقط داخل همان context.
|
||||
* پزشکی که در مطب شخصی نوبتدهی اسلاتی دارد، همچنان میتواند در کلینیک سرویسی
|
||||
* انتخاب کند.
|
||||
*/
|
||||
private function assertModeImmutable(?string $prevMode, array $newMeta): ?JsonResponse
|
||||
{
|
||||
@@ -54,10 +54,56 @@ class AppointmentSettingsController extends BaseController
|
||||
return null;
|
||||
}
|
||||
|
||||
private function serviceModeHasNoBookable(array $meta, \App\Doctor\Entity\Doctor $doctor): bool
|
||||
/**
|
||||
* در حالت نوبتدهی سرویسی، صاحبِ همین context باید حداقل یک سرویسِ
|
||||
* «نمایش در نوبتدهی» داشته باشد؛ وگرنه هیچ نوبتی قابلمحاسبه نیست.
|
||||
*
|
||||
* سرویسها polymorphicاند و بین پزشک و کلینیک مشترک نمیشوند، پس شمارش باید با
|
||||
* همان (entity_type, entity_id) محیط انجام شود — نه همیشه 'doctor'.
|
||||
*/
|
||||
private function serviceModeHasNoBookable(array $meta, Doctor $doctor, ?Clinic $clinic): bool
|
||||
{
|
||||
return ($meta['booking_mode'] ?? WeeklySchedule::MODE_SLOT) === WeeklySchedule::MODE_SERVICE
|
||||
&& $this->itemRepo->countBookableByEntity('doctor', $doctor->getId()) === 0;
|
||||
if (($meta['booking_mode'] ?? WeeklySchedule::MODE_SLOT) !== WeeklySchedule::MODE_SERVICE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
[$type, $id] = $clinic !== null
|
||||
? [EntityContext::TYPE_CLINIC, $clinic->getId()]
|
||||
: [EntityContext::TYPE_DOCTOR, $doctor->getId()];
|
||||
|
||||
return $this->itemRepo->countBookableByEntity($type, $id) === 0;
|
||||
}
|
||||
|
||||
private function noBookableServiceError(?Clinic $clinic): JsonResponse
|
||||
{
|
||||
$message = $clinic !== null
|
||||
? 'برای نوبتدهی سرویسی، کلینیک باید حداقل یک سرویس با «نمایش در نوبتدهی» داشته باشد'
|
||||
: 'برای نوبتدهی سرویسی حداقل یک سرویس با «نمایش در نوبتدهی» لازم است';
|
||||
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, $message, 422, 'booking_mode');
|
||||
}
|
||||
|
||||
/**
|
||||
* محیطی که این درخواست در آن اجرا میشود: کلینیکِ دادهشده، یا null یعنی مطب
|
||||
* شخصی پزشک. پزشک حتماً باید عضو آن کلینیک باشد، وگرنه اصلاً چنین محیطی وجود
|
||||
* ندارد.
|
||||
*/
|
||||
private function contextClinic(?string $clinicUuid, Doctor $doctor): ?Clinic
|
||||
{
|
||||
if ($clinicUuid === null || trim($clinicUuid) === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
$clinic = $this->clinicRepo->findByUuid(trim($clinicUuid));
|
||||
if ($clinic === null) {
|
||||
throw new AppException(ErrorCodes::ERR_VALIDATION_002, 'کلینیک یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (!$clinic->hasDoctor($doctor)) {
|
||||
throw new AppException(ErrorCodes::ERR_VALIDATION_001, 'این پزشک عضو کلینیک انتخابشده نیست', 422);
|
||||
}
|
||||
|
||||
return $clinic;
|
||||
}
|
||||
|
||||
// ── Weekly Schedule ───────────────────────────────────────────────────────
|
||||
@@ -73,21 +119,23 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'update')) !== null) {
|
||||
$clinic = $this->contextClinic($data['clinic_uuid'] ?? null, $doctor);
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'update', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
if (($err = $this->validateSessionsHaveLocation($data['schedule'] ?? [])) !== null) {
|
||||
if (($err = $this->validateSessions($data['schedule'] ?? [], $doctor, $clinic)) !== null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, $err, 422);
|
||||
}
|
||||
|
||||
// Only one schedule per doctor — upsert
|
||||
$schedule = $this->scheduleRepo->findByDoctor($doctor);
|
||||
// یک برنامه به ازای هر context — upsert
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
$prevMode = $schedule?->getStoredBookingMode();
|
||||
if ($schedule !== null) {
|
||||
$schedule->setSetting($data['schedule'] ?? []);
|
||||
} else {
|
||||
$schedule = new WeeklySchedule($doctor, $data['schedule'] ?? []);
|
||||
$schedule = new WeeklySchedule($doctor, $data['schedule'] ?? [], $clinic);
|
||||
}
|
||||
|
||||
if (isset($data['meta']) && is_array($data['meta'])) {
|
||||
@@ -98,8 +146,8 @@ class AppointmentSettingsController extends BaseController
|
||||
return $err;
|
||||
}
|
||||
|
||||
if ($this->serviceModeHasNoBookable($schedule->getMeta(), $doctor)) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'برای نوبتدهی سرویسی حداقل یک سرویس با «نمایش در نوبتدهی» لازم است', 422, 'booking_mode');
|
||||
if ($this->serviceModeHasNoBookable($schedule->getMeta(), $doctor, $clinic)) {
|
||||
return $this->noBookableServiceError($clinic);
|
||||
}
|
||||
|
||||
$this->scheduleRepo->save($schedule);
|
||||
@@ -110,25 +158,32 @@ class AppointmentSettingsController extends BaseController
|
||||
#[Route('/api/v1/appointment-settings/weekly-schedule/{uuid}', methods: ['PATCH'])]
|
||||
public function updateSchedule(string $uuid, Request $request, #[CurrentUser] User $user): JsonResponse
|
||||
{
|
||||
$data = json_decode($request->getContent(), true) ?? [];
|
||||
|
||||
// uuid may be doctor uuid or schedule uuid
|
||||
$schedule = $this->scheduleRepo->findByUuid($uuid);
|
||||
if ($schedule === null) {
|
||||
$doctor = $this->doctorRepo->findByUuid($uuid);
|
||||
$schedule = $doctor ? $this->scheduleRepo->findByDoctor($doctor) : null;
|
||||
$doctor = $this->doctorRepo->findByUuid($uuid);
|
||||
if ($doctor === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'برنامه یافت نشد', 404);
|
||||
}
|
||||
$clinic = $this->contextClinic($data['clinic_uuid'] ?? $request->query->get('clinic_uuid'), $doctor);
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
} else {
|
||||
$clinic = $schedule->getClinic();
|
||||
}
|
||||
|
||||
if ($schedule === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'برنامه یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($schedule->getDoctor(), $user, 'update')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($schedule->getDoctor(), $user, 'update', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
$prevMode = $schedule->getStoredBookingMode();
|
||||
$data = json_decode($request->getContent(), true) ?? [];
|
||||
if (isset($data['schedule'])) {
|
||||
if (($err = $this->validateSessionsHaveLocation($data['schedule'])) !== null) {
|
||||
if (($err = $this->validateSessions($data['schedule'], $schedule->getDoctor(), $clinic)) !== null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, $err, 422);
|
||||
}
|
||||
$schedule->setSetting($data['schedule']);
|
||||
@@ -141,8 +196,8 @@ class AppointmentSettingsController extends BaseController
|
||||
return $err;
|
||||
}
|
||||
|
||||
if ($this->serviceModeHasNoBookable($schedule->getMeta(), $schedule->getDoctor())) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'برای نوبتدهی سرویسی حداقل یک سرویس با «نمایش در نوبتدهی» لازم است', 422, 'booking_mode');
|
||||
if ($this->serviceModeHasNoBookable($schedule->getMeta(), $schedule->getDoctor(), $clinic)) {
|
||||
return $this->noBookableServiceError($clinic);
|
||||
}
|
||||
|
||||
$this->scheduleRepo->save($schedule);
|
||||
@@ -151,19 +206,23 @@ class AppointmentSettingsController extends BaseController
|
||||
}
|
||||
|
||||
#[Route('/api/v1/appointment-settings/weekly-schedule/{uuid}', methods: ['GET'])]
|
||||
public function getSchedule(string $uuid, #[CurrentUser] User $user): JsonResponse
|
||||
public function getSchedule(string $uuid, Request $request, #[CurrentUser] User $user): JsonResponse
|
||||
{
|
||||
// Try doctor uuid first, then schedule uuid
|
||||
$doctor = $this->doctorRepo->findByUuid($uuid);
|
||||
$schedule = $doctor
|
||||
? $this->scheduleRepo->findByDoctor($doctor)
|
||||
: $this->scheduleRepo->findByUuid($uuid);
|
||||
$doctor = $this->doctorRepo->findByUuid($uuid);
|
||||
if ($doctor !== null) {
|
||||
$clinic = $this->contextClinic($request->query->get('clinic_uuid'), $doctor);
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
} else {
|
||||
$schedule = $this->scheduleRepo->findByUuid($uuid);
|
||||
$clinic = $schedule?->getClinic();
|
||||
}
|
||||
|
||||
if ($schedule === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'برنامه یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($schedule->getDoctor(), $user, 'view')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($schedule->getDoctor(), $user, 'view', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -178,7 +237,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'برنامه یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($schedule->getDoctor(), $user, 'update')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($schedule->getDoctor(), $user, 'update', $schedule->getClinic())) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -190,20 +249,22 @@ class AppointmentSettingsController extends BaseController
|
||||
// ── Date Overrides ────────────────────────────────────────────────────────
|
||||
|
||||
#[Route('/api/v1/appointment-settings/date-override/list/{doctorUuid}', methods: ['GET'])]
|
||||
public function listOverrides(string $doctorUuid, #[CurrentUser] User $user): JsonResponse
|
||||
public function listOverrides(string $doctorUuid, Request $request, #[CurrentUser] User $user): JsonResponse
|
||||
{
|
||||
$doctor = $this->doctorRepo->findByUuid($doctorUuid);
|
||||
if ($doctor === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'view')) !== null) {
|
||||
$clinic = $this->contextClinic($request->query->get('clinic_uuid'), $doctor);
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'view', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
$overrides = array_map(
|
||||
fn(DateOverride $o) => $o->toArray(),
|
||||
$this->overrideRepo->findByDoctor($doctor)
|
||||
$this->overrideRepo->findByDoctorAndClinic($doctor, $clinic)
|
||||
);
|
||||
|
||||
return $this->success(['data' => $overrides]);
|
||||
@@ -221,7 +282,9 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'update')) !== null) {
|
||||
$clinic = $this->contextClinic($data['clinic_uuid'] ?? null, $doctor);
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'update', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -230,7 +293,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'فرمت تاریخ نادرست است', 422, 'date');
|
||||
}
|
||||
|
||||
$override = new DateOverride($doctor, $timestamp, (bool) ($data['active'] ?? false));
|
||||
$override = new DateOverride($doctor, $timestamp, (bool) ($data['active'] ?? false), $clinic);
|
||||
if (isset($data['reason'])) $override->setReason($data['reason']);
|
||||
if (isset($data['custom_slots'])) $override->setSetting($data['custom_slots']);
|
||||
|
||||
@@ -247,7 +310,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'Override یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($override->getDoctor(), $user, 'update')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($override->getDoctor(), $user, 'update', $override->getClinic())) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -273,7 +336,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'Override یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($override->getDoctor(), $user, 'update')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($override->getDoctor(), $user, 'update', $override->getClinic())) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -290,7 +353,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'Override یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($override->getDoctor(), $user, 'view')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($override->getDoctor(), $user, 'view', $override->getClinic())) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -300,18 +363,26 @@ class AppointmentSettingsController extends BaseController
|
||||
// ── Holidays ──────────────────────────────────────────────────────────────
|
||||
|
||||
#[Route('/api/v1/appointment-settings/holidays/list/{doctorUuid}', methods: ['GET'])]
|
||||
public function listHolidays(string $doctorUuid, #[CurrentUser] User $user): JsonResponse
|
||||
public function listHolidays(string $doctorUuid, Request $request, #[CurrentUser] User $user): JsonResponse
|
||||
{
|
||||
$doctor = $this->doctorRepo->findByUuid($doctorUuid);
|
||||
if ($doctor === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'view')) !== null) {
|
||||
$clinic = $this->contextClinic($request->query->get('clinic_uuid'), $doctor);
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'view', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
$items = array_map(fn(Holiday $h) => $h->toArray(), $this->holidayRepo->findAllByDoctor($doctor));
|
||||
// محیط کلینیک تعطیلی سراسری پزشک را هم میبیند (باید بداند پزشک نیست)، اما
|
||||
// editable=false یعنی اجازهٔ تغییرش را ندارد.
|
||||
$items = array_map(function (Holiday $h) use ($clinic): array {
|
||||
$data = $h->toArray();
|
||||
$data['editable'] = $clinic === null || $h->getClinic() !== null;
|
||||
return $data;
|
||||
}, $this->holidayRepo->findAllByDoctorInContext($doctor, $clinic));
|
||||
|
||||
return $this->success(['data' => $items]);
|
||||
}
|
||||
@@ -324,7 +395,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'تعطیلات یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($holiday->getDoctor(), $user, 'update')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($holiday->getDoctor(), $user, 'update', $holiday->getClinic())) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -346,10 +417,18 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'update')) !== null) {
|
||||
$clinic = $this->contextClinic($data['clinic_uuid'] ?? null, $doctor);
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'update', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
// تعطیلی سراسری (بدون clinic_uuid) یعنی «پزشک در هیچ محلی نیست» و مطب شخصی
|
||||
// را هم میبندد؛ فقط خود پزشک یا ادمین حق چنین کاری دارد.
|
||||
if ($clinic === null && !$user->hasRole('ROLE_ADMIN') && $doctor->getUser()->getId() !== $user->getId()) {
|
||||
return $this->error(ErrorCodes::ERR_ACCESS_DENIED, 'کلینیک فقط میتواند تعطیلی مخصوص خودش را ثبت کند', 403, 'clinic_uuid');
|
||||
}
|
||||
|
||||
$startTs = strtotime($startStr);
|
||||
$endTs = strtotime($endStr);
|
||||
|
||||
@@ -357,7 +436,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'تاریخ نادرست است', 422);
|
||||
}
|
||||
|
||||
$holiday = new Holiday($doctor, $startTs, $endTs);
|
||||
$holiday = new Holiday($doctor, $startTs, $endTs, $clinic);
|
||||
if (isset($data['reason'])) $holiday->setReason($data['reason']);
|
||||
|
||||
$this->holidayRepo->save($holiday);
|
||||
@@ -373,7 +452,7 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'تعطیلات یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($holiday->getDoctor(), $user, 'update')) !== null) {
|
||||
if (($err = $this->denyDoctorAccess($holiday->getDoctor(), $user, 'update', $holiday->getClinic())) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
@@ -397,31 +476,23 @@ class AppointmentSettingsController extends BaseController
|
||||
// ── Available Locations ───────────────────────────────────────────────────
|
||||
|
||||
#[Route('/api/v1/appointment-settings/available-locations/{doctorUuid}', methods: ['GET'])]
|
||||
public function availableLocations(string $doctorUuid, #[CurrentUser] User $user): JsonResponse
|
||||
public function availableLocations(string $doctorUuid, Request $request, #[CurrentUser] User $user): JsonResponse
|
||||
{
|
||||
$doctor = $this->doctorRepo->findByUuid($doctorUuid);
|
||||
if ($doctor === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'view')) !== null) {
|
||||
$clinic = $this->contextClinic($request->query->get('clinic_uuid'), $doctor);
|
||||
|
||||
if (($err = $this->denyDoctorAccess($doctor, $user, 'view', $clinic)) !== null) {
|
||||
return $err;
|
||||
}
|
||||
|
||||
$clinics = $this->clinicRepo->findByDoctor($doctor);
|
||||
$clinicIds = array_map(fn(Clinic $c) => $c->getId(), $clinics);
|
||||
$clinicMap = [];
|
||||
foreach ($clinics as $clinic) {
|
||||
$clinicMap[$clinic->getId()] = $clinic->getName();
|
||||
}
|
||||
|
||||
$addresses = $this->addressRepo->findAvailableForDoctor($doctor, $clinicIds);
|
||||
|
||||
$result = array_map(function (DoctorAddress $a) use ($clinicMap): array {
|
||||
$data = $a->toArray();
|
||||
$data['clinic_name'] = $a->getClinicId() !== null ? ($clinicMap[$a->getClinicId()] ?? null) : null;
|
||||
return $data;
|
||||
}, $addresses);
|
||||
$result = array_map(
|
||||
fn(DoctorAddress $a): array => $a->toArray($clinic?->getName()),
|
||||
$this->addressRepo->findForContext($doctor, $clinic?->getId())
|
||||
);
|
||||
|
||||
return $this->success(['data' => $result]);
|
||||
}
|
||||
@@ -429,39 +500,57 @@ class AppointmentSettingsController extends BaseController
|
||||
/**
|
||||
* تنها نقطهٔ تصمیمگیری دربارهٔ «چه کسی تنظیمات نوبتدهی این پزشک را میبیند/مینویسد».
|
||||
*
|
||||
* مجاز: ادمین، خود پزشک، مالکِ کلینیکی که پزشک عضو آن است، و پزشکِ عضوِ همان
|
||||
* کلینیک در صورت داشتن مجوز appointment_settings مربوطه.
|
||||
* تصمیم به context وابسته است و نه فقط به شخص:
|
||||
* • مطب شخصی ($clinic === null) فقط برای خود پزشک و ادمین باز است — مالک کلینیک
|
||||
* هیچ کاری با برنامهٔ شخصی پزشک ندارد.
|
||||
* • محیط کلینیک با مجوز appointment_settings همان کلینیک سنجیده میشود، نه
|
||||
* حلقه روی همهٔ کلینیکهای پزشک.
|
||||
*
|
||||
* @param 'view'|'update' $action
|
||||
*/
|
||||
private function denyDoctorAccess(\App\Doctor\Entity\Doctor $doctor, User $user, string $action): ?JsonResponse
|
||||
private function denyDoctorAccess(Doctor $doctor, User $user, string $action, ?Clinic $clinic): ?JsonResponse
|
||||
{
|
||||
if ($user->hasRole('ROLE_ADMIN') || $doctor->getUser()->getId() === $user->getId()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
foreach ($this->clinicRepo->findByDoctor($doctor) as $clinic) {
|
||||
if ($this->permChecker->can($user, $clinic, 'appointment_settings', $action)) {
|
||||
return null;
|
||||
}
|
||||
if ($clinic !== null && $this->permChecker->can($user, $clinic, 'appointment_settings', $action)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return $this->error(ErrorCodes::ERR_AUTH_006, 'دسترسی ممنوع', 403);
|
||||
}
|
||||
|
||||
/**
|
||||
* هر session فعال در برنامهی هفتگی باید آدرس (location_id) داشته باشد.
|
||||
* در صورت نقص، پیام خطا برمیگرداند؛ در غیر این صورت null.
|
||||
* هر شیفت فعال باید آدرسی داشته باشد که به همین context تعلق دارد. بدون بررسی
|
||||
* دوم، کلینیک میتوانست شیفت را روی آدرس مطب شخصی پزشک بنشاند (و برعکس).
|
||||
*/
|
||||
private function validateSessionsHaveLocation(array $schedule): ?string
|
||||
private function validateSessions(array $schedule, Doctor $doctor, ?Clinic $clinic): ?string
|
||||
{
|
||||
$allowed = [];
|
||||
foreach ($this->addressRepo->findForContext($doctor, $clinic?->getId()) as $address) {
|
||||
$allowed[(string) $address->getId()] = true;
|
||||
}
|
||||
|
||||
foreach ($schedule as $day) {
|
||||
foreach (($day['sessions'] ?? []) as $session) {
|
||||
if (($session['active'] ?? false) && empty($session['location_id'])) {
|
||||
if (!($session['active'] ?? false)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$locationId = (string) ($session['location_id'] ?? '');
|
||||
if ($locationId === '') {
|
||||
return 'برای هر شیفت فعال باید آدرس (مطب/کلینیک) انتخاب شود';
|
||||
}
|
||||
|
||||
if (!isset($allowed[$locationId])) {
|
||||
return $clinic !== null
|
||||
? 'آدرس انتخابشده متعلق به این کلینیک نیست'
|
||||
: 'آدرس انتخابشده متعلق به مطب شخصی این پزشک نیست';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,14 +2,19 @@
|
||||
|
||||
namespace App\Appointment\Entity;
|
||||
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use App\Appointment\Repository\DateOverrideRepository;
|
||||
use Symfony\Component\Uid\Uuid;
|
||||
|
||||
/**
|
||||
* استثنای ساعت کاری یک روز خاص. چون خودِ ساعت کاری per-context است، استثنای آن هم
|
||||
* per-context است: clinic باید همان clinic برنامهٔ هفتگی متناظر باشد (NULL = شخصی).
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: DateOverrideRepository::class)]
|
||||
#[ORM\Table(name: 'date_overrides')]
|
||||
#[ORM\UniqueConstraint(name: 'uniq_date_override_doctor_date', columns: ['doctor_id', 'date'])]
|
||||
#[ORM\UniqueConstraint(name: 'uniq_date_override_doctor_clinic_date', columns: ['doctor_id', 'clinic_key', 'date'])]
|
||||
class DateOverride
|
||||
{
|
||||
#[ORM\Id]
|
||||
@@ -24,6 +29,15 @@ class DateOverride
|
||||
#[ORM\JoinColumn(name: 'doctor_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
|
||||
private Doctor $doctor;
|
||||
|
||||
/** NULL = مطب شخصی پزشک. */
|
||||
#[ORM\ManyToOne(targetEntity: Clinic::class)]
|
||||
#[ORM\JoinColumn(name: 'clinic_id', referencedColumnName: 'id', nullable: true, onDelete: 'CASCADE')]
|
||||
private ?Clinic $clinic = null;
|
||||
|
||||
/** ستون تولیدشده: IFNULL(clinic_id, 0) — تا یکتایی با clinic_id تهی هم برقرار بماند. */
|
||||
#[ORM\Column(name: 'clinic_key', type: 'integer', insertable: false, updatable: false, generated: 'ALWAYS', columnDefinition: 'INT AS (IFNULL(clinic_id, 0)) STORED')]
|
||||
private int $clinicKey = 0;
|
||||
|
||||
#[ORM\Column(type: 'integer')]
|
||||
private int $date;
|
||||
|
||||
@@ -42,10 +56,11 @@ class DateOverride
|
||||
#[ORM\Column(name: 'updated_at', type: 'integer')]
|
||||
private int $updatedAt;
|
||||
|
||||
public function __construct(Doctor $doctor, int $date, bool $active = false)
|
||||
public function __construct(Doctor $doctor, int $date, bool $active = false, ?Clinic $clinic = null)
|
||||
{
|
||||
$this->uuid = Uuid::v4()->toRfc4122();
|
||||
$this->doctor = $doctor;
|
||||
$this->clinic = $clinic;
|
||||
$this->date = $date;
|
||||
$this->active = $active;
|
||||
$this->createdAt = time();
|
||||
@@ -55,6 +70,7 @@ class DateOverride
|
||||
public function getId(): ?int { return $this->id; }
|
||||
public function getUuid(): string { return $this->uuid; }
|
||||
public function getDoctor(): Doctor { return $this->doctor; }
|
||||
public function getClinic(): ?Clinic { return $this->clinic; }
|
||||
public function getDate(): int { return $this->date; }
|
||||
public function isActive(): bool { return $this->active; }
|
||||
public function getSetting(): ?array { return $this->setting; }
|
||||
@@ -72,6 +88,8 @@ class DateOverride
|
||||
return [
|
||||
'uuid' => $this->uuid,
|
||||
'doctor_uuid' => $this->doctor->getUuid(),
|
||||
'clinic_uuid' => $this->clinic?->getUuid(),
|
||||
'context' => $this->clinic === null ? 'personal' : 'clinic',
|
||||
'date' => $this->date,
|
||||
'active' => $this->active,
|
||||
'reason' => $this->reason,
|
||||
|
||||
@@ -2,11 +2,17 @@
|
||||
|
||||
namespace App\Appointment\Entity;
|
||||
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use App\Appointment\Repository\HolidayRepository;
|
||||
use Symfony\Component\Uid\Uuid;
|
||||
|
||||
/**
|
||||
* تعطیلی پزشک. برخلاف WeeklySchedule و DateOverride، تعطیلی پیشفرضاً سراسری است:
|
||||
* «پزشک آن روز نیست» یک واقعیت فیزیکی است و همزمان روی مطب شخصی و همهٔ کلینیکها
|
||||
* اثر میگذارد (clinic = null). مقدار غیر-NULL یعنی پزشک فقط در همان کلینیک نیست.
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: HolidayRepository::class)]
|
||||
#[ORM\Table(name: 'holidays')]
|
||||
#[ORM\Index(columns: ['doctor_id', 'start_date', 'end_date'], name: 'idx_holidays_doctor_range')]
|
||||
@@ -24,6 +30,11 @@ class Holiday
|
||||
#[ORM\JoinColumn(name: 'doctor_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
|
||||
private Doctor $doctor;
|
||||
|
||||
/** NULL = پزشک در هیچ محلی نیست (همهٔ contextها). */
|
||||
#[ORM\ManyToOne(targetEntity: Clinic::class)]
|
||||
#[ORM\JoinColumn(name: 'clinic_id', referencedColumnName: 'id', nullable: true, onDelete: 'CASCADE')]
|
||||
private ?Clinic $clinic = null;
|
||||
|
||||
#[ORM\Column(name: 'start_date', type: 'integer')]
|
||||
private int $startDate;
|
||||
|
||||
@@ -42,10 +53,11 @@ class Holiday
|
||||
#[ORM\Column(name: 'updated_at', type: 'integer')]
|
||||
private int $updatedAt;
|
||||
|
||||
public function __construct(Doctor $doctor, int $startDate, int $endDate)
|
||||
public function __construct(Doctor $doctor, int $startDate, int $endDate, ?Clinic $clinic = null)
|
||||
{
|
||||
$this->uuid = Uuid::v4()->toRfc4122();
|
||||
$this->doctor = $doctor;
|
||||
$this->clinic = $clinic;
|
||||
$this->startDate = $startDate;
|
||||
$this->endDate = $endDate;
|
||||
$this->createdAt = time();
|
||||
@@ -55,6 +67,8 @@ class Holiday
|
||||
public function getId(): ?int { return $this->id; }
|
||||
public function getUuid(): string { return $this->uuid; }
|
||||
public function getDoctor(): Doctor { return $this->doctor; }
|
||||
public function getClinic(): ?Clinic { return $this->clinic; }
|
||||
public function isGlobal(): bool { return $this->clinic === null; }
|
||||
public function getStartDate(): int { return $this->startDate; }
|
||||
public function getEndDate(): int { return $this->endDate; }
|
||||
public function isActive(): bool { return $this->active; }
|
||||
@@ -72,6 +86,8 @@ class Holiday
|
||||
return [
|
||||
'uuid' => $this->uuid,
|
||||
'doctor_uuid' => $this->doctor->getUuid(),
|
||||
'clinic_uuid' => $this->clinic?->getUuid(),
|
||||
'scope' => $this->clinic === null ? 'global' : 'clinic',
|
||||
'start_date' => $this->startDate,
|
||||
'end_date' => $this->endDate,
|
||||
'active' => $this->active,
|
||||
|
||||
@@ -2,14 +2,22 @@
|
||||
|
||||
namespace App\Appointment\Entity;
|
||||
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use App\Appointment\Repository\WeeklyScheduleRepository;
|
||||
use Symfony\Component\Uid\Uuid;
|
||||
|
||||
/**
|
||||
* برنامهٔ هفتگی نوبتدهی یک پزشک در یک context مشخص.
|
||||
*
|
||||
* context با ستون clinic_id بیان میشود: NULL یعنی مطب شخصی پزشک، و مقدار غیر-NULL
|
||||
* یعنی همان پزشک در آن کلینیک. یک پزشک میتواند همزمان چند برنامه داشته باشد
|
||||
* (شخصی + یکی به ازای هر کلینیک) و این برنامهها کاملاً مستقلاند.
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: WeeklyScheduleRepository::class)]
|
||||
#[ORM\Table(name: 'weekly_schedules')]
|
||||
#[ORM\UniqueConstraint(name: 'idx_weekly_schedules_doctor', columns: ['doctor_id'])]
|
||||
#[ORM\UniqueConstraint(name: 'idx_weekly_schedules_doctor_clinic', columns: ['doctor_id', 'clinic_key'])]
|
||||
class WeeklySchedule
|
||||
{
|
||||
public const DAYS = ['saturday', 'sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday'];
|
||||
@@ -35,10 +43,25 @@ class WeeklySchedule
|
||||
#[ORM\Column(type: 'string', length: 36, unique: true)]
|
||||
private string $uuid;
|
||||
|
||||
#[ORM\OneToOne(targetEntity: Doctor::class)]
|
||||
#[ORM\ManyToOne(targetEntity: Doctor::class)]
|
||||
#[ORM\JoinColumn(name: 'doctor_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
|
||||
private Doctor $doctor;
|
||||
|
||||
/** NULL = مطب شخصی پزشک. */
|
||||
#[ORM\ManyToOne(targetEntity: Clinic::class)]
|
||||
#[ORM\JoinColumn(name: 'clinic_id', referencedColumnName: 'id', nullable: true, onDelete: 'CASCADE')]
|
||||
private ?Clinic $clinic = null;
|
||||
|
||||
/**
|
||||
* ستون تولیدشدهٔ پایگاهداده: IFNULL(clinic_id, 0).
|
||||
*
|
||||
* MySQL/MariaDB مقادیر NULL را در unique index متمایز میشمارند، پس
|
||||
* UNIQUE(doctor_id, clinic_id) جلوی دو برنامهٔ شخصی برای یک پزشک را نمیگرفت.
|
||||
* این ستون NULL را به 0 نگاشت میکند تا یکتایی در سطح دیتابیس تضمین شود.
|
||||
*/
|
||||
#[ORM\Column(name: 'clinic_key', type: 'integer', insertable: false, updatable: false, generated: 'ALWAYS', columnDefinition: 'INT AS (IFNULL(clinic_id, 0)) STORED')]
|
||||
private int $clinicKey = 0;
|
||||
|
||||
#[ORM\Column(type: 'json')]
|
||||
private array $setting = [];
|
||||
|
||||
@@ -48,10 +71,11 @@ class WeeklySchedule
|
||||
#[ORM\Column(name: 'updated_at', type: 'integer')]
|
||||
private int $updatedAt;
|
||||
|
||||
public function __construct(Doctor $doctor, array $setting)
|
||||
public function __construct(Doctor $doctor, array $setting, ?Clinic $clinic = null)
|
||||
{
|
||||
$this->uuid = Uuid::v4()->toRfc4122();
|
||||
$this->doctor = $doctor;
|
||||
$this->clinic = $clinic;
|
||||
$this->setting = $setting;
|
||||
$this->createdAt = time();
|
||||
$this->updatedAt = time();
|
||||
@@ -60,6 +84,15 @@ class WeeklySchedule
|
||||
public function getId(): ?int { return $this->id; }
|
||||
public function getUuid(): string { return $this->uuid; }
|
||||
public function getDoctor(): Doctor { return $this->doctor; }
|
||||
public function getClinic(): ?Clinic { return $this->clinic; }
|
||||
|
||||
/** فقط برای انتقال دستی برنامههای قدیمی به محیط کلینیک (app:schedule:assign-clinic). */
|
||||
public function setClinic(?Clinic $clinic): self
|
||||
{
|
||||
$this->clinic = $clinic;
|
||||
$this->updatedAt = time();
|
||||
return $this;
|
||||
}
|
||||
public function getSetting(): array { return $this->setting; }
|
||||
|
||||
public function setSetting(array $setting): self
|
||||
@@ -119,6 +152,8 @@ class WeeklySchedule
|
||||
return [
|
||||
'uuid' => $this->uuid,
|
||||
'doctor_uuid' => $this->doctor->getUuid(),
|
||||
'clinic_uuid' => $this->clinic?->getUuid(),
|
||||
'context' => $this->clinic === null ? 'personal' : 'clinic',
|
||||
'schedule' => $this->getDaySchedule(),
|
||||
'meta' => $this->getMeta(),
|
||||
// نوع نوبتدهی پس از اولین ثبت قفل میشود (پنل توگل را غیرفعال میکند).
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Appointment\Repository;
|
||||
|
||||
use App\Appointment\Entity\DateOverride;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
@@ -19,10 +20,32 @@ class DateOverrideRepository extends ServiceEntityRepository
|
||||
return $this->findOneBy(['uuid' => $uuid]);
|
||||
}
|
||||
|
||||
/**
|
||||
* استثناهای یک context. برخلاف تعطیلی، هیچ اجتماعی در کار نیست: استثنای کلینیک
|
||||
* فقط در همان کلینیک دیده میشود و استثنای شخصی فقط در مطب شخصی.
|
||||
*
|
||||
* @return DateOverride[]
|
||||
*/
|
||||
public function findByDoctorAndClinic(Doctor $doctor, ?Clinic $clinic): array
|
||||
{
|
||||
$qb = $this->createQueryBuilder('o')
|
||||
->where('o.doctor = :doctor')
|
||||
->setParameter('doctor', $doctor)
|
||||
->orderBy('o.date', 'ASC');
|
||||
|
||||
if ($clinic === null) {
|
||||
$qb->andWhere('o.clinic IS NULL');
|
||||
} else {
|
||||
$qb->andWhere('o.clinic = :clinic')->setParameter('clinic', $clinic);
|
||||
}
|
||||
|
||||
return $qb->getQuery()->getResult();
|
||||
}
|
||||
|
||||
/** @return DateOverride[] */
|
||||
public function findByDoctor(Doctor $doctor): array
|
||||
{
|
||||
return $this->findBy(['doctor' => $doctor], ['date' => 'ASC']);
|
||||
return $this->findByDoctorAndClinic($doctor, null);
|
||||
}
|
||||
|
||||
public function save(DateOverride $entity, bool $flush = true): void
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Appointment\Repository;
|
||||
|
||||
use App\Appointment\Entity\Holiday;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
@@ -30,19 +31,48 @@ class HolidayRepository extends ServiceEntityRepository
|
||||
->getResult();
|
||||
}
|
||||
|
||||
/** @return Holiday[] */
|
||||
public function findActiveByDoctor(Doctor $doctor, int $from, int $to): array
|
||||
/**
|
||||
* تعطیلیهای دیدهشده در یک context: اجتماع تعطیلیهای سراسری پزشک با
|
||||
* تعطیلیهای مخصوص همان کلینیک. $clinic === null یعنی مطب شخصی، که فقط
|
||||
* تعطیلی سراسری میبیند.
|
||||
*
|
||||
* @return Holiday[]
|
||||
*/
|
||||
public function findAllByDoctorInContext(Doctor $doctor, ?Clinic $clinic): array
|
||||
{
|
||||
return $this->createQueryBuilder('h')
|
||||
$qb = $this->createQueryBuilder('h')
|
||||
->where('h.doctor = :doctor')
|
||||
->setParameter('doctor', $doctor)
|
||||
->orderBy('h.startDate', 'DESC');
|
||||
|
||||
if ($clinic === null) {
|
||||
$qb->andWhere('h.clinic IS NULL');
|
||||
} else {
|
||||
$qb->andWhere('h.clinic IS NULL OR h.clinic = :clinic')->setParameter('clinic', $clinic);
|
||||
}
|
||||
|
||||
return $qb->getQuery()->getResult();
|
||||
}
|
||||
|
||||
/** @return Holiday[] */
|
||||
public function findActiveByDoctor(Doctor $doctor, int $from, int $to, ?Clinic $clinic = null): array
|
||||
{
|
||||
$qb = $this->createQueryBuilder('h')
|
||||
->where('h.doctor = :doctor')
|
||||
->andWhere('h.active = true')
|
||||
->andWhere('h.startDate <= :to')
|
||||
->andWhere('h.endDate >= :from')
|
||||
->setParameter('doctor', $doctor)
|
||||
->setParameter('from', $from)
|
||||
->setParameter('to', $to)
|
||||
->getQuery()
|
||||
->getResult();
|
||||
->setParameter('to', $to);
|
||||
|
||||
if ($clinic === null) {
|
||||
$qb->andWhere('h.clinic IS NULL');
|
||||
} else {
|
||||
$qb->andWhere('h.clinic IS NULL OR h.clinic = :clinic')->setParameter('clinic', $clinic);
|
||||
}
|
||||
|
||||
return $qb->getQuery()->getResult();
|
||||
}
|
||||
|
||||
public function save(Holiday $entity, bool $flush = true): void
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Appointment\Repository;
|
||||
|
||||
use App\Appointment\Entity\WeeklySchedule;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
@@ -14,9 +15,45 @@ class WeeklyScheduleRepository extends ServiceEntityRepository
|
||||
parent::__construct($registry, WeeklySchedule::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* برنامهٔ یک context مشخص. $clinic === null یعنی مطب شخصی.
|
||||
*
|
||||
* چون MySQL در unique index مقادیر NULL را متمایز میشمارد، یکتایی رکورد شخصی
|
||||
* را همین متد تضمین میکند: قبل از ساخت برنامهٔ جدید همیشه صدا زده میشود.
|
||||
*/
|
||||
public function findByDoctorAndClinic(Doctor $doctor, ?Clinic $clinic): ?WeeklySchedule
|
||||
{
|
||||
$qb = $this->createQueryBuilder('ws')
|
||||
->where('ws.doctor = :doctor')
|
||||
->setParameter('doctor', $doctor);
|
||||
|
||||
if ($clinic === null) {
|
||||
$qb->andWhere('ws.clinic IS NULL');
|
||||
} else {
|
||||
$qb->andWhere('ws.clinic = :clinic')->setParameter('clinic', $clinic);
|
||||
}
|
||||
|
||||
return $qb->setMaxResults(1)->getQuery()->getOneOrNullResult();
|
||||
}
|
||||
|
||||
/** همهٔ برنامههای پزشک در همهٔ contextها (شخصی + هر کلینیک). @return WeeklySchedule[] */
|
||||
public function findAllByDoctor(Doctor $doctor): array
|
||||
{
|
||||
return $this->createQueryBuilder('ws')
|
||||
->where('ws.doctor = :doctor')
|
||||
->setParameter('doctor', $doctor)
|
||||
->orderBy('ws.clinic', 'ASC')
|
||||
->getQuery()
|
||||
->getResult();
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated برنامهٔ context شخصی را برمیگرداند. برای کد جدید از
|
||||
* findByDoctorAndClinic() استفاده کن تا context صریح باشد.
|
||||
*/
|
||||
public function findByDoctor(Doctor $doctor): ?WeeklySchedule
|
||||
{
|
||||
return $this->findOneBy(['doctor' => $doctor]);
|
||||
return $this->findByDoctorAndClinic($doctor, null);
|
||||
}
|
||||
|
||||
/** @param Doctor[] $doctors @return WeeklySchedule[] */
|
||||
|
||||
@@ -7,6 +7,7 @@ use App\Appointment\Repository\DateOverrideRepository;
|
||||
use App\Appointment\Repository\HolidayRepository;
|
||||
use App\Appointment\Repository\WeeklyScheduleRepository;
|
||||
use App\Appointment\Entity\WeeklySchedule;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
|
||||
|
||||
@@ -25,9 +26,9 @@ class SlotCalculatorService
|
||||
*
|
||||
* @return array[] [{start, end, start_time, end_time, location_id}]
|
||||
*/
|
||||
public function getAvailableSlots(Doctor $doctor, string $date): array
|
||||
public function getAvailableSlots(Doctor $doctor, string $date, ?Clinic $clinic = null): array
|
||||
{
|
||||
$sessions = $this->buildAllSessions($doctor, $date);
|
||||
$sessions = $this->buildAllSessions($doctor, $date, $clinic);
|
||||
if (empty($sessions)) return [];
|
||||
$flat = array_merge(...array_map(fn($s) => $s['slots'], $sessions));
|
||||
return $this->filterBookedSlots($doctor, $flat);
|
||||
@@ -36,10 +37,10 @@ class SlotCalculatorService
|
||||
/**
|
||||
* آدرس (location_id) متناظر با اسلاتِ شروعشده در تاریخ مشخص. اگر پیدا نشد null.
|
||||
*/
|
||||
public function resolveSlotLocationId(Doctor $doctor, int $slotStart): ?int
|
||||
public function resolveSlotLocationId(Doctor $doctor, int $slotStart, ?Clinic $clinic = null): ?int
|
||||
{
|
||||
$date = date('Y-m-d', $slotStart);
|
||||
$sessions = $this->buildAllSessions($doctor, $date);
|
||||
$sessions = $this->buildAllSessions($doctor, $date, $clinic);
|
||||
foreach ($sessions as $session) {
|
||||
foreach (($session['slots'] ?? []) as $slot) {
|
||||
if ((int) ($slot['start'] ?? 0) === $slotStart) {
|
||||
@@ -57,9 +58,9 @@ class SlotCalculatorService
|
||||
*
|
||||
* @return array[] [{start_time, end_time, slots: [{start, end, start_time, end_time, location_id, is_available}]}]
|
||||
*/
|
||||
public function getAllSlotsWithAvailability(Doctor $doctor, string $date): array
|
||||
public function getAllSlotsWithAvailability(Doctor $doctor, string $date, ?Clinic $clinic = null): array
|
||||
{
|
||||
$sessions = $this->buildAllSessions($doctor, $date);
|
||||
$sessions = $this->buildAllSessions($doctor, $date, $clinic);
|
||||
$now = time();
|
||||
return array_map(fn(array $session) => [
|
||||
'start_time' => $session['start_time'],
|
||||
@@ -75,9 +76,9 @@ class SlotCalculatorService
|
||||
* Whether a doctor has at least one slot on the given date.
|
||||
* Lightweight check for the month-availability endpoint.
|
||||
*/
|
||||
public function hasAnyAvailability(Doctor $doctor, string $date): bool
|
||||
public function hasAnyAvailability(Doctor $doctor, string $date, ?Clinic $clinic = null): bool
|
||||
{
|
||||
return !empty($this->buildAllSessions($doctor, $date));
|
||||
return !empty($this->buildAllSessions($doctor, $date, $clinic));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -92,15 +93,15 @@ class SlotCalculatorService
|
||||
*
|
||||
* @return array<array{start:int,end:int,start_time:string,end_time:string,location_id:?int}>
|
||||
*/
|
||||
public function getServiceStartTimes(Doctor $doctor, string $date, int $durationMinutes): array
|
||||
public function getServiceStartTimes(Doctor $doctor, string $date, int $durationMinutes, ?Clinic $clinic = null): array
|
||||
{
|
||||
if ($durationMinutes <= 0) return [];
|
||||
|
||||
$buffer = (int)($this->getBookingMeta($doctor)['buffer_minutes'] ?? 0);
|
||||
$buffer = (int)($this->getBookingMeta($doctor, $clinic)['buffer_minutes'] ?? 0);
|
||||
$durSec = $durationMinutes * 60;
|
||||
$needSec = $durSec + $buffer * 60; // فضای لازم شامل بافر
|
||||
|
||||
$sessions = $this->buildAllSessions($doctor, $date); // window/holiday/override/booking-window رعایت میشود
|
||||
$sessions = $this->buildAllSessions($doctor, $date, $clinic); // window/holiday/override/booking-window رعایت میشود
|
||||
if (empty($sessions)) return [];
|
||||
|
||||
$dayStart = (int) strtotime($date . ' 00:00:00');
|
||||
@@ -152,14 +153,14 @@ class SlotCalculatorService
|
||||
* Booking is allowed only when online booking is enabled and the date is
|
||||
* today..(today + window). Past dates are always rejected.
|
||||
*/
|
||||
private function isWithinBookingWindow(Doctor $doctor, int $dayStart): bool
|
||||
private function isWithinBookingWindow(Doctor $doctor, int $dayStart, ?Clinic $clinic): bool
|
||||
{
|
||||
$todayStart = (int) strtotime('today 00:00:00');
|
||||
if ($dayStart < $todayStart) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$meta = $this->getBookingMeta($doctor);
|
||||
$meta = $this->getBookingMeta($doctor, $clinic);
|
||||
if (!($meta['online_booking_enabled'] ?? true)) {
|
||||
return false;
|
||||
}
|
||||
@@ -171,9 +172,9 @@ class SlotCalculatorService
|
||||
return $dayStart <= $maxStart;
|
||||
}
|
||||
|
||||
private function getBookingMeta(Doctor $doctor): array
|
||||
private function getBookingMeta(Doctor $doctor, ?Clinic $clinic): array
|
||||
{
|
||||
$schedule = $this->scheduleRepo->findByDoctor($doctor);
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
return $schedule ? $schedule->getMeta() : WeeklySchedule::DEFAULT_META;
|
||||
}
|
||||
|
||||
@@ -182,23 +183,23 @@ class SlotCalculatorService
|
||||
*
|
||||
* @return array[] [{start_time: string, end_time: string, slots: array[]}]
|
||||
*/
|
||||
private function buildAllSessions(Doctor $doctor, string $date): array
|
||||
private function buildAllSessions(Doctor $doctor, string $date, ?Clinic $clinic = null): array
|
||||
{
|
||||
$dayStart = (int) strtotime($date . ' 00:00:00');
|
||||
$dayEnd = $dayStart + 86400;
|
||||
|
||||
// 0. Online booking disabled or date outside the booking window
|
||||
if (!$this->isWithinBookingWindow($doctor, $dayStart)) {
|
||||
if (!$this->isWithinBookingWindow($doctor, $dayStart, $clinic)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// 1. Blocked by holiday
|
||||
if (!empty($this->holidayRepo->findActiveByDoctor($doctor, $dayStart, $dayEnd - 1))) {
|
||||
if (!empty($this->holidayRepo->findActiveByDoctor($doctor, $dayStart, $dayEnd - 1, $clinic))) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// 2. Date override takes precedence over weekly schedule
|
||||
foreach ($this->overrideRepo->findByDoctor($doctor) as $override) {
|
||||
foreach ($this->overrideRepo->findByDoctorAndClinic($doctor, $clinic) as $override) {
|
||||
if (date('Y-m-d', $override->getDate()) === $date) {
|
||||
if (!$override->isActive()) return [];
|
||||
return $this->buildSessionsFromOverride($override->getSetting() ?? [], $dayStart);
|
||||
@@ -206,7 +207,7 @@ class SlotCalculatorService
|
||||
}
|
||||
|
||||
// 3. Weekly schedule
|
||||
$schedule = $this->scheduleRepo->findByDoctor($doctor);
|
||||
$schedule = $this->scheduleRepo->findByDoctorAndClinic($doctor, $clinic);
|
||||
if ($schedule === null) return [];
|
||||
|
||||
// Convert PHP date('w') (0=Sunday) to Iranian week index (0=Saturday)
|
||||
|
||||
@@ -15,17 +15,17 @@ use App\ClinicService\Repository\ServiceSectionRepository;
|
||||
use App\ClinicService\Repository\TariffRepository;
|
||||
use App\ClinicService\Service\ServiceItemAuditService;
|
||||
use App\ClinicService\Service\TariffService;
|
||||
use App\Clinic\Repository\ClinicRepository;
|
||||
use App\Doctor\Repository\DoctorRepository;
|
||||
use App\Inventory\Repository\InventoryItemRepository;
|
||||
use App\Inventory\Repository\InventoryPackageRepository;
|
||||
use App\Shared\Constant\ErrorCodes;
|
||||
use App\Shared\Context\EntityContextResolver;
|
||||
use App\Shared\Controller\BaseController;
|
||||
use App\Shared\Exception\AppException;
|
||||
use App\Staff\Repository\ClinicStaffRepository;
|
||||
use App\Subscription\Service\SubscriptionService;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\CurrentUser;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
@@ -40,8 +40,6 @@ class ClinicServiceController extends BaseController
|
||||
private readonly ServiceItemRepository $itemRepo,
|
||||
private readonly ClinicStaffRepository $staffRepo,
|
||||
private readonly SubscriptionService $subscriptionService,
|
||||
private readonly DoctorRepository $doctorRepo,
|
||||
private readonly ClinicRepository $clinicRepo,
|
||||
private readonly TariffRepository $tariffRepo,
|
||||
private readonly TariffService $tariffService,
|
||||
private readonly InventoryPackageRepository $packageRepo,
|
||||
@@ -49,6 +47,8 @@ class ClinicServiceController extends BaseController
|
||||
private readonly ServiceItemAuditService $auditService,
|
||||
private readonly ServiceItemAuditLogRepository $auditLogRepo,
|
||||
private readonly EntityManagerInterface $em,
|
||||
private readonly EntityContextResolver $contextResolver,
|
||||
private readonly RequestStack $requestStack,
|
||||
) {}
|
||||
|
||||
/**
|
||||
@@ -489,19 +489,38 @@ class ClinicServiceController extends BaseController
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* صاحب سرویسهای این درخواست. clinic_uuid درخواست (query یا body) مقدم است، بعد
|
||||
* محیط فعال کاربر، و در آخر نقش — منطق کامل در EntityContextResolver.
|
||||
*
|
||||
* @return array{0: string, 1: ?int}
|
||||
*/
|
||||
private function resolveEntity(User $user): array
|
||||
{
|
||||
if ($user->hasRole('ROLE_DOCTOR')) {
|
||||
$doctor = $this->doctorRepo->findByUser($user);
|
||||
return $doctor !== null ? ['doctor', $doctor->getId()] : ['doctor', null];
|
||||
return $this->contextResolver->resolve($user, $this->requestedClinicUuid())->toEntityPair();
|
||||
}
|
||||
|
||||
private function requestedClinicUuid(): ?string
|
||||
{
|
||||
$request = $this->requestStack->getCurrentRequest();
|
||||
if ($request === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($user->hasRole('ROLE_CLINIC')) {
|
||||
$clinic = $this->clinicRepo->findByUser($user);
|
||||
return $clinic !== null ? ['clinic', $clinic->getId()] : ['clinic', null];
|
||||
$fromQuery = $request->query->get('clinic_uuid');
|
||||
if (is_string($fromQuery) && $fromQuery !== '') {
|
||||
return $fromQuery;
|
||||
}
|
||||
|
||||
return ['unknown', null];
|
||||
if (!in_array($request->getMethod(), ['POST', 'PATCH', 'PUT'], true)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$body = json_decode($request->getContent(), true);
|
||||
|
||||
return is_array($body) && is_string($body['clinic_uuid'] ?? null) && $body['clinic_uuid'] !== ''
|
||||
? $body['clinic_uuid']
|
||||
: null;
|
||||
}
|
||||
|
||||
private function assertServicesGate(string $entityType, ?int $entityId): void
|
||||
|
||||
@@ -11,6 +11,7 @@ use App\Patient\Repository\PatientSessionRepository;
|
||||
use App\Secretary\Entity\DoctorSecretary;
|
||||
use App\Secretary\Repository\DoctorSecretaryRepository;
|
||||
use App\Shared\Constant\ErrorCodes;
|
||||
use App\Shared\Context\EntityContextResolver;
|
||||
use App\Shared\Controller\BaseController;
|
||||
use App\Sms\Service\SmsWalletService;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
@@ -33,6 +34,9 @@ class DashboardController extends BaseController
|
||||
private readonly PatientRecordRepository $patientRecordRepo,
|
||||
private readonly PatientSessionRepository $patientSessionRepo,
|
||||
private readonly UserActiveContextRepository $contextRepo,
|
||||
private readonly EntityContextResolver $contextResolver,
|
||||
private readonly \App\Clinic\Security\ClinicDoctorPermissionChecker $permChecker,
|
||||
private readonly \App\Doctor\Repository\DoctorAddressRepository $addressRepo,
|
||||
) {}
|
||||
|
||||
// ── Clinic Dashboard ────────────────────────────────────────────────────
|
||||
@@ -186,6 +190,11 @@ class DashboardController extends BaseController
|
||||
return $this->error(ErrorCodes::ERR_NOT_FOUND_001, 'دکتر یافت نشد', 404);
|
||||
}
|
||||
|
||||
// محیط فعال تعیین میکند این داشبورد شخصی است یا داخل یک کلینیک. بدون این،
|
||||
// پزشکِ دعوتشده در محیط کلینیک آمار و درآمد مطب شخصی خودش را میدید.
|
||||
$context = $this->contextResolver->tryResolve($user, $request->query->get('clinic_uuid'));
|
||||
$clinic = $context?->clinic;
|
||||
|
||||
$doctorId = $doctor->getId();
|
||||
$todayStart = strtotime('today midnight');
|
||||
$todayEnd = strtotime('tomorrow midnight') - 1;
|
||||
@@ -197,23 +206,9 @@ class DashboardController extends BaseController
|
||||
$to = $request->query->get('to') ? (int) $request->query->get('to') : time();
|
||||
|
||||
// آمار
|
||||
$todayCount = (int) $this->em->createQuery('
|
||||
SELECT COUNT(a.id) FROM App\Appointment\Entity\Appointment a
|
||||
WHERE a.doctor = :doctor AND a.slotStart >= :s AND a.slotStart <= :e
|
||||
')->setParameters(['doctor' => $doctor, 's' => $todayStart, 'e' => $todayEnd])
|
||||
->getSingleScalarResult();
|
||||
|
||||
$tmrCount = (int) $this->em->createQuery('
|
||||
SELECT COUNT(a.id) FROM App\Appointment\Entity\Appointment a
|
||||
WHERE a.doctor = :doctor AND a.slotStart >= :s AND a.slotStart <= :e
|
||||
')->setParameters(['doctor' => $doctor, 's' => $tmrStart, 'e' => $tmrEnd])
|
||||
->getSingleScalarResult();
|
||||
|
||||
$monthCount = (int) $this->em->createQuery('
|
||||
SELECT COUNT(a.id) FROM App\Appointment\Entity\Appointment a
|
||||
WHERE a.doctor = :doctor AND a.slotStart >= :s
|
||||
')->setParameters(['doctor' => $doctor, 's' => $monthStart])
|
||||
->getSingleScalarResult();
|
||||
$todayCount = $this->countAppointments($doctor, $clinic, $todayStart, $todayEnd);
|
||||
$tmrCount = $this->countAppointments($doctor, $clinic, $tmrStart, $tmrEnd);
|
||||
$monthCount = $this->countAppointments($doctor, $clinic, $monthStart, PHP_INT_MAX);
|
||||
|
||||
// میانگین و تعداد امتیاز
|
||||
$ratingRow = $this->em->createQuery('
|
||||
@@ -223,21 +218,24 @@ class DashboardController extends BaseController
|
||||
')->setParameter('doctor', $doctor)->getOneOrNullResult() ?? [];
|
||||
|
||||
// نوبتهای امروز
|
||||
$todayAppts = $this->em->createQuery('
|
||||
SELECT a.uuid, u.realName AS patient_name, u.mobileNumber AS patient_mobile,
|
||||
d.name AS doctor_name, si.name AS service_name,
|
||||
a.slotStart AS slot_start, a.slotEnd AS slot_end, a.status
|
||||
FROM App\Appointment\Entity\Appointment a
|
||||
JOIN a.user u
|
||||
JOIN a.doctor d
|
||||
LEFT JOIN a.serviceItem si
|
||||
WHERE a.doctor = :doctor AND a.slotStart >= :s AND a.slotStart <= :e
|
||||
ORDER BY a.slotStart ASC
|
||||
')->setMaxResults(10)->setParameters([
|
||||
'doctor' => $doctor,
|
||||
's' => $todayStart,
|
||||
'e' => $todayEnd,
|
||||
])->getArrayResult();
|
||||
$todayApptsQb = $this->em->createQueryBuilder()
|
||||
->select('a.uuid, u.realName AS patient_name, u.mobileNumber AS patient_mobile,
|
||||
d.name AS doctor_name, si.name AS service_name,
|
||||
a.slotStart AS slot_start, a.slotEnd AS slot_end, a.status')
|
||||
->from(\App\Appointment\Entity\Appointment::class, 'a')
|
||||
->join('a.user', 'u')
|
||||
->join('a.doctor', 'd')
|
||||
->leftJoin('a.serviceItem', 'si')
|
||||
->where('a.doctor = :doctor')
|
||||
->andWhere('a.slotStart >= :s AND a.slotStart <= :e')
|
||||
->setParameter('doctor', $doctor)
|
||||
->setParameter('s', $todayStart)
|
||||
->setParameter('e', $todayEnd)
|
||||
->orderBy('a.slotStart', 'ASC')
|
||||
->setMaxResults(10);
|
||||
|
||||
$this->restrictToClinicAddresses($todayApptsQb, $clinic);
|
||||
$todayAppts = $todayApptsQb->getQuery()->getArrayResult();
|
||||
|
||||
// کلینیکهای عضو
|
||||
$clinics = $this->em->createQuery('
|
||||
@@ -247,18 +245,35 @@ class DashboardController extends BaseController
|
||||
WHERE d.id = :doctorId
|
||||
')->setParameter('doctorId', $doctorId)->getArrayResult();
|
||||
|
||||
$smsBalance = $this->smsWalletService->getBalance('doctor', $doctorId);
|
||||
$uniquePatients = $this->patientRecordRepo->countUnique('doctor', $doctorId, $from, $to);
|
||||
$revenuePeriod = $this->patientSessionRepo->sumRevenue('doctor', $doctorId, $from, $to);
|
||||
$totalPatients = $this->patientRecordRepo->countUnique('doctor', $doctorId, 0, time());
|
||||
$apptByDay = $this->appointmentsDaily(
|
||||
fn(int $ds, int $de): int => $this->countAppointments($doctor, $clinic, $ds, $de)
|
||||
);
|
||||
|
||||
$rev = $this->revenueDaily('doctor', $doctorId);
|
||||
$apptByDay = $this->appointmentsDaily(function (int $ds, int $de) use ($doctor): int {
|
||||
return (int) $this->em->createQuery('
|
||||
SELECT COUNT(a.id) FROM App\Appointment\Entity\Appointment a
|
||||
WHERE a.doctor = :d AND a.slotStart >= :s AND a.slotStart <= :e
|
||||
')->setParameters(['d' => $doctor, 's' => $ds, 'e' => $de])->getSingleScalarResult();
|
||||
});
|
||||
$stats = [
|
||||
'today_appointments' => $todayCount,
|
||||
'tomorrow_appointments' => $tmrCount,
|
||||
'this_month_appointments' => $monthCount,
|
||||
'avg_rating' => $ratingRow['avg_score'] ? round((float) $ratingRow['avg_score'], 1) : null,
|
||||
'total_ratings' => (int) ($ratingRow['total'] ?? 0),
|
||||
];
|
||||
|
||||
$charts = ['appointments_by_day' => $apptByDay];
|
||||
|
||||
// ارقام مالی و کیف پول پیامک به مطب شخصی تعلق دارند. در محیط کلینیک اصلاً
|
||||
// برگردانده نمیشوند مگر کاربر مالک همان کلینیک باشد — مخفیکردن در UI کافی
|
||||
// نیست، چون endpoint مستقیماً قابل صدا زدن است.
|
||||
if ($this->maySeeFinancials($user, $clinic)) {
|
||||
$rev = $this->revenueDaily('doctor', $doctorId);
|
||||
|
||||
$stats['sms_wallet_balance'] = $this->smsWalletService->getBalance('doctor', $doctorId);
|
||||
$stats['unique_patients_count'] = $this->patientRecordRepo->countUnique('doctor', $doctorId, $from, $to);
|
||||
$stats['total_patients'] = $this->patientRecordRepo->countUnique('doctor', $doctorId, 0, time());
|
||||
$stats['revenue_period_rials'] = $this->patientSessionRepo->sumRevenue('doctor', $doctorId, $from, $to);
|
||||
$stats['today_payments_rials'] = $rev['today_payments_rials'];
|
||||
$stats['week_payments_rials'] = $rev['week_payments_rials'];
|
||||
|
||||
$charts['revenue_by_day'] = $rev['revenue'];
|
||||
}
|
||||
|
||||
return $this->success([
|
||||
'doctor' => [
|
||||
@@ -266,29 +281,66 @@ class DashboardController extends BaseController
|
||||
'name' => $doctor->getName(),
|
||||
'degree' => $doctor->getDegree(),
|
||||
],
|
||||
'stats' => [
|
||||
'today_appointments' => $todayCount,
|
||||
'tomorrow_appointments' => $tmrCount,
|
||||
'this_month_appointments' => $monthCount,
|
||||
'avg_rating' => $ratingRow['avg_score'] ? round((float) $ratingRow['avg_score'], 1) : null,
|
||||
'total_ratings' => (int) ($ratingRow['total'] ?? 0),
|
||||
'sms_wallet_balance' => $smsBalance,
|
||||
'unique_patients_count' => $uniquePatients,
|
||||
'total_patients' => $totalPatients,
|
||||
'revenue_period_rials' => $revenuePeriod,
|
||||
'today_payments_rials' => $rev['today_payments_rials'],
|
||||
'week_payments_rials' => $rev['week_payments_rials'],
|
||||
],
|
||||
'charts' => [
|
||||
'revenue_by_day' => $rev['revenue'],
|
||||
'appointments_by_day' => $apptByDay,
|
||||
'context' => [
|
||||
'type' => $clinic === null ? 'personal' : 'clinic',
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'clinic_name' => $clinic?->getName(),
|
||||
],
|
||||
'stats' => $stats,
|
||||
'charts' => $charts,
|
||||
'period' => ['from' => $from, 'to' => $to],
|
||||
'today_appointments' => $todayAppts,
|
||||
'clinics' => $clinics,
|
||||
// فهرست کلینیکها فقط در محیط شخصی معنا دارد.
|
||||
'clinics' => $clinic === null ? $clinics : [],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* نوبتهای پزشک در یک بازه، محدود به محیط جاری. در محیط کلینیک فقط نوبتهایی
|
||||
* شمرده میشوند که آدرسشان متعلق به همان کلینیک است.
|
||||
*/
|
||||
private function countAppointments(\App\Doctor\Entity\Doctor $doctor, ?\App\Clinic\Entity\Clinic $clinic, int $from, int $to): int
|
||||
{
|
||||
$qb = $this->em->createQueryBuilder()
|
||||
->select('COUNT(a.id)')
|
||||
->from(\App\Appointment\Entity\Appointment::class, 'a')
|
||||
->where('a.doctor = :doctor')
|
||||
->andWhere('a.slotStart >= :s AND a.slotStart <= :e')
|
||||
->setParameter('doctor', $doctor)
|
||||
->setParameter('s', $from)
|
||||
->setParameter('e', $to);
|
||||
|
||||
$this->restrictToClinicAddresses($qb, $clinic);
|
||||
|
||||
return (int) $qb->getQuery()->getSingleScalarResult();
|
||||
}
|
||||
|
||||
private function restrictToClinicAddresses(\Doctrine\ORM\QueryBuilder $qb, ?\App\Clinic\Entity\Clinic $clinic): void
|
||||
{
|
||||
if ($clinic === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$addressIds = array_map(
|
||||
fn(\App\Doctor\Entity\DoctorAddress $a): int => (int) $a->getId(),
|
||||
$this->addressRepo->findForContext($qb->getParameter('doctor')->getValue(), $clinic->getId())
|
||||
);
|
||||
|
||||
$qb->andWhere('a.addressId IN (:addressIds)')
|
||||
->setParameter('addressIds', $addressIds ?: [0]);
|
||||
}
|
||||
|
||||
/** فقط محیط شخصی خود پزشک، یا مالک همان کلینیک. */
|
||||
private function maySeeFinancials(User $user, ?\App\Clinic\Entity\Clinic $clinic): bool
|
||||
{
|
||||
if ($clinic === null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $clinic->getUser()->getId() === $user->getId()
|
||||
&& $this->permChecker->can($user, $clinic, 'payments', 'view');
|
||||
}
|
||||
|
||||
/**
|
||||
* سری ۷ روز اخیر درآمد (بر اساس PatientSession) + پرداختی امروز و هفته.
|
||||
* @return array{revenue: array<int, array{label:string, amount_rials:int}>, today_payments_rials:int, week_payments_rials:int}
|
||||
|
||||
@@ -62,6 +62,32 @@ class DoctorAddressRepository extends ServiceEntityRepository
|
||||
->getSingleScalarResult();
|
||||
}
|
||||
|
||||
/**
|
||||
* آدرسهای قابلانتخاب در یک context. مطب شخصی فقط آدرسهای شخصی خود پزشک را
|
||||
* میبیند و کلینیک فقط آدرسهای خودش — این دو هرگز union نمیشوند.
|
||||
*
|
||||
* @return DoctorAddress[]
|
||||
*/
|
||||
public function findForContext(Doctor $doctor, ?int $clinicId): array
|
||||
{
|
||||
$qb = $this->createQueryBuilder('a');
|
||||
|
||||
if ($clinicId === null) {
|
||||
$qb->where('a.doctor = :doctor')
|
||||
->andWhere('a.type = :personal')
|
||||
->setParameter('doctor', $doctor)
|
||||
->setParameter('personal', DoctorAddress::TYPE_PERSONAL);
|
||||
} else {
|
||||
$qb->where('a.clinicId = :clinicId')
|
||||
->andWhere('a.type = :clinic')
|
||||
->setParameter('clinicId', $clinicId)
|
||||
->setParameter('clinic', DoctorAddress::TYPE_CLINIC);
|
||||
}
|
||||
|
||||
return $qb->orderBy('a.id', 'ASC')->getQuery()->getResult();
|
||||
}
|
||||
|
||||
/** @deprecated آدرسهای دو محیط را union میکند؛ از findForContext() استفاده کن. */
|
||||
public function findAvailableForDoctor(Doctor $doctor, array $clinicIds): array
|
||||
{
|
||||
$qb = $this->createQueryBuilder('a');
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<?php
|
||||
|
||||
namespace App\Shared\Context;
|
||||
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
|
||||
/**
|
||||
* محیط کاری مؤثر یک درخواست: یا مطب شخصی یک پزشک، یا یک کلینیک.
|
||||
*
|
||||
* سرویسها، آدرسها و برنامهٔ نوبتدهی همگی به یکی از این دو تعلق دارند و هرگز بین
|
||||
* آنها مشترک نمیشوند. type/id دقیقاً همان جفتی است که ServiceSection با
|
||||
* entity_type/entity_id ذخیره میکند.
|
||||
*/
|
||||
final class EntityContext
|
||||
{
|
||||
public const TYPE_DOCTOR = 'doctor';
|
||||
public const TYPE_CLINIC = 'clinic';
|
||||
public const TYPE_UNKNOWN = 'unknown';
|
||||
|
||||
private function __construct(
|
||||
public readonly string $type,
|
||||
public readonly ?int $id,
|
||||
public readonly ?Clinic $clinic = null,
|
||||
public readonly ?Doctor $doctor = null,
|
||||
) {}
|
||||
|
||||
public static function forDoctor(?Doctor $doctor): self
|
||||
{
|
||||
return new self(self::TYPE_DOCTOR, $doctor?->getId(), null, $doctor);
|
||||
}
|
||||
|
||||
public static function forClinic(Clinic $clinic): self
|
||||
{
|
||||
return new self(self::TYPE_CLINIC, $clinic->getId(), $clinic);
|
||||
}
|
||||
|
||||
public static function unknown(): self
|
||||
{
|
||||
return new self(self::TYPE_UNKNOWN, null);
|
||||
}
|
||||
|
||||
public function isClinic(): bool { return $this->type === self::TYPE_CLINIC; }
|
||||
|
||||
public function isResolved(): bool { return $this->id !== null; }
|
||||
|
||||
/** @return array{0: string, 1: ?int} جفت (entity_type, entity_id) برای ServiceSection */
|
||||
public function toEntityPair(): array
|
||||
{
|
||||
return [$this->type, $this->id];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
<?php
|
||||
|
||||
namespace App\Shared\Context;
|
||||
|
||||
use App\Auth\Entity\User;
|
||||
use App\Auth\Repository\UserActiveContextRepository;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Clinic\Repository\ClinicRepository;
|
||||
use App\Doctor\Repository\DoctorRepository;
|
||||
use App\Shared\Constant\ErrorCodes;
|
||||
use App\Shared\Exception\AppException;
|
||||
|
||||
/**
|
||||
* تنها نقطهٔ تصمیمگیری دربارهٔ «این درخواست در کدام محیط اجرا میشود؟».
|
||||
*
|
||||
* اولویت: clinic_uuid صریحِ درخواست > محیط فعالِ ذخیرهشدهٔ کاربر > نقش کاربر.
|
||||
*
|
||||
* نقش بهتنهایی برای کاربری که هم پزشک است و هم مالک کلینیک جواب نمیدهد: چنین
|
||||
* کاربری همیشه بهعنوان پزشک حل میشد و هرگز به سرویسهای کلینیک خودش نمیرسید.
|
||||
* UserActiveContext تعیینکننده است و نقش فقط fallback آخر.
|
||||
*/
|
||||
class EntityContextResolver
|
||||
{
|
||||
public function __construct(
|
||||
private readonly DoctorRepository $doctorRepo,
|
||||
private readonly ClinicRepository $clinicRepo,
|
||||
private readonly UserActiveContextRepository $activeContextRepo,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param string|null $clinicUuid اگر داده شود، محیط کلینیک اجباری میشود و در
|
||||
* صورت نداشتن دسترسی، خطای ۴۰۳ پرتاب میشود.
|
||||
*/
|
||||
public function resolve(User $user, ?string $clinicUuid = null): EntityContext
|
||||
{
|
||||
if ($clinicUuid !== null && $clinicUuid !== '') {
|
||||
$clinic = $this->clinicRepo->findByUuid($clinicUuid);
|
||||
if ($clinic === null) {
|
||||
throw new AppException(ErrorCodes::ERR_VALIDATION_002, 'کلینیک یافت نشد', 404);
|
||||
}
|
||||
$this->assertCanActInClinic($user, $clinic);
|
||||
|
||||
return EntityContext::forClinic($clinic);
|
||||
}
|
||||
|
||||
$fromActive = $this->fromActiveContext($user);
|
||||
if ($fromActive !== null) {
|
||||
return $fromActive;
|
||||
}
|
||||
|
||||
return $this->fromRole($user);
|
||||
}
|
||||
|
||||
/**
|
||||
* محیط را بدون پرتاب خطا حل میکند؛ اگر کاربر به کلینیکِ خواستهشده دسترسی
|
||||
* نداشته باشد null برمیگرداند. برای مسیرهایی که خودشان authorization جدا دارند.
|
||||
*/
|
||||
public function tryResolve(User $user, ?string $clinicUuid = null): ?EntityContext
|
||||
{
|
||||
try {
|
||||
return $this->resolve($user, $clinicUuid);
|
||||
} catch (AppException) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/** مالک کلینیک، ادمین، یا پزشکِ عضو همان کلینیک. */
|
||||
public function canActInClinic(User $user, Clinic $clinic): bool
|
||||
{
|
||||
if ($user->hasRole('ROLE_ADMIN') || $clinic->getUser()->getId() === $user->getId()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$doctor = $this->doctorRepo->findByUser($user);
|
||||
|
||||
return $doctor !== null && $clinic->hasDoctor($doctor);
|
||||
}
|
||||
|
||||
public function assertCanActInClinic(User $user, Clinic $clinic): void
|
||||
{
|
||||
if (!$this->canActInClinic($user, $clinic)) {
|
||||
throw new AppException(ErrorCodes::ERR_ACCESS_DENIED, 'به این کلینیک دسترسی ندارید', 403);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* محیط فعالِ ذخیرهشده. db_uuid یا uuid کلینیک است یا uuid پزشک؛ کلینیک اول
|
||||
* بررسی میشود چون پزشکِ دعوتشده هم db_uuid کلینیک را ذخیره میکند.
|
||||
*/
|
||||
private function fromActiveContext(User $user): ?EntityContext
|
||||
{
|
||||
$active = $this->activeContextRepo->findByUser($user);
|
||||
if ($active === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$clinic = $this->clinicRepo->findByUuid($active->getDbUuid());
|
||||
if ($clinic !== null) {
|
||||
return $this->canActInClinic($user, $clinic) ? EntityContext::forClinic($clinic) : null;
|
||||
}
|
||||
|
||||
$doctor = $this->doctorRepo->findByUuid($active->getDbUuid());
|
||||
if ($doctor !== null && $doctor->getUser()->getId() === $user->getId()) {
|
||||
return EntityContext::forDoctor($doctor);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function fromRole(User $user): EntityContext
|
||||
{
|
||||
if ($user->hasRole('ROLE_DOCTOR')) {
|
||||
return EntityContext::forDoctor($this->doctorRepo->findByUser($user));
|
||||
}
|
||||
|
||||
if ($user->hasRole('ROLE_CLINIC')) {
|
||||
$clinic = $this->clinicRepo->findByUser($user);
|
||||
|
||||
return $clinic !== null ? EntityContext::forClinic($clinic) : EntityContext::unknown();
|
||||
}
|
||||
|
||||
return EntityContext::unknown();
|
||||
}
|
||||
}
|
||||
@@ -10,9 +10,9 @@ use App\Doctor\Entity\DoctorAddress;
|
||||
use App\Tests\ApiTestCase;
|
||||
|
||||
/**
|
||||
* Appointment settings are reachable by the doctor, an admin, and the owner of a
|
||||
* clinic the doctor belongs to. A member doctor's own access is governed by the
|
||||
* clinic's appointment_settings permission. Edits never leak across doctors.
|
||||
* تنظیمات نوبتدهی per-context است: مطب شخصی پزشک (بدون clinic_uuid) فقط برای خود
|
||||
* پزشک و ادمین باز است، و کلینیک با clinic_uuid فقط برنامهٔ همان کلینیک را
|
||||
* میبیند/مینویسد. این دو برنامهٔ جدا هستند و روی هم اثر نمیگذارند.
|
||||
*/
|
||||
class ClinicOwnerScheduleAccessTest extends ApiTestCase
|
||||
{
|
||||
@@ -50,32 +50,43 @@ class ClinicOwnerScheduleAccessTest extends ApiTestCase
|
||||
return $address;
|
||||
}
|
||||
|
||||
private function schedulePayload(Doctor $doctor, int $locationId, string $start): array
|
||||
private function clinicAddress(Clinic $clinic): DoctorAddress
|
||||
{
|
||||
return [
|
||||
$address = DoctorAddress::forClinic($clinic->getId());
|
||||
$this->em->persist($address);
|
||||
$this->em->flush();
|
||||
|
||||
return $address;
|
||||
}
|
||||
|
||||
private function schedulePayload(Doctor $doctor, int $locationId, string $start, ?Clinic $clinic = null): array
|
||||
{
|
||||
return array_filter([
|
||||
'doctor_uuid' => $doctor->getUuid(),
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'schedule' => [
|
||||
['day' => 'saturday', 'sessions' => [
|
||||
['active' => true, 'location_id' => $locationId, 'start' => $start, 'end' => '12:00'],
|
||||
]],
|
||||
],
|
||||
];
|
||||
], fn($v) => $v !== null);
|
||||
}
|
||||
|
||||
public function testClinicOwnerCanReadAndWriteMemberDoctorSchedule(): void
|
||||
public function testClinicOwnerCanReadAndWriteMemberDoctorScheduleInClinicContext(): void
|
||||
{
|
||||
$doctor = $this->makeDoctor('دکتر عضو');
|
||||
[$owner] = $this->makeClinicWith($doctor);
|
||||
$address = $this->addressFor($doctor);
|
||||
$doctor = $this->makeDoctor('دکتر عضو');
|
||||
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
||||
$address = $this->clinicAddress($clinic);
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($doctor, $address->getId(), '09:00'));
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($doctor, $address->getId(), '09:00', $clinic));
|
||||
self::assertSame(201, $this->responseCode());
|
||||
|
||||
$this->authJson('GET', "/api/v1/appointment-settings/weekly-schedule/{$doctor->getUuid()}", $owner);
|
||||
$this->authJson('GET', "/api/v1/appointment-settings/weekly-schedule/{$doctor->getUuid()}?clinic_uuid={$clinic->getUuid()}", $owner);
|
||||
self::assertSame(200, $this->responseCode());
|
||||
|
||||
$this->authJson('PATCH', "/api/v1/appointment-settings/weekly-schedule/{$doctor->getUuid()}", $owner, [
|
||||
'schedule' => [
|
||||
'clinic_uuid' => $clinic->getUuid(),
|
||||
'schedule' => [
|
||||
['day' => 'saturday', 'sessions' => [
|
||||
['active' => true, 'location_id' => $address->getId(), 'start' => '10:00', 'end' => '13:00'],
|
||||
]],
|
||||
@@ -84,16 +95,77 @@ class ClinicOwnerScheduleAccessTest extends ApiTestCase
|
||||
self::assertSame(200, $this->responseCode());
|
||||
}
|
||||
|
||||
public function testClinicOwnerCannotTouchOutsideDoctor(): void
|
||||
public function testClinicOwnerCannotTouchDoctorPersonalSchedule(): void
|
||||
{
|
||||
$member = $this->makeDoctor('دکتر عضو');
|
||||
[$owner] = $this->makeClinicWith($member);
|
||||
$stranger = $this->makeDoctor('دکتر بیرونی');
|
||||
$address = $this->addressFor($stranger);
|
||||
$doctor = $this->makeDoctor('دکتر عضو');
|
||||
[$owner] = $this->makeClinicWith($doctor);
|
||||
$address = $this->addressFor($doctor);
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($stranger, $address->getId(), '09:00'));
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($doctor, $address->getId(), '09:00'));
|
||||
|
||||
self::assertSame(403, $this->responseCode());
|
||||
self::assertSame(403, $this->responseCode(), 'مطب شخصی پزشک از دسترس کلینیک خارج است');
|
||||
}
|
||||
|
||||
public function testClinicContextRejectsPersonalAddress(): void
|
||||
{
|
||||
$doctor = $this->makeDoctor('دکتر عضو');
|
||||
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
||||
$personal = $this->addressFor($doctor);
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($doctor, $personal->getId(), '09:00', $clinic));
|
||||
|
||||
self::assertSame(422, $this->responseCode());
|
||||
}
|
||||
|
||||
public function testPersonalContextRejectsClinicAddress(): void
|
||||
{
|
||||
$doctor = $this->makeDoctor('دکتر عضو');
|
||||
[, $clinic] = $this->makeClinicWith($doctor);
|
||||
$clinicAddress = $this->clinicAddress($clinic);
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), $this->schedulePayload($doctor, $clinicAddress->getId(), '09:00'));
|
||||
|
||||
self::assertSame(422, $this->responseCode());
|
||||
}
|
||||
|
||||
public function testStrangerClinicUuidIsRejected(): void
|
||||
{
|
||||
$doctor = $this->makeDoctor('دکتر مستقل');
|
||||
$outsider = $this->makeDoctor('دکتر دیگر');
|
||||
[, $clinic] = $this->makeClinicWith($outsider);
|
||||
$address = $this->addressFor($doctor);
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), $this->schedulePayload($doctor, $address->getId(), '09:00', $clinic));
|
||||
|
||||
self::assertSame(422, $this->responseCode(), 'پزشک عضو این کلینیک نیست');
|
||||
}
|
||||
|
||||
public function testPersonalAndClinicSchedulesCoexistIndependently(): void
|
||||
{
|
||||
$doctor = $this->makeDoctor('دکتر دو-محیطی');
|
||||
[$owner, $clinic] = $this->makeClinicWith($doctor);
|
||||
$personal = $this->addressFor($doctor);
|
||||
$inClinic = $this->clinicAddress($clinic);
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), $this->schedulePayload($doctor, $personal->getId(), '08:00'));
|
||||
self::assertSame(201, $this->responseCode());
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($doctor, $inClinic->getId(), '16:00', $clinic));
|
||||
self::assertSame(201, $this->responseCode());
|
||||
|
||||
$this->em->clear();
|
||||
$reloadedDoctor = $this->em->getRepository(Doctor::class)->find($doctor->getId());
|
||||
$schedules = $this->em->getRepository(WeeklySchedule::class)->findAllByDoctor($reloadedDoctor);
|
||||
|
||||
self::assertCount(2, $schedules, 'یک برنامه به ازای هر محیط');
|
||||
|
||||
$byContext = [];
|
||||
foreach ($schedules as $schedule) {
|
||||
$byContext[$schedule->getClinic() === null ? 'personal' : 'clinic'] = $schedule->getSetting()[0]['sessions'][0]['start'];
|
||||
}
|
||||
|
||||
self::assertSame('08:00', $byContext['personal']);
|
||||
self::assertSame('16:00', $byContext['clinic']);
|
||||
}
|
||||
|
||||
public function testDoctorKeepsFullAccessToOwnSchedule(): void
|
||||
@@ -132,45 +204,45 @@ class ClinicOwnerScheduleAccessTest extends ApiTestCase
|
||||
|
||||
public function testMemberDoctorLosesAccessWhenPermissionRevoked(): void
|
||||
{
|
||||
$doctor = $this->makeDoctor('دکتر عضو');
|
||||
$other = $this->makeDoctor('دکتر دیگر');
|
||||
$doctor = $this->makeDoctor('دکتر عضو');
|
||||
$other = $this->makeDoctor('دکتر دیگر');
|
||||
[, $clinic] = $this->makeClinicWith($doctor, $other);
|
||||
$address = $this->addressFor($other);
|
||||
$address = $this->clinicAddress($clinic);
|
||||
|
||||
$perm = static::getContainer()->get(ClinicDoctorPermissionRepository::class)->getOrCreate($clinic, $doctor);
|
||||
$perm->mergePermissions(['resources' => ['appointment_settings' => ['update' => false, 'view' => false]]]);
|
||||
$this->em->flush();
|
||||
|
||||
// پزشک همچنان به برنامهٔ خودش دسترسی دارد؛ مجوز کلینیک فقط دیگران را محدود میکند
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), $this->schedulePayload($other, $address->getId(), '09:00'));
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), $this->schedulePayload($other, $address->getId(), '09:00', $clinic));
|
||||
|
||||
self::assertSame(403, $this->responseCode());
|
||||
}
|
||||
|
||||
public function testEditingOneDoctorDoesNotAffectAnother(): void
|
||||
{
|
||||
$first = $this->makeDoctor('دکتر اول');
|
||||
$second = $this->makeDoctor('دکتر دوم');
|
||||
[$owner] = $this->makeClinicWith($first, $second);
|
||||
$addrFirst = $this->addressFor($first);
|
||||
$addrSecond = $this->addressFor($second);
|
||||
$first = $this->makeDoctor('دکتر اول');
|
||||
$second = $this->makeDoctor('دکتر دوم');
|
||||
[$owner, $clinic] = $this->makeClinicWith($first, $second);
|
||||
$address = $this->clinicAddress($clinic);
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($first, $addrFirst->getId(), '08:00'));
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($second, $addrSecond->getId(), '16:00'));
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($first, $address->getId(), '08:00', $clinic));
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->schedulePayload($second, $address->getId(), '16:00', $clinic));
|
||||
|
||||
$this->authJson('PATCH', "/api/v1/appointment-settings/weekly-schedule/{$first->getUuid()}", $owner, [
|
||||
'schedule' => [
|
||||
'clinic_uuid' => $clinic->getUuid(),
|
||||
'schedule' => [
|
||||
['day' => 'saturday', 'sessions' => [
|
||||
['active' => true, 'location_id' => $addrFirst->getId(), 'start' => '11:00', 'end' => '15:00'],
|
||||
['active' => true, 'location_id' => $address->getId(), 'start' => '11:00', 'end' => '15:00'],
|
||||
]],
|
||||
],
|
||||
]);
|
||||
self::assertSame(200, $this->responseCode());
|
||||
|
||||
$this->em->clear();
|
||||
$reloaded = $this->em->getRepository(WeeklySchedule::class)->findOneBy([
|
||||
'doctor' => $this->em->getRepository(Doctor::class)->find($second->getId()),
|
||||
]);
|
||||
$reloaded = $this->em->getRepository(WeeklySchedule::class)->findByDoctorAndClinic(
|
||||
$this->em->getRepository(Doctor::class)->find($second->getId()),
|
||||
$this->em->getRepository(Clinic::class)->find($clinic->getId()),
|
||||
);
|
||||
|
||||
self::assertSame('16:00', $reloaded->getSetting()[0]['sessions'][0]['start'], "the other doctor's schedule is untouched");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
<?php
|
||||
|
||||
namespace App\Tests\Appointment;
|
||||
|
||||
use App\ClinicService\Entity\ServiceItem;
|
||||
use App\ClinicService\Entity\ServiceSection;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use App\Doctor\Entity\DoctorAddress;
|
||||
use App\Tests\ApiTestCase;
|
||||
|
||||
/**
|
||||
* نوبتدهی سرویسی، سرویسهای همان محیط را میخواهد. باگ اصلی این بود که شمارش
|
||||
* همیشه با entity_type='doctor' انجام میشد، پس کلینیکی که سرویس bookable داشت هم
|
||||
* خطای «حداقل یک سرویس لازم است» میگرفت.
|
||||
*/
|
||||
class ServiceModeContextTest extends ApiTestCase
|
||||
{
|
||||
private function makeDoctorInClinic(): array
|
||||
{
|
||||
$doctorUser = $this->createUser(['ROLE_USER', 'ROLE_DOCTOR']);
|
||||
$doctor = new Doctor($doctorUser, 'دکتر تست');
|
||||
$doctor->setMobileNumber($doctorUser->getMobileNumber());
|
||||
$this->em->persist($doctor);
|
||||
|
||||
$ownerUser = $this->createUser(['ROLE_USER', 'ROLE_CLINIC']);
|
||||
$clinic = new Clinic($ownerUser);
|
||||
$clinic->setName('کلینیک تست');
|
||||
$clinic->getDoctors()->add($doctor);
|
||||
$this->em->persist($clinic);
|
||||
$this->em->flush();
|
||||
|
||||
return [$doctor, $clinic, $ownerUser];
|
||||
}
|
||||
|
||||
private function bookableServiceFor(string $entityType, int $entityId): void
|
||||
{
|
||||
$section = new ServiceSection($entityType, $entityId, 'بخش تست');
|
||||
$this->em->persist($section);
|
||||
|
||||
$item = new ServiceItem($section, 'ویزیت', 500_000);
|
||||
$item->setBookable(true);
|
||||
$item->setDurationMinutes(20);
|
||||
$this->em->persist($item);
|
||||
$this->em->flush();
|
||||
}
|
||||
|
||||
private function servicePayload(Doctor $doctor, int $locationId, ?Clinic $clinic): array
|
||||
{
|
||||
return array_filter([
|
||||
'doctor_uuid' => $doctor->getUuid(),
|
||||
'clinic_uuid' => $clinic?->getUuid(),
|
||||
'schedule' => [
|
||||
['day' => 'saturday', 'sessions' => [
|
||||
['active' => true, 'location_id' => $locationId, 'start' => '09:00', 'end' => '12:00'],
|
||||
]],
|
||||
],
|
||||
'meta' => ['booking_mode' => 'service'],
|
||||
], fn($v) => $v !== null);
|
||||
}
|
||||
|
||||
public function testClinicServiceModeAcceptsClinicOwnedService(): void
|
||||
{
|
||||
[$doctor, $clinic, $owner] = $this->makeDoctorInClinic();
|
||||
$this->bookableServiceFor('clinic', $clinic->getId());
|
||||
|
||||
$address = DoctorAddress::forClinic($clinic->getId());
|
||||
$this->em->persist($address);
|
||||
$this->em->flush();
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->servicePayload($doctor, $address->getId(), $clinic));
|
||||
|
||||
self::assertSame(201, $this->responseCode());
|
||||
}
|
||||
|
||||
public function testPersonalServiceModeIgnoresClinicServices(): void
|
||||
{
|
||||
[$doctor, $clinic] = $this->makeDoctorInClinic();
|
||||
$this->bookableServiceFor('clinic', $clinic->getId());
|
||||
|
||||
$address = DoctorAddress::forDoctor($doctor);
|
||||
$this->em->persist($address);
|
||||
$this->em->flush();
|
||||
|
||||
$body = $this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), $this->servicePayload($doctor, $address->getId(), null));
|
||||
|
||||
self::assertSame(422, $this->responseCode(), 'سرویس کلینیک نباید مطب شخصی را راضی کند');
|
||||
self::assertSame('booking_mode', $body['errors'][0]['field'] ?? null);
|
||||
}
|
||||
|
||||
public function testPersonalServiceModeAcceptsOwnService(): void
|
||||
{
|
||||
[$doctor] = $this->makeDoctorInClinic();
|
||||
$this->bookableServiceFor('doctor', $doctor->getId());
|
||||
|
||||
$address = DoctorAddress::forDoctor($doctor);
|
||||
$this->em->persist($address);
|
||||
$this->em->flush();
|
||||
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), $this->servicePayload($doctor, $address->getId(), null));
|
||||
|
||||
self::assertSame(201, $this->responseCode());
|
||||
}
|
||||
|
||||
public function testBookingModeLocksPerContextNotGlobally(): void
|
||||
{
|
||||
[$doctor, $clinic, $owner] = $this->makeDoctorInClinic();
|
||||
$this->bookableServiceFor('clinic', $clinic->getId());
|
||||
|
||||
$personal = DoctorAddress::forDoctor($doctor);
|
||||
$inClinic = DoctorAddress::forClinic($clinic->getId());
|
||||
$this->em->persist($personal);
|
||||
$this->em->persist($inClinic);
|
||||
$this->em->flush();
|
||||
|
||||
// مطب شخصی: اسلاتی
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $doctor->getUser(), [
|
||||
'doctor_uuid' => $doctor->getUuid(),
|
||||
'schedule' => [['day' => 'saturday', 'sessions' => [
|
||||
['active' => true, 'location_id' => $personal->getId(), 'start' => '09:00', 'end' => '12:00'],
|
||||
]]],
|
||||
'meta' => ['booking_mode' => 'slot'],
|
||||
]);
|
||||
self::assertSame(201, $this->responseCode());
|
||||
|
||||
// همان پزشک در کلینیک: سرویسی — قفلِ محیط دیگر نباید مانع شود
|
||||
$this->authJson('POST', '/api/v1/appointment-settings/weekly-schedule', $owner, $this->servicePayload($doctor, $inClinic->getId(), $clinic));
|
||||
self::assertSame(201, $this->responseCode());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
<?php
|
||||
|
||||
namespace App\Tests\Dashboard;
|
||||
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use App\Tests\ApiTestCase;
|
||||
|
||||
/**
|
||||
* داشبورد پزشک در محیط کلینیک نباید هیچ رقم مالی برگرداند. مخفیکردن کارتها در
|
||||
* پنل کافی نیست — endpoint مستقیماً قابل صدا زدن است.
|
||||
*/
|
||||
class InvitedDoctorDashboardScopeTest extends ApiTestCase
|
||||
{
|
||||
private const FINANCIAL_KEYS = [
|
||||
'revenue_period_rials',
|
||||
'today_payments_rials',
|
||||
'week_payments_rials',
|
||||
'sms_wallet_balance',
|
||||
];
|
||||
|
||||
private function makeDoctorInClinic(): array
|
||||
{
|
||||
$doctorUser = $this->createUser(['ROLE_USER', 'ROLE_DOCTOR']);
|
||||
$doctor = new Doctor($doctorUser, 'دکتر دعوتشده');
|
||||
$doctor->setMobileNumber($doctorUser->getMobileNumber());
|
||||
$this->em->persist($doctor);
|
||||
|
||||
$clinic = new Clinic($this->createUser(['ROLE_USER', 'ROLE_CLINIC']));
|
||||
$clinic->setName('کلینیک میزبان');
|
||||
$clinic->getDoctors()->add($doctor);
|
||||
$this->em->persist($clinic);
|
||||
$this->em->flush();
|
||||
|
||||
return [$doctor, $clinic];
|
||||
}
|
||||
|
||||
public function testClinicContextOmitsFinancialFields(): void
|
||||
{
|
||||
[$doctor, $clinic] = $this->makeDoctorInClinic();
|
||||
|
||||
$body = $this->authJson('GET', "/api/v1/dashboard/doctor?clinic_uuid={$clinic->getUuid()}", $doctor->getUser());
|
||||
self::assertSame(200, $this->responseCode());
|
||||
|
||||
$stats = $body['data']['stats'] ?? [];
|
||||
foreach (self::FINANCIAL_KEYS as $key) {
|
||||
self::assertArrayNotHasKey($key, $stats, "«{$key}» نباید در محیط کلینیک برگردد");
|
||||
}
|
||||
|
||||
self::assertArrayNotHasKey('revenue_by_day', $body['data']['charts'] ?? []);
|
||||
self::assertSame('clinic', $body['data']['context']['type'] ?? null);
|
||||
self::assertSame([], $body['data']['clinics'] ?? null, 'فهرست کلینیکها فقط در محیط شخصی معنا دارد');
|
||||
}
|
||||
|
||||
public function testPersonalContextStillReturnsFinancialFields(): void
|
||||
{
|
||||
[$doctor] = $this->makeDoctorInClinic();
|
||||
|
||||
$body = $this->authJson('GET', '/api/v1/dashboard/doctor', $doctor->getUser());
|
||||
self::assertSame(200, $this->responseCode());
|
||||
|
||||
$stats = $body['data']['stats'] ?? [];
|
||||
foreach (self::FINANCIAL_KEYS as $key) {
|
||||
self::assertArrayHasKey($key, $stats);
|
||||
}
|
||||
|
||||
self::assertSame('personal', $body['data']['context']['type'] ?? null);
|
||||
}
|
||||
|
||||
public function testForeignClinicUuidFallsBackToPersonalScope(): void
|
||||
{
|
||||
[$doctor] = $this->makeDoctorInClinic();
|
||||
$outsider = new Clinic($this->createUser(['ROLE_USER', 'ROLE_CLINIC']));
|
||||
$outsider->setName('کلینیک بیگانه');
|
||||
$this->em->persist($outsider);
|
||||
$this->em->flush();
|
||||
|
||||
$body = $this->authJson('GET', "/api/v1/dashboard/doctor?clinic_uuid={$outsider->getUuid()}", $doctor->getUser());
|
||||
|
||||
self::assertSame(200, $this->responseCode());
|
||||
self::assertSame('personal', $body['data']['context']['type'] ?? null, 'کلینیکی که عضوش نیست، محیط نمیسازد');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user