update tests

app/Services/Attendance/TeacherAttendanceSubmissionService.php

@@ -9,6 +9,7 @@ use App\Models\TeacherClass;
 use Carbon\Carbon;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 use RuntimeException;
 
 class TeacherAttendanceSubmissionService
@@ -171,6 +172,20 @@ class TeacherAttendanceSubmissionService
                 $position = strtolower((string)($teacher['position'] ?? 'main'));
                 $position = $position === 'ta' ? 'ta' : 'main';
 
+                $staffPayload = [
+                    'role_name' => 'Teacher',
+                    'status' => strtolower((string)($teachersData[$teacherId]['status'] ?? 'present')),
+                    'reason' => ($teachersData[$teacherId]['reason'] ?? null) ?: null,
+                    'updated_at' => now(),
+                    'created_at' => now(),
+                ];
+                if (Schema::hasColumn('staff_attendance', 'class_section_id')) {
+                    $staffPayload['class_section_id'] = $classSectionId;
+                }
+                if (Schema::hasColumn('staff_attendance', 'position')) {
+                    $staffPayload['position'] = $position;
+                }
+
                 DB::table('staff_attendance')->updateOrInsert(
                     [
                         'user_id' => $teacherId,
@@ -178,15 +193,7 @@ class TeacherAttendanceSubmissionService
                         'semester' => $semester,
                         'school_year' => $schoolYear,
                     ],
-                    [
-                        'role_name' => 'Teacher',
-                        'class_section_id' => $classSectionId,
-                        'position' => $position,
-                        'status' => strtolower((string)($teachersData[$teacherId]['status'] ?? 'present')),
-                        'reason' => ($teachersData[$teacherId]['reason'] ?? null) ?: null,
-                        'updated_at' => now(),
-                        'created_at' => now(),
-                    ]
+                    $staffPayload
                 );
             }
 

app/Services/Auth/ApiLoginSecurityService.php

@@ -129,7 +129,7 @@ class ApiLoginSecurityService
     /**
      * Top-level JSON body for API login success responses.
      *
-     * @return array{status: true, token: string, user: array{id: int, name: string, roles: object, class_section_id: ?int, class_section_name: ?string}}
+     * @return array{status: true, token: string, access_token: string, token_type: string, expires_in: int, user: array{id: int, name: string, firstname: ?string, lastname: ?string, email: ?string, roles: object, class_section_id: ?int, class_section_name: ?string}}
      */
     public function buildLoginResponse(User $user, string $jwtToken): array
     {
@@ -139,10 +139,19 @@ class ApiLoginSecurityService
 
         return [
             'status' => true,
+            // Keep both names. Older clients read `token`; JWT-aware clients often read
+            // `access_token`. Removing either one just makes login fail in a new and
+            // irritatingly avoidable way.
             'token' => $jwtToken,
+            'access_token' => $jwtToken,
+            'token_type' => 'bearer',
+            'expires_in' => (int) config('jwt.ttl') * 60,
             'user' => [
                 'id' => (int) $user->id,
                 'name' => $fullName,
+                'firstname' => $user->firstname,
+                'lastname' => $user->lastname,
+                'email' => $user->email,
                 'roles' => $this->rolesToObjectMap($roleNames),
                 'class_section_id' => $teacherContext['class_section_id'],
                 'class_section_name' => $teacherContext['class_section_name'],

app/Services/Parents/ParentAttendanceReportCalendarService.php

@@ -15,17 +15,17 @@ class ParentAttendanceReportCalendarService
      */
     public function computeSundays(int $weeksBefore = 4, int $weeksAfter = 26): array
     {
-        $today = new \DateTime('today');
+        $today = now()->startOfDay();
         $dow = (int) $today->format('w');
 
-        $thisSunday = clone $today;
+        $thisSunday = $today->copy();
         if ($dow !== 0) {
             $thisSunday->modify('last sunday');
         }
 
-        $default = clone $today;
+        $default = $today->copy();
         if ($dow !== 0) {
-            $default->modify('next sunday');
+            $default = $default->copy()->modify('next sunday');
         }
 
         $schoolYear = (string) ($this->configService->context()['school_year'] ?? '');
@@ -33,13 +33,13 @@ class ParentAttendanceReportCalendarService
 
         $dates = [];
         for ($i = $weeksBefore; $i >= 1; $i--) {
-            $dates[] = (clone $thisSunday)->modify('-' . $i . ' week');
+            $dates[] = $thisSunday->copy()->modify('-' . $i . ' week');
         }
 
-        $cursor = clone $thisSunday;
+        $cursor = $thisSunday->copy();
         while ($cursor <= $cap) {
-            $dates[] = clone $cursor;
-            $cursor->modify('+1 week');
+            $dates[] = $cursor->copy();
+            $cursor = $cursor->copy()->modify('+1 week');
         }
 
         $rangeStart = reset($dates);
@@ -108,7 +108,7 @@ class ParentAttendanceReportCalendarService
 
     public function firstSundayOfJune(string $schoolYear): \DateTime
     {
-        $today = new \DateTime('today');
+        $today = now()->startOfDay();
         $endYear = null;
         if (preg_match('/^(\\d{4})\\D(\\d{4})$/', $schoolYear, $m)) {
             $endYear = (int) $m[2];
@@ -118,10 +118,11 @@ class ParentAttendanceReportCalendarService
             $endYear = ((int) $today->format('n') > 6) ? ($y + 1) : $y;
         }
 
-        $juneFirst = new \DateTime(sprintf('%04d-06-01', $endYear));
+        $juneFirst = now()->parse(sprintf('%04d-06-01', $endYear))->startOfDay();
         if ((int) $juneFirst->format('w') !== 0) {
-            $juneFirst->modify('next sunday');
+            $juneFirst = $juneFirst->copy()->modify('next sunday');
         }
+
         return $juneFirst;
     }
 }

app/Services/Parents/ParentRegistrationService.php

@@ -82,6 +82,7 @@ class ParentRegistrationService
             $emergencyContacts,
             $schoolYear,
             $semester,
+            $ageReference,
             &$createdStudentIds,
             &$skippedStudents
         ) {

app/Services/Payments/PaymentNotificationDispatchService.php

@@ -16,7 +16,7 @@ class PaymentNotificationDispatchService
         $notification = Notification::query()->create([
             'title' => $title,
             'message' => $message,
-            'target_group' => 'user',
+            'target_group' => 'everyone',
             'delivery_channels' => $channels,
             'priority' => 'normal',
             'status' => 'sent',

app/Services/SemesterRangeService.php

@@ -67,7 +67,9 @@ class SemesterRangeService
         $lastDay = $this->configService->getLastSchoolDay();
 
         try {
-            $target = new DateTimeImmutable($date ?: 'now');
+            $target = ($date !== null && $date !== '')
+                ? new DateTimeImmutable($date)
+                : DateTimeImmutable::createFromInterface(now());
         } catch (\Throwable) {
             return '';
         }

app/Services/Teachers/TeacherDashboardService.php

@@ -96,7 +96,7 @@ class TeacherDashboardService
                 ->whereIn('tc.class_section_id', $classSectionIds)
                 ->where('tc.school_year', $schoolYear)
                 ->orderBy('tc.class_section_id')
-                ->orderByRaw("FIELD(tc.position,'main','ta')")
+                ->orderByRaw("CASE tc.position WHEN 'main' THEN 0 WHEN 'ta' THEN 1 ELSE 2 END")
                 ->orderBy('u.firstname')
                 ->get();