feat(doctor): add filtering logic for clinic doctor list with pagination and sorting
This commit is contained in:
@@ -8,6 +8,7 @@ use App\Clinic\Entity\Clinic;
|
||||
use App\Clinic\Repository\ClinicRepository;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use App\Doctor\Entity\DoctorAddress;
|
||||
use App\Appointment\Repository\WeeklyScheduleRepository;
|
||||
use App\Doctor\Repository\DoctorAddressRepository;
|
||||
use App\Doctor\Repository\DoctorRepository;
|
||||
use App\DoctorService\Repository\DoctorServiceRepository;
|
||||
@@ -39,6 +40,7 @@ class ClinicController extends BaseController
|
||||
private readonly ProvinceRepository $provinceRepo,
|
||||
private readonly CityRepository $cityRepo,
|
||||
private readonly UserRepository $userRepo,
|
||||
private readonly WeeklyScheduleRepository $scheduleRepo,
|
||||
private readonly FileValidatorService $fileValidator,
|
||||
private readonly string $projectDir,
|
||||
) {}
|
||||
@@ -298,19 +300,34 @@ class ClinicController extends BaseController
|
||||
]
|
||||
)]
|
||||
#[Route('/api/v1/clinic/doctor-list/{clinicUuid}', methods: ['GET'])]
|
||||
public function doctorList(string $clinicUuid): JsonResponse
|
||||
public function doctorList(string $clinicUuid, Request $request): JsonResponse
|
||||
{
|
||||
$clinic = $this->clinicRepo->findByUuid($clinicUuid);
|
||||
if ($clinic === null) {
|
||||
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'کلینیک یافت نشد', 404);
|
||||
}
|
||||
|
||||
$result = $this->doctorRepo->findByClinicWithFilters((int) $clinic->getId(), $request->query->all());
|
||||
$clinicDoctors = $result['items'];
|
||||
|
||||
$scheduleMap = [];
|
||||
foreach ($this->scheduleRepo->findByDoctors($clinicDoctors) as $schedule) {
|
||||
$scheduleMap[$schedule->getDoctor()->getId()] = $schedule;
|
||||
}
|
||||
|
||||
$doctors = array_map(
|
||||
fn(Doctor $d) => $d->toListArray(),
|
||||
$clinic->getDoctors()->toArray()
|
||||
fn(Doctor $d) => $d->toListArray($scheduleMap[$d->getId()] ?? null),
|
||||
$clinicDoctors
|
||||
);
|
||||
|
||||
return $this->success(['data' => $doctors]);
|
||||
return $this->success([
|
||||
'data' => $doctors,
|
||||
'meta' => [
|
||||
'totalRecords' => $result['total'],
|
||||
'totalPages' => $result['totalPages'],
|
||||
'currentPage' => $result['page'],
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
#[OA\Post(
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
namespace App\Doctor\Repository;
|
||||
|
||||
use App\Auth\Entity\User;
|
||||
use App\Clinic\Entity\Clinic;
|
||||
use App\Doctor\Entity\Doctor;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\ORM\Query\Expr\Join;
|
||||
use Doctrine\ORM\Tools\Pagination\Paginator;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
|
||||
@@ -88,6 +90,55 @@ class DoctorRepository extends ServiceEntityRepository
|
||||
];
|
||||
}
|
||||
|
||||
public function findByClinicWithFilters(int $clinicId, array $filters): array
|
||||
{
|
||||
$page = max(1, (int) ($filters['page'] ?? 1));
|
||||
$limit = min(50, max(1, (int) ($filters['limit'] ?? 10)));
|
||||
$sort = strtoupper($filters['sort'] ?? 'DESC') === 'ASC' ? 'ASC' : 'DESC';
|
||||
|
||||
// Doctor has no inverse 'clinics' relation; the ManyToMany is owned by
|
||||
// Clinic.doctors. Join Clinic and match its doctors collection to d.
|
||||
$qb = $this->createQueryBuilder('d')
|
||||
->innerJoin(Clinic::class, 'c', Join::WITH, 'd MEMBER OF c.doctors')
|
||||
->leftJoin('d.specialties', 's')
|
||||
->where('c.id = :clinicId')
|
||||
->setParameter('clinicId', $clinicId)
|
||||
->distinct();
|
||||
|
||||
if (!empty($filters['specialty'])) {
|
||||
$qb->andWhere('s.id = :specialty')->setParameter('specialty', (int) $filters['specialty']);
|
||||
}
|
||||
if (!empty($filters['gender'])) {
|
||||
$qb->andWhere('d.gender = :gender')->setParameter('gender', $filters['gender']);
|
||||
}
|
||||
if (!empty($filters['degree'])) {
|
||||
$qb->andWhere('d.degree = :degree')->setParameter('degree', $filters['degree']);
|
||||
}
|
||||
if (!empty($filters['name'])) {
|
||||
$qb->andWhere('d.name LIKE :name')->setParameter('name', '%' . $filters['name'] . '%');
|
||||
}
|
||||
if (isset($filters['active'])) {
|
||||
$qb->andWhere('d.activeDoctorAppointment = :active')
|
||||
->setParameter('active', (bool) $filters['active']);
|
||||
}
|
||||
|
||||
$qb->orderBy('d.doctorRate', $sort);
|
||||
|
||||
$total = (new Paginator($qb))->count();
|
||||
$results = $qb->setFirstResult(($page - 1) * $limit)
|
||||
->setMaxResults($limit)
|
||||
->getQuery()
|
||||
->getResult();
|
||||
|
||||
return [
|
||||
'items' => $results,
|
||||
'total' => $total,
|
||||
'page' => $page,
|
||||
'limit' => $limit,
|
||||
'totalPages' => (int) ceil($total / $limit),
|
||||
];
|
||||
}
|
||||
|
||||
public function save(Doctor $doctor, bool $flush = true): void
|
||||
{
|
||||
$this->getEntityManager()->persist($doctor);
|
||||
|
||||
Reference in New Issue
Block a user