fix(policy): Fix scope in policies (#2478)

* fix(policies): Call scope correctly in policies

* fix and refactor failing spec

* add new spec

* remove unused scope

app/policies/archive_policy.rb

@@ -6,8 +6,4 @@ def create?
   def show? = create?
 
   def destroy? = create?
-
-  def resolve
-    Archive.where(organisation_id: pundit_user.organisations.pluck(:id))
-  end
 end

app/policies/category_configuration_policy.rb

@@ -1,7 +1,7 @@
 class CategoryConfigurationPolicy < ApplicationPolicy
   class Scope < Scope
     def resolve
-      CategoryConfiguration.where(organisation: pundit_user.organisations)
+      scope.where(organisation_id: pundit_user.organisation_ids)
     end
   end
 end

app/policies/department_policy.rb

@@ -20,7 +20,7 @@ def parcours?
 
   class Scope < Scope
     def resolve
-      Department.where(id: pundit_user.organisations.pluck(:department_id))
+      scope.where(id: pundit_user.organisations.pluck(:department_id))
     end
   end
 end

app/policies/messages_configuration_policy.rb

@@ -1,7 +1,7 @@
 class MessagesConfigurationPolicy < ApplicationPolicy
   class Scope < Scope
     def resolve
-      MessagesConfiguration.where(organisation_id: pundit_user.admin_organisations_ids)
+      scope.where(organisation_id: pundit_user.admin_organisations_ids)
     end
   end
 end

app/policies/organisation_policy.rb

@@ -42,7 +42,7 @@ def export_csv?
 
   class Scope < Scope
     def resolve
-      pundit_user.organisations
+      scope.where(id: pundit_user.organisation_ids)
     end
   end
 end

spec/controllers/invitations_controller_spec.rb

@@ -8,13 +8,12 @@
     let!(:other_org) { create(:organisation, department: department) }
     let!(:other_category_configuration) { create(:category_configuration, organisation: other_org, motif_category:) }
 
-    let!(:organisations) { Organisation.where(id: organisation.id) }
-    let!(:agent) { create(:agent, organisations: organisations) }
+    let!(:agent) { create(:agent, organisations: [organisation]) }
     let!(:user) do
       create(
         :user,
         first_name: "JANE", last_name: "DOE", title: "madame",
-        id: user_id, organisations: organisations
+        id: user_id, organisations: [organisation]
       )
     end
     let!(:motif_category) { create(:motif_category, short_name: "rsa_orientation") }
@@ -42,20 +41,19 @@
       sign_in(agent)
       travel_to(Time.zone.parse("2022-05-04 12:30"))
       allow(InviteUser).to receive(:call)
-        .with(user:, organisations:, invitation_attributes:, motif_category_attributes:)
         .and_return(OpenStruct.new(success?: true, invitation:))
     end
 
     context "organisation level" do
       it "calls the invite user service" do
         expect(InviteUser).to receive(:call)
-          .with(user:, organisations:, invitation_attributes:, motif_category_attributes:)
+          .with(user:, organisations: [organisation], invitation_attributes:, motif_category_attributes:)
         post :create, params: create_params
       end
     end
 
     context "department level" do
-      let!(:organisations) { Organisation.where(id: [organisation.id, other_org.id]) }
+      let!(:agent) { create(:agent, organisations: [organisation, other_org]) }
       let!(:create_params) do
         {
           department_id: department.id,
@@ -74,19 +72,18 @@
 
       it "calls the service" do
         expect(InviteUser).to receive(:call)
-          .with(user:, organisations:, invitation_attributes:, motif_category_attributes:)
+          .with(user:, organisations: [organisation, other_org], invitation_attributes:, motif_category_attributes:)
         post :create, params: create_params
       end
 
       context "when an org does not have a configuration for this category" do
         let!(:other_category_configuration) do
           create(:category_configuration, organisation: other_org, motif_category: create(:motif_category))
         end
-        let!(:organisations) { Organisation.where(id: [organisation.id]) }
 
         it "calls the service with only the orgs handling the category" do
           expect(InviteUser).to receive(:call)
-            .with(user:, organisations:, invitation_attributes:, motif_category_attributes:)
+            .with(user:, organisations: [organisation], invitation_attributes:, motif_category_attributes:)
           post :create, params: create_params
         end
       end

spec/features/agent_can_change_navigation_level_spec.rb

@@ -2,8 +2,11 @@
   let!(:department) { create(:department) }
   let!(:organisation) { create(:organisation, department: department) }
   let!(:organisation2) { create(:organisation, department: department) }
-  let!(:agent) { create(:agent, organisations: [organisation2]) }
-  let!(:admin_agent_role) { create(:agent_role, organisation: organisation, agent: agent, access_level: "admin") }
+  let!(:other_department) { create(:department) }
+  let!(:other_department_organisation) { create(:organisation, department: other_department) }
+  let!(:agent) do
+    create(:agent, admin_role_in_organisations: [organisation, organisation2, other_department_organisation])
+  end
   let!(:motif_category) { create(:motif_category, short_name: "rsa_orientation", name: "RSA orientation") }
   let!(:motif_category2) { create(:motif_category, short_name: "rsa_accompagnement", name: "RSA accompagnement") }
   let!(:category_configuration) do
@@ -31,6 +34,8 @@
           )
           expect(page).to have_link(organisation.name, href: organisation_users_path(organisation))
           expect(page).to have_link(organisation2.name, href: organisation_users_path(organisation2))
+          expect(page).to have_no_link(other_department_organisation.name,
+                                       href: organisation_users_path(other_department_organisation))
         end
       end
     end