hamedandClaude Opus 5
24534ec483
Section 10 of the design document, and the payoff for tasks 01–05. The engine slides a multi-segment plan across resource calendars and answers which times are actually possible, with a suggested resource for each role. Until now the only conflict the system checked was the doctor's; rooms, devices and operators did not exist. Allocation is per *role*, not per segment, and that is what returns the wasted capacity. An operator with no requirement during "waiting for the cream" is simply not examined for those minutes, so another patient can use them. The reference test encodes exactly that: patient A holds 10:00–11:00 while the operator is only busy 10:00–10:05 and 10:35–11:00, and patient B is offered a slot inside the gap with the second room assigned. The spec says the task is not verified without that scenario. One resource is chosen for every segment that needs its role, not independently per segment — otherwise the operator in segment 1 and segment 3 could be two different people and the patient would change hands mid-treatment. Occupancy is stored one row per (segment × resource) rather than one per appointment. The granularity is the whole point; a row per appointment would re-create the single-interval model the design rejects. Reserved intervals are widened by each resource's setup/cleanup, because the resource genuinely is not available then. booking_mode gains a third value, resource, alongside slot and service. It is purely additive: the default stays slot, no environment moves on its own, and a location that has not opted in keeps the untouched legacy path. The frozen slot-mode contract stays green. Performance is a test, not a hope: 30 days, 20 resources and 500 existing bookings complete well inside the 500ms budget. Every input is read once and the rest is in memory — no query inside the day or candidate loop — and candidates are generated only from the free windows of the scarcest role, which turns tens of thousands of candidates into a few hundred. An empty result is not an error and not a 404: it carries reason: "no_capacity_in_range" so the caller does not have to infer meaning from emptiness. Also fixed a genuinely intermittent test defect: NumericFieldNormalizerTest padded a random number with the three-byte Persian "۰" using byte-based str_pad, producing broken UTF-8 whenever the number was short. It failed roughly at random. The improved assertion message added earlier is what identified it immediately. 1196 tests / 3414 assertions. phpstan at its 14-error baseline. Resource-picking strategies, the availability cache and the settings UI are recorded as outstanding in the checklist with reasons — the cache in particular would be premature while the performance test passes comfortably without it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
61 lines
2.0 KiB
PHP
61 lines
2.0 KiB
PHP
<?php
|
|
|
|
namespace App\Appointment\Availability\Repository;
|
|
|
|
use App\Appointment\Availability\Entity\ResourceOccupancy;
|
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
|
use Doctrine\Persistence\ManagerRegistry;
|
|
|
|
/**
|
|
* @extends ServiceEntityRepository<ResourceOccupancy>
|
|
*/
|
|
class ResourceOccupancyRepository extends ServiceEntityRepository
|
|
{
|
|
public function __construct(ManagerRegistry $registry)
|
|
{
|
|
parent::__construct($registry, ResourceOccupancy::class);
|
|
}
|
|
|
|
/**
|
|
* اشغالهای همهٔ منابع در یک بازه — **یک کوئری برای کل جستجو**، نه یکی per منبع
|
|
* یا per روز. موتور جستجو این را یک بار میگیرد و در حافظه میبرد.
|
|
*
|
|
* @param int[] $resourceIds
|
|
* @return array<int, list<array{start: int, end: int}>> شناسهٔ منبع => بازهها
|
|
*/
|
|
public function busyByResource(array $resourceIds, int $from, int $to): array
|
|
{
|
|
if ($resourceIds === []) {
|
|
return [];
|
|
}
|
|
|
|
$rows = $this->createQueryBuilder('o')
|
|
->select('IDENTITY(o.resource) AS resource_id, o.startsAt AS starts_at, o.endsAt AS ends_at')
|
|
->where('o.resource IN (:ids)')
|
|
->andWhere('o.startsAt < :to')
|
|
->andWhere('o.endsAt > :from')
|
|
->setParameter('ids', $resourceIds)
|
|
->setParameter('from', $from)
|
|
->setParameter('to', $to)
|
|
->orderBy('o.startsAt', 'ASC')
|
|
->getQuery()
|
|
->getArrayResult();
|
|
|
|
$byResource = [];
|
|
foreach ($rows as $row) {
|
|
$byResource[(int) $row['resource_id']][] = [
|
|
'start' => (int) $row['starts_at'],
|
|
'end' => (int) $row['ends_at'],
|
|
];
|
|
}
|
|
|
|
return $byResource;
|
|
}
|
|
|
|
/** @return ResourceOccupancy[] */
|
|
public function findForAppointment(int $appointmentId): array
|
|
{
|
|
return $this->findBy(['appointmentId' => $appointmentId]);
|
|
}
|
|
}
|