Ran linter and fixed invite flow

Author: roncodes

migrations/2026_04_05_000001_add_scheduled_status_to_schedule_items_table.php

@@ -13,8 +13,7 @@
  * 'pending' is retained for backwards compatibility (e.g. manually-created items
  * that have not yet been confirmed).
  */
-return new class extends Migration
-{
+return new class extends Migration {
     public function up(): void
     {
         DB::statement("

migrations/2026_04_06_000002_add_company_uuid_to_schedule_items_table.php

@@ -2,8 +2,8 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration {
     public function up(): void
@@ -13,13 +13,13 @@ public function up(): void
         });
 
         // Backfill from the parent schedule
-        DB::statement("
+        DB::statement('
             UPDATE schedule_items si
             JOIN schedules s ON s.uuid = si.schedule_uuid
             SET si.company_uuid = s.company_uuid
             WHERE si.company_uuid IS NULL
               AND si.schedule_uuid IS NOT NULL
-        ");
+        ');
     }
 
     public function down(): void

src/Http/Controllers/Internal/v1/ScheduleExceptionController.php

@@ -19,8 +19,6 @@ class ScheduleExceptionController extends FleetbaseController
 
     /**
      * The ScheduleService instance.
-     *
-     * @var ScheduleService
      */
     protected ScheduleService $scheduleService;
 

src/Http/Controllers/Internal/v1/ScheduleTemplateController.php

@@ -20,8 +20,6 @@ class ScheduleTemplateController extends FleetbaseController
 
     /**
      * The ScheduleService instance.
-     *
-     * @var ScheduleService
      */
     protected ScheduleService $scheduleService;
 

src/Http/Controllers/Internal/v1/UserController.php

@@ -372,6 +372,17 @@ public function inviteUser(InviteUserRequest $request)
 
         $user = User::create($data);
 
+        // Set user type
+        $user->setUserType('user');
+
+        // Assign to user
+        $user->assignCompany($company, $request->input('user.role_uuid'));
+
+        // Assign role if set
+        if ($request->filled('user.role_uuid')) {
+            $user->assignSingleRole($request->input('user.role_uuid'));
+        }
+
         $invitation = Invite::create([
             'company_uuid'    => $company->uuid,
             'created_by_uuid' => session('user'),
@@ -381,6 +392,7 @@ public function inviteUser(InviteUserRequest $request)
             'recipients'      => [$user->email],
             'reason'          => 'join_company',
             'meta'            => array_filter(['role_uuid' => $request->input('user.role_uuid') ?? $request->input('user.role')]),
+            'expires_at'      => now()->addHours(48),
         ]);
 
         $user->notify(new UserInvited($invitation));
@@ -397,10 +409,8 @@ public function inviteUser(InviteUserRequest $request)
      * (the dedicated invite endpoint). Keeping the logic in one place ensures
      * both paths behave identically.
      *
-     * @param User    $user    The existing user to invite.
-     * @param Request $request The originating HTTP request.
-     *
-     * @return \Illuminate\Http\JsonResponse
+     * @param User    $user    the existing user to invite
+     * @param Request $request the originating HTTP request
      */
     private function inviteExistingUser(User $user, Request $request): \Illuminate\Http\JsonResponse
     {
@@ -424,6 +434,7 @@ private function inviteExistingUser(User $user, Request $request): \Illuminate\H
             'recipients'      => [$user->email],
             'reason'          => 'join_company',
             'meta'            => array_filter(['role_uuid' => $request->input('user.role_uuid') ?? $request->input('user.role')]),
+            'expires_at'      => now()->addHours(48),
         ]);
 
         $user->notify(new UserInvited($invitation));
@@ -456,6 +467,7 @@ public function resendInvitation(ResendUserInvite $request)
             'protocol'        => 'email',
             'recipients'      => [$user->email],
             'reason'          => 'join_company',
+            'expires_at'      => now()->addHours(48),
         ]);
 
         // notify user
@@ -520,6 +532,9 @@ public function acceptCompanyInvite(AcceptCompanyInvite $request)
             }
         }
 
+        // Delete the invite
+        $invite->delete();
+
         // Switch the user's active company to the one they just joined.
         // This ensures that subsequent calls to /users/me resolve the
         // companyUser relationship (and therefore role/policies) against

src/Http/Filter/ScheduleExceptionFilter.php

@@ -60,6 +60,7 @@ public function subjectType(?string $type)
 
         if (Str::contains($type, '\\')) {
             $this->builder->where('subject_type', $type);
+
             return;
         }
 

src/Http/Filter/ScheduleFilter.php

@@ -36,6 +36,7 @@ public function subjectType(?string $type)
         // If it already looks like a fully-qualified class name, use as-is
         if (Str::contains($type, '\\')) {
             $this->builder->where('subject_type', $type);
+
             return;
         }
 

src/Http/Filter/ScheduleItemFilter.php

@@ -67,6 +67,7 @@ public function assigneeType(?string $type)
 
         if (Str::contains($type, '\\')) {
             $this->builder->where('assignee_type', $type);
+
             return;
         }
 

src/Http/Filter/ScheduleTemplateFilter.php

@@ -33,6 +33,7 @@ public function subjectType(?string $type)
 
         if (Str::contains($type, '\\')) {
             $this->builder->where('subject_type', $type);
+
             return;
         }
 

src/Http/Filter/UserFilter.php

@@ -8,10 +8,27 @@ public function queryForInternal()
     {
         $companyUuid = $this->session->get('company');
 
-        $this->builder->whereHas(
-            'companyUsers',
-            function ($q) use ($companyUuid) {
-                $q->where('company_uuid', $companyUuid);
+        $this->builder->where(
+            function ($query) use ($companyUuid) {
+                // Include users who are already members of the company.
+                $query->whereHas(
+                    'companyUsers',
+                    function ($q) use ($companyUuid) {
+                        $q->where('company_uuid', $companyUuid);
+                    }
+                )
+                // Also include users who have a pending invite to join the company
+                // but have not yet accepted (no CompanyUser row exists yet).
+                // The invites table has no user_uuid; the link is via the user's
+                // email stored in the JSON recipients column.
+                ->orWhereExists(function ($q) use ($companyUuid) {
+                    $q->selectRaw(1)
+                      ->from('invites')
+                      ->whereRaw('JSON_CONTAINS(invites.recipients, JSON_QUOTE(users.email))')
+                      ->where('invites.company_uuid', $companyUuid)
+                      ->where('invites.reason', 'join_company')
+                      ->whereNull('invites.deleted_at');
+                });
             }
         );
     }