hamed/clinicpro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enhance doctor address management by including clinic addresses and enforcing required fields

Browse Source
This commit is contained in:
hamed
2026-06-13 18:30:06 +03:30
parent c1c57df4ff
commit d05c070661
5 changed files with 289 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Doctor/Controller/DoctorController.php
+12 -2
View File
@@ -676,9 +676,19 @@ class DoctorController extends BaseController
return $this->error(ErrorCodes::ERR_VALIDATION_002, 'دکتر یافت نشد', 404);
}
$addresses = array_map(fn(DoctorAddress $a) => $a->toArray(), $doctor->getAddresses()->toArray());
$personalAddresses = array_map(
fn(DoctorAddress $a) => $a->toArray(),
$doctor->getAddresses()->toArray()
);
return $this->success(['data' => $addresses]);
$clinicAddresses = [];
foreach ($this->clinicRepo->findByDoctor($doctor) as $clinic) {
foreach ($this->addressRepo->findBy(['clinicId' => $clinic->getId()]) as $addr) {
$clinicAddresses[] = $addr->toArray($clinic->getName());
}
}
return $this->success(['data' => array_merge($personalAddresses, $clinicAddresses)]);
}
// ── Helpers ───────────────────────────────────────────────────────────────
src/Doctor/Entity/DoctorAddress.php
+7 -6
View File
@@ -109,14 +109,15 @@ class DoctorAddress
private function touch(): void { $this->updatedAt = time(); }
public function toArray(): array
public function toArray(?string $clinicName = null): array
{
return [
'id' => (string) $this->id,
'uuid' => $this->uuid,
'type' => $this->type,
'clinic_id' => $this->clinicId,
'name' => $this->name,
'id' => (string) $this->id,
'uuid' => $this->uuid,
'type' => $this->type,
'clinic_id' => $this->clinicId,
'clinic_name' => $clinicName,
'name' => $this->name,
'map' => [
'latitude' => $this->latitude !== null ? (string) $this->latitude : null,
'longitude' => $this->longitude !== null ? (string) $this->longitude : null,