From 22a6720d9ccec5b4023acc2b164085dfcd8f4e4c Mon Sep 17 00:00:00 2001
From: tnicolas1 <thibault.nicolas@ac-clermont.fr>
Date: Wed, 16 Oct 2024 08:47:53 +0200
Subject: [PATCH] Modification de 'delete_roles!'

---
 .../users/omniauth_callbacks_controller.rb           | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 08698f01c..255ec7a44 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -133,15 +133,9 @@ def delete_roles!
       combined_establishments = establishments_authorised + establishments_in_responsibility
 
       # Ne garde que les élements distincts entre les rôles d'APLyPro et ceux de KeyCloak.
-      @user.establishments
-           .reject { |establishment| combined_establishments.include?(establishment) }
-           .each { |establishment| delete_role(establishment) }
-    end
-
-    def delete_role(establishment)
-      EstablishmentUserRole
-        .find_by(user: @user, establishment: establishment)
-        .destroy
+      EstablishmentUserRole.where(user: @user).find_each do |access|
+        access.destroy unless combined_establishments.includes(access.establishment)
+      end
     end
 
     def log_user_in!