fix membership recomputation

src/Models/Squads/Squad.php

@@ -86,24 +86,7 @@ protected static function boot()
                 ! array_key_exists('type', $model->getChanges()))
                 return;
 
-            // kick members which are non longer eligible according to new filters
-            $model->members->each(function ($user) use ($model) {
-                if (! $model->isUserEligible($user))
-                    $model->members()->detach($user->id);
-            });
-
-            // invite members which are eligible according to new filters (only for auto squads)
-            if ($model->type == 'auto') {
-                $users = User::standard()
-                    ->whereDoesntHave('squads', function (Builder $query) use ($model) {
-                        $query->where('id', $model->id);
-                    })->get();
-
-                $users->each(function ($user) use ($model) {
-                    if ($model->isUserEligible($user))
-                        $model->members()->save($user);
-                });
-            }
+            $model->recomputeSquadMemberships();
         });
     }
 
@@ -120,24 +103,41 @@ public function isUserEligible(User $user): bool {
     }
 
     /**
-     * Checks all users for eligibility. This function is used in migrations after major changes and bugs in the squad
-     * eligibility code to ensure that we are in a valid state.
+     * Checks if the members of this squad are still eligible and if new members have to be added.
+     * This function is typically called after changes in the squad configuration or in a deferred migration if the behaviour of the squad eligibility logic changes
      * @return void
      * @throws InvalidFilterException
      */
-    public static function recheckAllUsers(): void {
-        Squad::where('type', 'auto')->get()->each(function (Squad $squad) {
-            User::chunk(100, function ($users) use ($squad) {
-                $users->each(function (User $user) use ($squad) {
-                    $is_member = $squad->members()->where('id', $user->id)->exists();
+    private function recomputeSquadMemberships(): void {
+        // kick members which are non longer eligible according to new filters
+        $this->members->each(function ($user) {
+            if (! $this->isUserEligible($user))
+                $this->members()->detach($user->id);
+        });
 
-                    if ($is_member && ! $squad->isUserEligible($user))
-                        $squad->members()->detach($user->id);
+        // invite members which are eligible according to new filters (only for auto squads)
+        if ($this->type == 'auto') {
+            $users = User::standard()
+                ->whereDoesntHave('squads', function (Builder $query) {
+                    $query->where('id', $this->id);
+                })->get();
 
-                    if (! $is_member && $squad->isUserEligible($user))
-                        $squad->members()->attach($user->id);
-                });
+            $users->each(function ($user) {
+                if ($this->isUserEligible($user))
+                    $this->members()->save($user);
             });
+        }
+    }
+
+    /**
+     * Checks all users for eligibility. This function is used in migrations after major changes and bugs in the squad
+     * eligibility code to ensure that we are in a valid state.
+     * @return void
+     * @throws InvalidFilterException
+     */
+    public static function recomputeAllSquadMemberships(): void {
+        Squad::where('type', 'auto')->get()->each(function (Squad $squad) {
+            $squad->recomputeSquadMemberships();
         });
     }
 

src/database/migrations/2020_12_06_220254_upgrade_squads_maj4_min4_hf2.php

@@ -38,7 +38,7 @@ class UpgradeSquadsMaj4Min4Hf2 extends Migration
     public function up()
     {
         DeferredMigration::schedule(function (){
-            Squad::recheckAllUsers();
+            Squad::recomputeAllSquadMemberships();
         });
     }
 

src/database/migrations/2024_02_11_155433_update_squad_filters.php

@@ -55,7 +55,7 @@ public function up()
 
         // since the squad filter change with this migration, we have to recompute the eligibility of everyone
         DeferredMigration::schedule(function (){
-            Squad::recheckAllUsers();
+            Squad::recomputeAllSquadMemberships();
         });
     }