[ADVAPP-2177]: Some users who have a large number of calendar entries timeout when attempting to sync their institutional calendar using the calendar integration feature (#2117)

danharrin · web-flow · commit 3e3430cb4be6 · 2025-12-10T21:23:07.000Z
* [ADVAPP-2177]: Some users who have a large number of calendar entries timeout when attempting to sync their institutional calendar using the calendar integration feature

* Update code formatting and copyright headers
diff --git a/app-modules/meeting-center/src/Console/Commands/SyncEvents.php b/app-modules/meeting-center/src/Console/Commands/SyncEvents.php
@@ -36,7 +36,7 @@
 
 namespace AdvisingApp\MeetingCenter\Console\Commands;
 
-use AdvisingApp\MeetingCenter\Managers\CalendarManager;
+use AdvisingApp\MeetingCenter\Jobs\SyncCalendar;
 use App\Models\User;
 use Illuminate\Console\Command;
 use Spatie\Multitenancy\Commands\Concerns\TenantAware;
@@ -53,9 +53,7 @@ public function handle(): int
     {
         $user = User::where('email', config('local_development.super_admin.email'))->first();
 
-        resolve(CalendarManager::class)
-            ->driver($user->calendar->provider_type->value)
-            ->syncEvents($user->calendar);
+        dispatch(new SyncCalendar($user->calendar));
 
         return static::SUCCESS;
     }
diff --git a/app-modules/meeting-center/src/Filament/Resources/CalendarEvents/Pages/ListCalendarEvents.php b/app-modules/meeting-center/src/Filament/Resources/CalendarEvents/Pages/ListCalendarEvents.php
@@ -37,6 +37,7 @@
 namespace AdvisingApp\MeetingCenter\Filament\Resources\CalendarEvents\Pages;
 
 use AdvisingApp\MeetingCenter\Filament\Resources\CalendarEvents\CalendarEventResource;
+use AdvisingApp\MeetingCenter\Jobs\SyncCalendar;
 use AdvisingApp\MeetingCenter\Managers\CalendarManager;
 use AdvisingApp\MeetingCenter\Managers\Contracts\CalendarInterface;
 use App\Filament\Tables\Columns\IdColumn;
@@ -50,8 +51,10 @@
 use Filament\Actions\ViewAction;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\Select;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Enums\PaginationMode;
 use Filament\Tables\Filters\Filter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
@@ -121,10 +124,7 @@ public function selectCalendarAction(): Action
 
                 $calendar->saveQuietly();
 
-                //TODO: queue
-                resolve(CalendarManager::class)
-                    ->driver($calendar->provider_type->value)
-                    ->syncEvents($calendar);
+                dispatch(new SyncCalendar($calendar));
             });
     }
 
@@ -170,7 +170,9 @@ public function table(Table $table): Table
 
                 return $query->whereRelation('calendar', 'user_id', $user->id);
             })
-            ->defaultSort('starts_at');
+            ->defaultSort('starts_at')
+            ->paginationMode(PaginationMode::Cursor)
+            ->poll('10s');
     }
 
     protected function getHeaderActions(): array
@@ -182,11 +184,13 @@ protected function getHeaderActions(): array
                     /** @var User $user */
                     $user = auth()->user();
 
-                    resolve(CalendarManager::class)
-                        ->driver($user->calendar->provider_type->value)
-                        ->syncEvents($user->calendar);
+                    dispatch(new SyncCalendar($user->calendar));
 
-                    $this->dispatch('refresh-events');
+                    Notification::make()
+                        ->title('Calendar synchronization started')
+                        ->body('Your calendar is being synchronized in the background. This may take a few moments.')
+                        ->success()
+                        ->send();
                 }),
         ];
     }
diff --git a/app-modules/meeting-center/src/Jobs/SyncCalendar.php b/app-modules/meeting-center/src/Jobs/SyncCalendar.php
@@ -36,15 +36,16 @@
 
 namespace AdvisingApp\MeetingCenter\Jobs;
 
-use AdvisingApp\MeetingCenter\Managers\CalendarManager;
 use AdvisingApp\MeetingCenter\Models\Calendar;
 use App\Models\Tenant;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Bus;
 
 class SyncCalendar implements ShouldQueue, ShouldBeUnique
 {
@@ -65,8 +66,41 @@ public function uniqueId(): string
 
     public function handle(): void
     {
-        resolve(CalendarManager::class)
-            ->driver($this->calendar->provider_type->value)
-            ->syncEvents($this->calendar);
+        $now = Carbon::now();
+        $jobs = [];
+
+        // Chunk 1: Current month + next month
+        $jobs[] = new SyncCalendarPeriod(
+            $this->calendar,
+            $now->copy()->startOfMonth(),
+            $now->copy()->addMonth()->endOfMonth()
+        );
+
+        // Chunk 2: Past 2 months
+        $jobs[] = new SyncCalendarPeriod(
+            $this->calendar,
+            $now->copy()->subMonths(2)->startOfMonth(),
+            $now->copy()->subMonth()->endOfMonth()
+        );
+
+        // Chunks 3-7: Remaining future months for the next year
+        for ($month = 2; $month <= 10; $month += 2) {
+            $jobs[] = new SyncCalendarPeriod(
+                $this->calendar,
+                $now->copy()->addMonths($month)->startOfMonth(),
+                $now->copy()->addMonths($month + 1)->endOfMonth()
+            );
+        }
+
+        // Chunks 8-12: Remaining past months for the last year
+        for ($month = 3; $month <= 11; $month += 2) {
+            $jobs[] = new SyncCalendarPeriod(
+                $this->calendar,
+                $now->copy()->subMonths($month + 1)->startOfMonth(),
+                $now->copy()->subMonths($month)->endOfMonth()
+            );
+        }
+
+        Bus::chain($jobs)->dispatch();
     }
 }
