melabidi/alrahma_sunday_school_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix apply the plan docs/alrahma_api_fix_plan_school_year_only_v7
API CI/CD / Validate (composer + pint) (push) Successful in 3m10s
Details
API CI/CD / Test (PHPUnit) (push) Failing after 6m49s
Details
API CI/CD / Build frontend assets (push) Successful in 1m3s
Details
API CI/CD / Security audit (push) Failing after 1m0s
Details
API CI/CD / Deploy to shared hosting (PHP) (push) Has been skipped
Details

Browse Source
This commit is contained in:
root
2026-07-07 01:52:29 -04:00
parent 58726ee0e9
commit 031e499819
35 changed files with 5633 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Families/FamilyQueryService.php
+5 -4
View File
@@ -224,7 +224,7 @@ class FamilyQueryService
static fn ($g) => (int) ($g['user_id'] ?? 0),
$fam['guardians']
)));
$finance = $this->finance->loadFinancialsForParents($parentIds);
$finance = $this->finance->loadFinancialsForParents($parentIds, $schoolYear);
$fam['invoices'] = $finance['invoices'];
$fam['payments'] = $finance['payments'];
$fam['finance_summary'] = $finance['summary'];
@@ -310,13 +310,13 @@ class FamilyQueryService
$payload = $family->toArray();
$payload['guardians'] = $this->listGuardiansByFamily($familyId);
$payload['students'] = $this->studentsForFamily($familyId, $schoolYear);
$payload['emergency_contacts'] = $this->emergencyContactsForParents($payload['guardians']);
$payload['emergency_contacts'] = $this->emergencyContactsForParents($payload['guardians'], $schoolYear);
$parentIds = array_values(array_filter(array_map(
static fn ($g) => (int) ($g['user_id'] ?? 0),
$payload['guardians']
)));
$finance = $this->finance->loadFinancialsForParents($parentIds);
$finance = $this->finance->loadFinancialsForParents($parentIds, $schoolYear);
$payload['invoices'] = $finance['invoices'];
$payload['payments'] = $finance['payments'];
$payload['finance_summary'] = $finance['summary'];
@@ -346,7 +346,7 @@ class FamilyQueryService
return $rows;
}
private function emergencyContactsForParents(array $guardians): array
private function emergencyContactsForParents(array $guardians, string $schoolYear): array
{
$parentIds = array_values(array_filter(array_map(
static fn ($g) => (int) ($g['user_id'] ?? 0),
@@ -368,6 +368,7 @@ class FamilyQueryService
$rows = DB::table('emergency_contacts')
->select('id', 'parent_id', 'emergency_contact_name', 'relation', 'cellphone', 'email', 'school_year', 'semester', 'created_at', 'updated_at')
->whereIn('parent_id', $parentIds)
->when(trim($schoolYear) !== '', fn ($query) => $query->where('school_year', trim($schoolYear)))
->orderBy('updated_at', 'DESC')
->get()
->map(fn ($r) => (array) $r)