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

update the new school year model

Browse Source
This commit is contained in:
root
2026-06-07 20:01:58 -04:00
parent 6866aedf42
commit 68a5c9edca
19 changed files with 472 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Subjects/SubjectCurriculumService.php
+41 -7
View File
@@ -4,25 +4,46 @@ namespace App\Services\Subjects;
use App\Models\SchoolClass;
use App\Models\SubjectCurriculum;
use App\Services\SchoolYears\SchoolYearContextService;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
class SubjectCurriculumService
{
private SchoolYearContextService $schoolYears;
public const SUBJECT_OPTIONS = [
'islamic' => 'Islamic Studies',
'quran' => 'Quran/Arabic',
];
public function list(): array
public function __construct(?SchoolYearContextService $schoolYears = null)
{
$this->schoolYears = $schoolYears ?: app(SchoolYearContextService::class);
}
public function list(?string $schoolYear = null): array
{
$classes = SchoolClass::query()
->orderBy('class_name')
->get()
->toArray();
$entries = DB::table('subject_curriculum_items as sci')
$resolvedSchoolYear = $this->schoolYears->currentSchoolYear($schoolYear);
$entriesQuery = DB::table('subject_curriculum_items as sci')
->leftJoin('classes', 'classes.id', '=', 'sci.class_id')
->select('sci.*', 'classes.class_name')
->select('sci.*', 'classes.class_name');
if ($resolvedSchoolYear !== '' && Schema::hasColumn('subject_curriculum_items', 'school_year')) {
$entriesQuery->where(function ($query) use ($resolvedSchoolYear) {
$query->where('sci.school_year', $resolvedSchoolYear)
->orWhereNull('sci.school_year')
->orWhere('sci.school_year', '');
});
}
$entries = $entriesQuery
->orderBy('classes.class_name')
->orderBy('sci.subject')
->orderBy('sci.unit_number')
@@ -35,18 +56,25 @@ class SubjectCurriculumService
'classes' => $classes,
'entries' => $entries,
'subject_labels' => self::SUBJECT_OPTIONS,
'meta' => $this->schoolYears->options($resolvedSchoolYear),
];
}
public function store(array $payload): SubjectCurriculum
{
return SubjectCurriculum::query()->create([
$data = [
'class_id' => (int) $payload['class_id'],
'subject' => (string) $payload['subject'],
'unit_number' => $payload['unit_number'] !== null ? (int) $payload['unit_number'] : null,
'unit_title' => $payload['unit_title'] !== '' ? $payload['unit_title'] : null,
'chapter_name' => (string) $payload['chapter_name'],
]);
];
if (Schema::hasColumn('subject_curriculum_items', 'school_year')) {
$data['school_year'] = $this->schoolYears->currentSchoolYear($payload['school_year'] ?? null) ?: null;
}
return SubjectCurriculum::query()->create($data);
}
public function update(int $id, array $payload): ?SubjectCurriculum
@@ -56,13 +84,19 @@ class SubjectCurriculumService
return null;
}
$entry->update([
$data = [
'class_id' => (int) $payload['class_id'],
'subject' => (string) $payload['subject'],
'unit_number' => $payload['unit_number'] !== null ? (int) $payload['unit_number'] : null,
'unit_title' => $payload['unit_title'] !== '' ? $payload['unit_title'] : null,
'chapter_name' => (string) $payload['chapter_name'],
]);
];
if (Schema::hasColumn('subject_curriculum_items', 'school_year')) {
$data['school_year'] = $this->schoolYears->currentSchoolYear($payload['school_year'] ?? null) ?: null;
}
$entry->update($data);
return $entry;
}