refactor(pricing): make the service the only price source
Price lists, annual tariffs and per-branch price overrides each answered
"what does this service cost?" differently, so a single date could carry
several answers and nobody could say which one was right. Price now lives
only on ServiceItem.price_rials, edited from the services page.
- drop PriceList/PriceListItem, their repositories and the seven
/api/v1/price-list(s) endpoints; PricingController keeps only quote and
the appointment price snapshot
- drop Tariff, TariffRepository, TariffService and the two
/service-items/{uuid}/tariffs endpoints; creating or repricing a service
no longer upserts a current-year tariff
- drop price_rials from ServiceBranchOverride; the entity stays for its
duration columns, which DurationCalculator and ServiceSelectionValidator
still read
- InvoiceService reads the item price directly
- PricingEngine collapses to a single source; breakdown.sources always
reports service_item, keeping the response contract intact
- remove the price-lists admin page, its route and settings-menu entry, the
tariff modal and the service detail tariffs tab; useAppointmentInvoice
moves to its own hook file
Migration drops price_lists, price_list_items, service_tariffs and the
override price column.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -7,12 +7,7 @@ use App\Auth\Entity\User;
|
||||
use App\Doctor\Service\AddressResolver;
|
||||
use App\ClinicService\Entity\ServiceItem;
|
||||
use App\ClinicService\Repository\ServiceItemRepository;
|
||||
use App\Pricing\Entity\PriceList;
|
||||
use App\Pricing\Entity\PriceListItem;
|
||||
use App\Pricing\Repository\PriceListItemRepository;
|
||||
use App\Pricing\Repository\PriceListRepository;
|
||||
use App\Pricing\Repository\PriceSnapshotRepository;
|
||||
use App\Patient\Repository\PatientRecordRepository;
|
||||
use App\Pricing\Service\PricingEngine;
|
||||
use App\Shared\Constant\ErrorCodes;
|
||||
use App\Shared\Controller\BaseController;
|
||||
@@ -31,160 +26,14 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
class PricingController extends BaseController
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PriceListRepository $lists,
|
||||
private readonly PriceListItemRepository $listItems,
|
||||
private readonly PriceSnapshotRepository $snapshots,
|
||||
private readonly ServiceItemRepository $items,
|
||||
private readonly PricingEngine $engine,
|
||||
private readonly AddressResolver $branches,
|
||||
private readonly AddressResolver $branches,
|
||||
private readonly TenantOwnershipChecker $ownership,
|
||||
private readonly EntityManagerInterface $em,
|
||||
) {}
|
||||
|
||||
#[Route('/api/v1/price-lists', name: 'price_list_index', methods: ['GET'])]
|
||||
public function index(#[CurrentUser] User $user): JsonResponse
|
||||
{
|
||||
[$entityType, $entityId] = $this->branches->pair($user);
|
||||
|
||||
return $this->success(array_map(
|
||||
static fn (PriceList $l): array => $l->toArray(),
|
||||
$this->lists->findForPair($entityType, $entityId),
|
||||
));
|
||||
}
|
||||
|
||||
#[Route('/api/v1/price-lists', name: 'price_list_create', methods: ['POST'])]
|
||||
public function create(#[CurrentUser] User $user, Request $request): JsonResponse
|
||||
{
|
||||
$data = json_decode($request->getContent(), true);
|
||||
|
||||
if (!is_array($data) || !is_string($data['name'] ?? null) || trim($data['name']) === '') {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'نام لیست قیمت الزامی است', 422, 'name');
|
||||
}
|
||||
|
||||
if (!is_numeric($data['starts_at'] ?? null) || !is_numeric($data['ends_at'] ?? null)) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'بازهٔ تاریخ الزامی است', 422, 'starts_at');
|
||||
}
|
||||
|
||||
[$entityType, $entityId] = $this->branches->pair($user);
|
||||
|
||||
try {
|
||||
$list = new PriceList($entityType, $entityId, trim($data['name']), (int) $data['starts_at'], (int) $data['ends_at']);
|
||||
} catch (\InvalidArgumentException) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'پایان بازه باید بعد از شروع آن باشد', 422, 'ends_at');
|
||||
}
|
||||
|
||||
if (is_string($data['address_uuid'] ?? null)) {
|
||||
$list->setAddress($this->branches->resolve($user, $data['address_uuid']));
|
||||
}
|
||||
|
||||
$this->em->persist($list);
|
||||
$this->em->flush();
|
||||
|
||||
return $this->success($list->toArray(), 201);
|
||||
}
|
||||
|
||||
#[Route('/api/v1/price-list/{uuid}', name: 'price_list_show', methods: ['GET'])]
|
||||
public function show(#[CurrentUser] User $user, string $uuid): JsonResponse
|
||||
{
|
||||
return $this->success($this->requireList($user, $uuid)->toArray());
|
||||
}
|
||||
|
||||
#[Route('/api/v1/price-list/{uuid}', name: 'price_list_update', methods: ['PATCH'])]
|
||||
public function update(#[CurrentUser] User $user, string $uuid, Request $request): JsonResponse
|
||||
{
|
||||
$data = json_decode($request->getContent(), true);
|
||||
$list = $this->requireList($user, $uuid);
|
||||
|
||||
if (!is_array($data)) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'بدنهٔ درخواست نامعتبر است', 422);
|
||||
}
|
||||
|
||||
if (is_string($data['name'] ?? null) && trim($data['name']) !== '') {
|
||||
$list->setName(trim($data['name']));
|
||||
}
|
||||
|
||||
if (array_key_exists('active', $data)) {
|
||||
$list->setActive((bool) $data['active']);
|
||||
}
|
||||
|
||||
$this->em->flush();
|
||||
|
||||
return $this->success($list->toArray());
|
||||
}
|
||||
|
||||
#[Route('/api/v1/price-list/{uuid}', name: 'price_list_delete', methods: ['DELETE'])]
|
||||
public function delete(#[CurrentUser] User $user, string $uuid): JsonResponse
|
||||
{
|
||||
$this->em->remove($this->requireList($user, $uuid));
|
||||
$this->em->flush();
|
||||
|
||||
return $this->success(null);
|
||||
}
|
||||
|
||||
#[Route('/api/v1/price-list/{uuid}/items', name: 'price_list_items_replace', methods: ['PUT'])]
|
||||
public function replaceItems(#[CurrentUser] User $user, string $uuid, Request $request): JsonResponse
|
||||
{
|
||||
$data = json_decode($request->getContent(), true);
|
||||
|
||||
if (!is_array($data) || !is_array($data['items'] ?? null)) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'فیلد items الزامی است', 422, 'items');
|
||||
}
|
||||
|
||||
$list = $this->requireList($user, $uuid);
|
||||
$resolved = [];
|
||||
|
||||
foreach ($data['items'] as $row) {
|
||||
if (!is_array($row) || !is_string($row['service_uuid'] ?? null) || !is_numeric($row['price_rials'] ?? null)) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'service_uuid و price_rials الزامیاند', 422, 'items');
|
||||
}
|
||||
|
||||
if ((int) $row['price_rials'] < 0) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_001, 'قیمت نمیتواند منفی باشد', 422, 'price_rials');
|
||||
}
|
||||
|
||||
$resolved[] = [$this->requireItem($user, $row['service_uuid']), (int) $row['price_rials']];
|
||||
}
|
||||
|
||||
$this->listItems->deleteForList($list);
|
||||
$list->getItems()->clear();
|
||||
|
||||
foreach ($resolved as [$service, $price]) {
|
||||
$item = new PriceListItem($list, $service, $price);
|
||||
$this->em->persist($item);
|
||||
$list->getItems()->add($item);
|
||||
}
|
||||
|
||||
$list->touch();
|
||||
$this->em->flush();
|
||||
|
||||
return $this->success($list->toArray());
|
||||
}
|
||||
|
||||
/**
|
||||
* فعالسازی با بررسی تداخل: دو لیستِ فعالِ همپوشان یعنی یک تاریخ دو قیمت دارد و
|
||||
* هیچکس نمیتواند بگوید کدام درست است.
|
||||
*/
|
||||
#[Route('/api/v1/price-list/{uuid}/activate', name: 'price_list_activate', methods: ['POST'])]
|
||||
public function activate(#[CurrentUser] User $user, string $uuid): JsonResponse
|
||||
{
|
||||
$list = $this->requireList($user, $uuid);
|
||||
$conflicts = $this->lists->findOverlapping($list);
|
||||
|
||||
if ($conflicts !== []) {
|
||||
return $this->error(
|
||||
ErrorCodes::ERR_VALIDATION_001,
|
||||
sprintf('بازهٔ این لیست با «%s» همپوشانی دارد', $conflicts[0]->getName()),
|
||||
422,
|
||||
'starts_at',
|
||||
);
|
||||
}
|
||||
|
||||
$list->setActive(true);
|
||||
$this->em->flush();
|
||||
|
||||
return $this->success($list->toArray());
|
||||
}
|
||||
|
||||
#[Route('/api/v1/pricing/quote', name: 'pricing_quote', methods: ['POST'])]
|
||||
public function quote(#[CurrentUser] User $user, Request $request): JsonResponse
|
||||
{
|
||||
@@ -236,18 +85,6 @@ class PricingController extends BaseController
|
||||
return $this->success($snapshot->toArray());
|
||||
}
|
||||
|
||||
private function requireList(User $user, string $uuid): PriceList
|
||||
{
|
||||
$list = $this->lists->findByUuid($uuid);
|
||||
[$entityType, $entityId] = $this->branches->pair($user);
|
||||
|
||||
if ($list === null || !$this->ownership->belongsToPair($entityType, $entityId, $list)) {
|
||||
throw new AppException(ErrorCodes::ERR_NOT_FOUND_001, 'لیست قیمت یافت نشد', 404);
|
||||
}
|
||||
|
||||
return $list;
|
||||
}
|
||||
|
||||
private function requireItem(User $user, string $uuid): ServiceItem
|
||||
{
|
||||
$item = $this->items->findByUuid($uuid);
|
||||
|
||||
Reference in New Issue
Block a user