Light refactor for fetching admins (decidim#9287)

* Remove duplicated 'organization_admins' method * Replace ActiveRecord query by 'admins' relation from organization model
eliegaboriau · Oct 25, 2022 · 783a2f2 · 783a2f2
1 parent 564632b
commit 783a2f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/vote_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/vote_initiative.rb
@@ -101,13 +101,9 @@ def notify_support_threshold_reached(before, after)
           event: "decidim.events.initiatives.support_threshold_reached",
           event_class: Decidim::Initiatives::Admin::SupportThresholdReachedEvent,
           resource: initiative,
-          followers: organization_admins
+          followers: initiative.organization.admins
         )
       end
-
-      def organization_admins
-        Decidim::User.where(organization: initiative.organization, admin: true)
-      end
     end
   end
 end
diff --git a/decidim-verifications/app/commands/decidim/verifications/authorize_user.rb b/decidim-verifications/app/commands/decidim/verifications/authorize_user.rb
@@ -40,7 +40,7 @@ def notify_admins(conflict)
           event: "decidim.events.verifications.managed_user_error_event",
           event_class: Decidim::Verifications::ManagedUserErrorEvent,
           resource: conflict,
-          affected_users: Decidim::User.where(admin: true, organization: @organization)
+          affected_users: @organization.admins
         )
       end