feat(availability): resource ordering strategies, and a real fix for the flaky suite
Strategies (task 06 debt, task 12 dependency) - ResourcePicker orders candidates; it deliberately does not choose. Only the engine knows which resource actually fits this slot and which was already taken by another role, and a strategy that picked would have to duplicate both checks - Four implementations behind a tagged iterator: first_available (name order, the previous behaviour and still the default because it is predictable), least_gap, least_loaded, same_as_previous - least_gap and least_loaded are deliberate opposites and both are correct; choosing between them is a business decision, so it lives in settings - same_as_previous lifts a course's preferred resource to the front and keeps everyone else behind it. A preference, not a filter: forcing the same operator would make the patient wait two weeks, which is worse than a different operator - Availability accepts course_uuid to supply that preference, closing the dependency task 12 recorded against task 06 - An unknown strategy falls back at search time but is rejected at save time. Stale settings must not stop bookings; a user typing a wrong value must not believe it took effect Test suite flake createUser() retries on a mobile-number collision — db_test is never reset and holds tens of thousands of users, so the random draw does collide. The failed INSERT closes the EntityManager, and the retry asked the container for it again, which hands back the *same closed instance*. So the retry threw, and every later test in that process inherited a dead manager. That is the intermittent "EntityManager is closed" on an unrelated, always-different test that made roughly half of full runs red and never reproduced in a subset. Resetting the registry gives a live manager back. UserCollisionRetryTest pins it by closing the manager on purpose. Two consecutive full runs are green: 1334 tests. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -39,6 +39,7 @@ class AppointmentSettingsController extends BaseController
|
||||
private readonly ClinicRepository $clinicRepo,
|
||||
private readonly \App\ClinicService\Repository\ServiceItemRepository $itemRepo,
|
||||
private readonly \App\Resource\Repository\ClinicResourceRepository $resourceRepo,
|
||||
private readonly \App\Appointment\Availability\Picker\ResourcePickerRegistry $pickers,
|
||||
private readonly \App\Clinic\Security\ClinicDoctorPermissionChecker $permChecker,
|
||||
private readonly \App\Secretary\Security\SecretaryAccessChecker $secretaryAccess,
|
||||
) {}
|
||||
@@ -108,6 +109,37 @@ class AppointmentSettingsController extends BaseController
|
||||
return $this->resourceRepo->countActiveForPair($type, (int) $id) === 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* استراتژی ناشناخته هنگام **ذخیره** رد میشود، نه هنگام اجرا.
|
||||
*
|
||||
* موتور در زمان جستجو به پیشفرض برمیگردد تا تنظیماتِ قدیمی نوبتدهی را نخواباند؛
|
||||
* ولی کاربری که همین حالا مقدار غلط میفرستد باید بداند، وگرنه فکر میکند
|
||||
* استراتژیاش اعمال میشود در حالی که نمیشود.
|
||||
*/
|
||||
private function invalidStrategy(array $meta): bool
|
||||
{
|
||||
$code = $meta['resource_strategy'] ?? null;
|
||||
|
||||
return is_string($code) && $code !== '' && !$this->pickers->has($code);
|
||||
}
|
||||
|
||||
private function invalidStrategyError(): JsonResponse
|
||||
{
|
||||
return $this->error(
|
||||
ErrorCodes::ERR_VALIDATION_001,
|
||||
'استراتژی انتخاب منبع شناخته نمیشود',
|
||||
422,
|
||||
'resource_strategy',
|
||||
);
|
||||
}
|
||||
|
||||
/** فهرست استراتژیهای موجود — ورودی انتخابگر پنل، نه فهرستی که در فرانت تکرار شود. */
|
||||
#[Route('/api/v1/appointment-settings/resource-strategies', name: 'resource_strategies', methods: ['GET'])]
|
||||
public function resourceStrategies(): JsonResponse
|
||||
{
|
||||
return $this->success($this->pickers->describe());
|
||||
}
|
||||
|
||||
private function noResourceError(): JsonResponse
|
||||
{
|
||||
return $this->error(
|
||||
@@ -191,6 +223,10 @@ class AppointmentSettingsController extends BaseController
|
||||
return $err;
|
||||
}
|
||||
|
||||
if ($this->invalidStrategy($schedule->getMeta())) {
|
||||
return $this->invalidStrategyError();
|
||||
}
|
||||
|
||||
if ($this->resourceModeHasNoResources($schedule->getMeta(), $doctor, $clinic)) {
|
||||
return $this->noResourceError();
|
||||
}
|
||||
@@ -245,6 +281,10 @@ class AppointmentSettingsController extends BaseController
|
||||
return $err;
|
||||
}
|
||||
|
||||
if ($this->invalidStrategy($schedule->getMeta())) {
|
||||
return $this->invalidStrategyError();
|
||||
}
|
||||
|
||||
if ($this->resourceModeHasNoResources($schedule->getMeta(), $schedule->getDoctor(), $clinic)) {
|
||||
return $this->noResourceError();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user