Command Efficiency (#357)

* Initializing Command_Efficiency for empty Pull Request

* Add indexes to calendars table to greatly speed up queries

* Ensure we upgrade filament when we upgrade deps

* Greatly increase the efficiency of demand-payment command

* Switch to stechstudio/filament-impersonate

app/Console/Commands/DisableUnpaidCalendars.php

@@ -4,6 +4,7 @@
 
 use App\Models\Calendar;
 use App\Models\User;
+use DB;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -42,38 +43,62 @@ public function handle()
     {
         $updated = Calendar::with(['user', 'user.subscriptions'])
             ->where('disabled', '=', true)
-            ->whereHas('user.subscriptions', function(Builder $query) {
+            ->whereHas('user.subscriptions', function (Builder $query) {
                 $query->where('stripe_status', '=', 'active');
             })
             ->update([
                 'disabled' => false
             ]);
 
-        if($updated > 0) {
+        if ($updated > 0) {
             $this->info("Re-enabled " . $updated . " calendars.");
         }
 
-        User::with('subscriptions')
-            ->whereHas('subscriptions', function(Builder $query) {
-                $query->where('stripe_status', '!=', 'active');
+        $this->disableCalendarsWhen('<', '2020-11-08', 15);
+        $this->disableCalendarsWhen('>=', '2020-11-08', 2);
+    }
+
+    private function disableCalendarsWhen(string $operator, string $date, int $max_calendars)
+    {
+        $query = User::with('subscriptions', 'calendars')
+            ->where('beta_authorised', '=', false)
+            ->where('created_at', $operator, $date)
+            ->whereHas('subscriptions')
+            ->whereDoesntHave('subscriptions', function (Builder $query) {
+                $query->active();
             })
-            ->whereHas('calendars', function(Builder $query){
-                $query->where('disabled', '=', true);
-            }, '>', '2')
-            ->chunk(100, function($users){
-                foreach ($users as $user) {
-                    $this->debug('Processing ' . $user->username);
-
-                    $max_calendars = $user->isEarlySupporter() ? 15 : 2;
-
-                    $user->calendars()->orderBy('date_created', 'ASC')->each(function($calendar, $index) use ($max_calendars){
-                        $calendar->disabled = ($index < $max_calendars) ? 0 : 1;
-                        $calendar->parent_id = Null;
-                        $calendar->parent_offset = Null;
-                        $calendar->parent_link_date = Null;
-                        $calendar->save();
-                    });
-                }
-            });
+            ->whereHas('calendars', function (Builder $query) {
+                $query->where('disabled', '!=', true);
+            }, '>', $max_calendars);
+
+        $count = $query->count();
+
+        if ($count === 0) {
+            logger()->info("No users found exceeding maximum of " . $max_calendars . " calendars.");
+
+            return;
+        }
+
+        logger()->info("Disabling calendars for $count users who have more than " . $max_calendars . " calendars.");
+
+        $query->chunk(100, function ($users) use ($max_calendars) {
+            foreach ($users as $user) {
+                $this->info('Processing ' . $user->username);
+
+                $disableIds = $user->calendars
+                    ->sortBy('created_at')
+                    ->take($user->calendars->count() - $max_calendars)
+                    ->pluck('id');
+
+                $user->calendars()
+                    ->whereIn('id', $disableIds)
+                    ->update([
+                        'disabled' => true,
+                        'parent_id' => null,
+                        'parent_offset' => null,
+                        'parent_link_date' => null,
+                    ]);
+            }
+        });
     }
 }

app/Filament/Resources/UserResource.php

@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Password;
+use STS\FilamentImpersonate\Tables\Actions\Impersonate;
 
 class UserResource extends Resource
 {
@@ -78,10 +79,7 @@ public static function table(Table $table): Table
                 Tables\Filters\Filter::make('beta_authorised')
                     ->query(fn(Builder $query): Builder => $query->where('beta_authorised', true))
             ])->actions([
-                Tables\Actions\Action::make('impersonate')
-                    ->label('Impersonate')
-                    ->icon('heroicon-o-user-circle')
-                    ->url(fn($record) => route('admin.impersonate', ['userid' => $record->id, 'returnPath' => request()->url()])),
+                Impersonate::make(),
             ])->bulkActions([
                 Tables\Actions\BulkAction::make('password_reset')
                     ->action(function($records){

app/Filament/Resources/UserResource/Pages/EditUser.php

@@ -4,8 +4,16 @@
 
 use App\Filament\Resources\UserResource;
 use Filament\Resources\Pages\EditRecord;
+use STS\FilamentImpersonate\Pages\Actions\Impersonate;
 
 class EditUser extends EditRecord
 {
     protected static string $resource = UserResource::class;
+
+    protected function getActions(): array
+    {
+        return [
+            Impersonate::make()->record($this->getRecord()),
+        ];
+    }
 }

composer.json

@@ -45,7 +45,8 @@
         "spatie/laravel-export": "^0.3.11",
         "spatie/laravel-honeypot": "^4.3",
         "spatie/laravel-ignition": "^2.2",
-        "spatie/laravel-log-dumper": "^1.4"
+        "spatie/laravel-log-dumper": "^1.4",
+        "stechstudio/filament-impersonate": "^3.5"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.7",
@@ -94,7 +95,8 @@
         ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover --ansi"
+            "@php artisan package:discover --ansi",
+            "@php artisan filament:upgrade"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""

database/migrations/2024_01_26_005221_add_indexes_to_calendars_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('calendars', function (Blueprint $table) {
+            $table->index('user_id');
+            $table->index('parent_id');
+            $table->index('disabled');
+            $table->index('advancement_enabled');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('calendars', function (Blueprint $table) {
+            //
+        });
+    }
+};

database/migrations/2024_01_26_005619_add_indexes_to_discord_tables.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('discord_auths', function (Blueprint $table) {
+            $table->index('user_id');
+            $table->index('discord_user_id');
+            $table->index('discord_email');
+        });
+
+        Schema::table('discord_guilds', function (Blueprint $table) {
+            $table->index('user_id');
+            $table->index('discord_auth_id');
+            $table->index('guild_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('discord_auths', function (Blueprint $table) {
+            //
+        });
+    }
+};