diff --git a/app-modules/meeting-center/src/Jobs/SyncCalendarPeriod.php b/app-modules/meeting-center/src/Jobs/SyncCalendarPeriod.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+<COPYRIGHT>
+
+    Copyright © 2016-2025, Canyon GBS LLC. All rights reserved.
+
+    Advising App™ is licensed under the Elastic License 2.0. For more details,
+    see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
+
+    Notice:
+
+    - You may not provide the software to third parties as a hosted or managed
+      service, where the service provides users with access to any substantial set of
+      the features or functionality of the software.
+    - You may not move, change, disable, or circumvent the license key functionality
+      in the software, and you may not remove or obscure any functionality in the
+      software that is protected by the license key.
+    - You may not alter, remove, or obscure any licensing, copyright, or other notices
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
+      to applicable law.
+    - Canyon GBS LLC respects the intellectual property rights of others and expects the
+      same in return. Canyon GBS™ and Advising App™ are registered trademarks of
+      Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
+      vigorously.
+    - The software solution, including services, infrastructure, and code, is offered as a
+      Software as a Service (SaaS) by Canyon GBS LLC.
+    - Use of this software implies agreement to the license terms and conditions as stated
+      in the Elastic License 2.0.
+
+    For more information or inquiries please visit our website at
+    https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
+
+</COPYRIGHT>
+*/
+
+namespace AdvisingApp\MeetingCenter\Jobs;
+
+use AdvisingApp\MeetingCenter\Managers\CalendarManager;
+use AdvisingApp\MeetingCenter\Models\Calendar;
+use App\Models\Tenant;
+use Carbon\Carbon;
+use DateTime;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SyncCalendarPeriod implements ShouldQueue, ShouldBeUnique
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public function __construct(
+        protected Calendar $calendar,
+        protected Carbon $start,
+        protected Carbon $end,
+    ) {
+        $this->onQueue(config('meeting-center.queue'));
+    }
+
+    public function uniqueId(): string
+    {
+        return Tenant::current()->getKey() . ':' . $this->calendar->getKey() . ':' . $this->start->format('Y-m-d') . ':' . $this->end->format('Y-m-d');
+    }
+
+    public function handle(): void
+    {
+        resolve(CalendarManager::class)
+            ->driver($this->calendar->provider_type->value)
+            ->syncEvents(
+                $this->calendar,
+                new DateTime($this->start->toDateTimeString()),
+                new DateTime($this->end->toDateTimeString())
+            );
+    }
+}
diff --git a/app-modules/meeting-center/src/Managers/GoogleCalendarManager.php b/app-modules/meeting-center/src/Managers/GoogleCalendarManager.php
@@ -158,6 +158,9 @@ public function deleteEvent(CalendarEvent $event): void
 
     public function syncEvents(Calendar $calendar, ?DateTime $start = null, ?DateTime $end = null, ?int $perPage = null): void
     {
+        $start = $start ?? now()->subYear()->startOfDay();
+        $end = $end ?? now()->addYear()->endOfDay();
+
         $events = collect($this->getEvents($calendar, $start, $end, $perPage));
 
         $events
@@ -195,8 +198,13 @@ function (Event $event) use ($calendar) {
             ->whereNull('provider_id')
             ->each(fn ($event) => $this->createEvent($event));
 
-        // TODO: needs to only delete orphaned events and not previous events
-        // $calendar->events()->whereNotIn('provider_id', $events->pluck('id'))->delete();
+        // Only delete orphaned events within the synced date range
+        $calendar->events()
+            ->whereNotNull('provider_id')
+            ->where('starts_at', '>=', $start)
+            ->where('starts_at', '<', $end)
+            ->whereNotIn('provider_id', $events->pluck('id'))
+            ->delete();
     }
 
     public function revokeToken(Calendar $calendar): bool
diff --git a/app-modules/meeting-center/src/Managers/OutlookCalendarManager.php b/app-modules/meeting-center/src/Managers/OutlookCalendarManager.php
@@ -203,6 +203,9 @@ public function deleteEvent(CalendarEvent $event): void
 
     public function syncEvents(Calendar $calendar, ?DateTime $start = null, ?DateTime $end = null, ?int $perPage = null): void
     {
+        $start = $start ?? now()->subYear()->startOfDay();
+        $end = $end ?? now()->addYear()->endOfDay();
+
         $providerEvents = collect($this->getEvents($calendar, $start, $end, $perPage));
 
         $providerEvents
@@ -229,8 +232,11 @@ public function syncEvents(Calendar $calendar, ?DateTime $start = null, ?DateTim
             ->whereNull('provider_id')
             ->each(fn ($event) => $this->createEvent($event));
 
+        // Only delete orphaned events within the synced date range
         $calendar->events()
             ->whereNotNull('provider_id')
+            ->where('starts_at', '>=', $start)
+            ->where('starts_at', '<', $end)
             ->whereNotIn('provider_id', $providerEvents->map(fn (Event $event) => $event->getId()))
             ->delete();
     }
