feat(appointments): backend for clinic workflow (Figma نوبتها) — phase A
Extend Appointment for the clinic-facing appointments area:
- New nullable relations service_section/service_item/staff (بخش/سرویس/پرسنل)
plus deposit_required/deposit_amount_rials (بیعانه) and is_reserve.
- New statuses following_up (در حال پیگیری) and salon (سالن) with day-of
transition rules; reserve entries never occupy a slot (several reserves may
share one day), enforced in refreshActiveSlotKey.
- rescheduleTo(slotStart, slotEnd, isReserve) keeps active_slot_key consistent
for جا به جایی and reserve transfers.
- New PATCH /api/v1/appointment/{uuid}: partial update covering edit, slot
move (409 on taken slot, race backstop on the unique key), reserve toggle,
patient swap (جایگزینی) and optional status transition; optimistic lock via
version like the status endpoint.
- POST /my/appointment now accepts the workflow fields and is_reserve
(day-level entry: no past-slot rule, no atomic slot booking); GET
/my/appointments gains reserve=1 and returns the new fields per row.
Migration Version20260713195434 (+ mirrored on db_test). Docs updated.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
hamed
@@ -19,6 +19,7 @@ class Appointment
|
||||
// ↘ cancelled_by_doctor / cancelled_by_user
|
||||
// pending → expired (cron)
|
||||
// confirmed → no_show
|
||||
// Day-of clinic workflow (Figma نوبتها): confirmed → following_up → salon → completed
|
||||
public const STATUS_PENDING = 'pending';
|
||||
public const STATUS_CONFIRMED = 'confirmed';
|
||||
public const STATUS_COMPLETED = 'completed';
|
||||
@@ -26,12 +27,16 @@ class Appointment
|
||||
public const STATUS_CANCELLED_BY_USER = 'cancelled_by_user';
|
||||
public const STATUS_EXPIRED = 'expired';
|
||||
public const STATUS_NO_SHOW = 'no_show';
|
||||
public const STATUS_FOLLOWING_UP = 'following_up'; // در حال پیگیری
|
||||
public const STATUS_SALON = 'salon'; // سالن (در اتاق انتظار)
|
||||
|
||||
public const PAYMENT_TTL = 900; // 15 minutes to pay before a pending booking expires
|
||||
|
||||
public const ALLOWED_TRANSITIONS = [
|
||||
self::STATUS_PENDING => [self::STATUS_CONFIRMED, self::STATUS_CANCELLED_BY_DOCTOR, self::STATUS_CANCELLED_BY_USER, self::STATUS_EXPIRED],
|
||||
self::STATUS_CONFIRMED => [self::STATUS_COMPLETED, self::STATUS_CANCELLED_BY_DOCTOR, self::STATUS_CANCELLED_BY_USER, self::STATUS_NO_SHOW],
|
||||
self::STATUS_PENDING => [self::STATUS_CONFIRMED, self::STATUS_FOLLOWING_UP, self::STATUS_CANCELLED_BY_DOCTOR, self::STATUS_CANCELLED_BY_USER, self::STATUS_EXPIRED],
|
||||
self::STATUS_CONFIRMED => [self::STATUS_COMPLETED, self::STATUS_FOLLOWING_UP, self::STATUS_SALON, self::STATUS_CANCELLED_BY_DOCTOR, self::STATUS_CANCELLED_BY_USER, self::STATUS_NO_SHOW],
|
||||
self::STATUS_FOLLOWING_UP => [self::STATUS_CONFIRMED, self::STATUS_SALON, self::STATUS_COMPLETED, self::STATUS_CANCELLED_BY_DOCTOR, self::STATUS_CANCELLED_BY_USER, self::STATUS_NO_SHOW],
|
||||
self::STATUS_SALON => [self::STATUS_COMPLETED, self::STATUS_FOLLOWING_UP, self::STATUS_CANCELLED_BY_DOCTOR, self::STATUS_CANCELLED_BY_USER, self::STATUS_NO_SHOW],
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -107,6 +112,37 @@ class Appointment
|
||||
#[ORM\Column(name: 'booking_representation_id', type: 'integer', nullable: true)]
|
||||
private ?int $bookingRepresentationId = null;
|
||||
|
||||
// ── Clinic-workflow fields (Figma نوبتها) ────────────────────────────────
|
||||
|
||||
/** بخش — clinic service section this appointment belongs to. */
|
||||
#[ORM\ManyToOne(targetEntity: \App\ClinicService\Entity\ServiceSection::class)]
|
||||
#[ORM\JoinColumn(name: 'service_section_id', nullable: true, onDelete: 'SET NULL')]
|
||||
private ?\App\ClinicService\Entity\ServiceSection $serviceSection = null;
|
||||
|
||||
/** سرویس — concrete service item to perform. */
|
||||
#[ORM\ManyToOne(targetEntity: \App\ClinicService\Entity\ServiceItem::class)]
|
||||
#[ORM\JoinColumn(name: 'service_item_id', nullable: true, onDelete: 'SET NULL')]
|
||||
private ?\App\ClinicService\Entity\ServiceItem $serviceItem = null;
|
||||
|
||||
/** پرسنل — staff member assigned to the appointment. */
|
||||
#[ORM\ManyToOne(targetEntity: \App\Staff\Entity\ClinicStaff::class)]
|
||||
#[ORM\JoinColumn(name: 'staff_id', nullable: true, onDelete: 'SET NULL')]
|
||||
private ?\App\Staff\Entity\ClinicStaff $staff = null;
|
||||
|
||||
/** بیعانه مورد نیاز است. */
|
||||
#[ORM\Column(name: 'deposit_required', type: 'boolean', options: ['default' => false])]
|
||||
private bool $depositRequired = false;
|
||||
|
||||
#[ORM\Column(name: 'deposit_amount_rials', type: 'integer', nullable: true)]
|
||||
private ?int $depositAmountRials = null;
|
||||
|
||||
/**
|
||||
* Reserve-list entry (نوبت رزرو): booked for a day, not a time slot.
|
||||
* slotStart/slotEnd hold that day's midnight so date queries keep working.
|
||||
*/
|
||||
#[ORM\Column(name: 'is_reserve', type: 'boolean', options: ['default' => false])]
|
||||
private bool $isReserve = false;
|
||||
|
||||
#[ORM\Column(name: 'created_at', type: 'integer')]
|
||||
private int $createdAt;
|
||||
|
||||
@@ -131,7 +167,9 @@ class Appointment
|
||||
*/
|
||||
private function refreshActiveSlotKey(): void
|
||||
{
|
||||
$this->activeSlotKey = in_array($this->status, self::SLOT_OCCUPYING_STATUSES, true)
|
||||
// Reserve-list entries are day-level wishes, not slot bookings — they
|
||||
// never occupy a slot, so several reserves may share the same day.
|
||||
$this->activeSlotKey = !$this->isReserve && in_array($this->status, self::SLOT_OCCUPYING_STATUSES, true)
|
||||
? sprintf('%d:%d', $this->doctor->getId(), $this->slotStart)
|
||||
: null;
|
||||
}
|
||||
@@ -163,6 +201,36 @@ class Appointment
|
||||
public function setPatientGender(?string $v): self { $this->patientGender = $v; return $this; }
|
||||
public function setPatientReason(?string $v): self { $this->patientReason = $v; return $this; }
|
||||
|
||||
public function getServiceSection(): ?\App\ClinicService\Entity\ServiceSection { return $this->serviceSection; }
|
||||
public function getServiceItem(): ?\App\ClinicService\Entity\ServiceItem { return $this->serviceItem; }
|
||||
public function getStaff(): ?\App\Staff\Entity\ClinicStaff { return $this->staff; }
|
||||
public function isDepositRequired(): bool { return $this->depositRequired; }
|
||||
public function getDepositAmountRials(): ?int { return $this->depositAmountRials; }
|
||||
public function isReserve(): bool { return $this->isReserve; }
|
||||
|
||||
public function setServiceSection(?\App\ClinicService\Entity\ServiceSection $v): self { $this->serviceSection = $v; return $this; }
|
||||
public function setServiceItem(?\App\ClinicService\Entity\ServiceItem $v): self { $this->serviceItem = $v; return $this; }
|
||||
public function setStaff(?\App\Staff\Entity\ClinicStaff $v): self { $this->staff = $v; return $this; }
|
||||
public function setDepositRequired(bool $v): self { $this->depositRequired = $v; return $this; }
|
||||
public function setDepositAmountRials(?int $v): self { $this->depositAmountRials = $v; return $this; }
|
||||
|
||||
/**
|
||||
* Move the appointment to a new slot (جا به جایی نوبت) and/or flip its
|
||||
* reserve flag (انتقال به لیست رزرو و بالعکس). Goes through here — not raw
|
||||
* setters — so active_slot_key stays consistent with the new slot.
|
||||
*/
|
||||
public function rescheduleTo(int $slotStart, int $slotEnd, ?bool $isReserve = null): self
|
||||
{
|
||||
$this->slotStart = $slotStart;
|
||||
$this->slotEnd = $slotEnd;
|
||||
if ($isReserve !== null) {
|
||||
$this->isReserve = $isReserve;
|
||||
}
|
||||
$this->updatedAt = time();
|
||||
$this->refreshActiveSlotKey();
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function markPendingWithTtl(int $ttl): self
|
||||
{
|
||||
$this->expiresAt = time() + $ttl;
|
||||
@@ -231,6 +299,12 @@ class Appointment
|
||||
'patient_national_code' => $this->patientNationalCode,
|
||||
'patient_gender' => $this->patientGender,
|
||||
'patient_reason' => $this->patientReason,
|
||||
'service_section' => $this->serviceSection ? ['uuid' => $this->serviceSection->getUuid(), 'name' => $this->serviceSection->getName()] : null,
|
||||
'service_item' => $this->serviceItem ? ['uuid' => $this->serviceItem->getUuid(), 'name' => $this->serviceItem->getName()] : null,
|
||||
'staff' => $this->staff ? ['uuid' => $this->staff->getUuid(), 'full_name' => $this->staff->getFullName()] : null,
|
||||
'deposit_required' => $this->depositRequired,
|
||||
'deposit_amount_rials' => $this->depositAmountRials,
|
||||
'is_reserve' => $this->isReserve,
|
||||
'version' => $this->version,
|
||||
'created_at' => $this->createdAt,
|
||||
'updated_at' => $this->updatedAt,
|
||||
|
||||
Reference in New Issue
Block a user