hamedandClaude Opus 5
b1b06c1b36
Section 5 of the design document rejects summing service durations. "Face + bikini" is not 15+12=27 minutes but 15+8=23 — preparation and settling the patient do not happen twice. Seven wasted minutes times twenty appointments a day is an hour of capacity lost daily, and AppointmentController was doing exactly that plain sum. Each item now carries a solo duration and an additional duration. One item counts at its solo duration and the rest at their additional; the anchor is the item with the *largest* solo duration rather than the first one selected. Anchoring on selection order would have let the same basket cost different amounts depending on click order, so a patient could buy a shorter appointment by reordering. Largest-first is also conservative: no combination is ever under-estimated, and under-estimating pushes the next appointment on top of this one. additional_duration_minutes stays NULL by default and the entity reads NULL as "same as solo", so every existing service keeps behaving exactly as before — the 236 appointment-domain tests pass unchanged. The old duration_minutes column is kept and written in step rather than renamed, because other consumers still read it. ServiceBookingCalculator now delegates to DurationCalculator, which is the one-line change task 00 predicted when it deliberately preserved the naive sum. Selection rules are data, not policy: min/max per group is a number, and "bikini does not combine with full body" is a relation. Putting either in a rules engine means several rules per service and nobody able to explain a rejection. Validation returns *all* errors at once rather than the first, since a user with three problems should not make three round trips. Prerequisite cycles are rejected at write time — storing both "A requires B" and "B requires A" would make every selection permanently invalid. Named CatalogCategory, not ServiceCategory: that name is already an insurance enum (outpatient/inpatient) living on ServiceItem itself, so the two would have collided in the same file's imports. Also fixed a defect the tests caught: breakdown() used $overrides[$id]?->… on a key that may not exist, which warns instead of yielding null. 1175 tests / 3289 assertions. phpstan measured at 14 errors both with and without this change (verified by stashing). Slot-mode frozen contract green. The admin UI tab for groups and relations is not built; the checklist records it as outstanding with a target. The backend is complete and POST /service-selection/validate is consumable without it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
94 lines
4.0 KiB
PHP
94 lines
4.0 KiB
PHP
<?php
|
|
|
|
namespace App\ClinicService\Entity;
|
|
|
|
use App\ClinicService\Repository\ServiceBranchOverrideRepository;
|
|
use App\Doctor\Entity\DoctorAddress;
|
|
use App\Shared\Tenant\TenantOwnedTrait;
|
|
use Doctrine\ORM\Mapping as ORM;
|
|
use Symfony\Component\Uid\Uuid;
|
|
|
|
/**
|
|
* قیمت و مدتِ اختصاصیِ یک سرویس در یک شعبه.
|
|
*
|
|
* «شعبه» همان `doctor_addresses` است ({@see docs/new_feture/taskes/_shared/branch-is-doctor-address.md}).
|
|
* هر ستون تهیپذیر است و `null` یعنی «همان مقدار خودِ سرویس» — نه صفر.
|
|
*/
|
|
#[ORM\Entity(repositoryClass: ServiceBranchOverrideRepository::class)]
|
|
#[ORM\Table(name: 'service_branch_overrides')]
|
|
#[ORM\UniqueConstraint(name: 'uniq_override_item_address', columns: ['item_id', 'address_id'])]
|
|
#[ORM\Index(columns: ['entity_type', 'entity_id'], name: 'idx_override_tenant')]
|
|
class ServiceBranchOverride
|
|
{
|
|
use TenantOwnedTrait;
|
|
|
|
#[ORM\Id]
|
|
#[ORM\GeneratedValue]
|
|
#[ORM\Column(type: 'integer')]
|
|
private ?int $id = null;
|
|
|
|
#[ORM\Column(type: 'string', length: 36, unique: true)]
|
|
private string $uuid;
|
|
|
|
#[ORM\ManyToOne(targetEntity: ServiceItem::class)]
|
|
#[ORM\JoinColumn(name: 'item_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
|
|
private ServiceItem $item;
|
|
|
|
#[ORM\ManyToOne(targetEntity: DoctorAddress::class)]
|
|
#[ORM\JoinColumn(name: 'address_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
|
|
private DoctorAddress $address;
|
|
|
|
#[ORM\Column(name: 'price_rials', type: 'bigint', nullable: true)]
|
|
private ?int $priceRials = null;
|
|
|
|
#[ORM\Column(name: 'solo_duration_minutes', type: 'smallint', nullable: true)]
|
|
private ?int $soloDurationMinutes = null;
|
|
|
|
#[ORM\Column(name: 'additional_duration_minutes', type: 'smallint', nullable: true)]
|
|
private ?int $additionalDurationMinutes = null;
|
|
|
|
#[ORM\Column(name: 'created_at', type: 'integer')]
|
|
private int $createdAt;
|
|
|
|
#[ORM\Column(name: 'updated_at', type: 'integer')]
|
|
private int $updatedAt;
|
|
|
|
public function __construct(ServiceItem $item, DoctorAddress $address)
|
|
{
|
|
$this->uuid = Uuid::v4()->toRfc4122();
|
|
$this->item = $item;
|
|
$this->address = $address;
|
|
$this->createdAt = time();
|
|
$this->updatedAt = time();
|
|
|
|
$this->assignTenantPair($item->getSection()->getEntityType(), $item->getSection()->getEntityId());
|
|
}
|
|
|
|
public function getId(): ?int { return $this->id; }
|
|
public function getUuid(): string { return $this->uuid; }
|
|
public function getItem(): ServiceItem { return $this->item; }
|
|
public function getAddress(): DoctorAddress { return $this->address; }
|
|
public function getPriceRials(): ?int { return $this->priceRials === null ? null : (int) $this->priceRials; }
|
|
public function getSoloDurationMinutes(): ?int { return $this->soloDurationMinutes; }
|
|
public function getAdditionalDurationMinutes(): ?int { return $this->additionalDurationMinutes; }
|
|
|
|
public function setPriceRials(?int $v): self { $this->priceRials = $v; $this->touch(); return $this; }
|
|
public function setSoloDurationMinutes(?int $v): self { $this->soloDurationMinutes = $v; $this->touch(); return $this; }
|
|
public function setAdditionalDurationMinutes(?int $v): self { $this->additionalDurationMinutes = $v; $this->touch(); return $this; }
|
|
|
|
private function touch(): void { $this->updatedAt = time(); }
|
|
|
|
public function toArray(): array
|
|
{
|
|
return [
|
|
'uuid' => $this->uuid,
|
|
'item_uuid' => $this->item->getUuid(),
|
|
'address_uuid' => $this->address->getUuid(),
|
|
'address_name' => $this->address->getName(),
|
|
'price_rials' => $this->getPriceRials(),
|
|
'solo_duration_minutes' => $this->soloDurationMinutes,
|
|
'additional_duration_minutes' => $this->additionalDurationMinutes,
|
|
];
|
|
}
|
|
}
|