Refactor dispatched events in participatory space user roles (decidim…

…#11338)

decidim-admin/app/commands/decidim/admin/participatory_space/destroy_admin.rb

@@ -20,17 +20,22 @@ def initialize(role, current_user)
         #
         # Returns nothing.
         def call
-          destroy_role!
-          dispatch_system_event
+          with_events do
+            destroy_role!
+          end
+
           broadcast(:ok)
         end
 
         private
 
         attr_reader :role, :current_user
 
-        def dispatch_system_event
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", role.class.name, role.id)
+        def event_arguments
+          {
+            class_name: role.class.name,
+            role: role.id
+          }
         end
 
         def destroy_role!

decidim-admin/lib/decidim/admin/test/destroy_admin_examples.rb

@@ -30,13 +30,10 @@
     expect(action_log.version.event).to eq "destroy"
   end
 
-  it "fires an event" do
-    expect(ActiveSupport::Notifications).to receive(:publish).with(
-      "decidim.system.participatory_space.admin.destroyed",
-      role.class.name,
-      role.id
-    )
-
-    subject.call
+  it_behaves_like "fires an ActiveSupport::Notification event", "decidim.admin.participatory_space.destroy_admin:before" do
+    let(:command) { subject }
+  end
+  it_behaves_like "fires an ActiveSupport::Notification event", "decidim.admin.participatory_space.destroy_admin:after" do
+    let(:command) { subject }
   end
 end

decidim-proposals/lib/decidim/proposals/engine.rb

@@ -90,7 +90,7 @@ class Engine < ::Rails::Engine
       end
 
       initializer "decidim_proposals.remove_space_admins" do
-        ActiveSupport::Notifications.subscribe("decidim.system.participatory_space.admin.destroyed") do |_event_name, klass, id|
+        ActiveSupport::Notifications.subscribe("decidim.admin.participatorty_space.destroy_admin:after") do |_event_name, klass, id|
           Decidim::Proposals::ValuationAssignment.where(valuator_role_type: klass, valuator_role_id: id).destroy_all
         end
       end

decidim-proposals/spec/lib/decidim/proposals/engine_spec.rb

@@ -17,7 +17,7 @@
 
       it "removes the record" do
         expect do
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", valuator_role.class.name, valuator_role.id)
+          ActiveSupport::Notifications.publish("decidim.admin.participatorty_space.destroy_admin:after", valuator_role.class.name, valuator_role.id)
         end.to change(Decidim::Proposals::ValuationAssignment, :count).by(-1)
       end
     end
@@ -29,7 +29,7 @@
 
       it "removes the record" do
         expect do
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", valuator_role.class.name, valuator_role.id)
+          ActiveSupport::Notifications.publish("decidim.admin.participatorty_space.destroy_admin:after", valuator_role.class.name, valuator_role.id)
         end.to change(Decidim::Proposals::ValuationAssignment, :count).by(-1)
       end
     end
@@ -41,7 +41,7 @@
 
       it "removes the record" do
         expect do
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", valuator_role.class.name, valuator_role.id)
+          ActiveSupport::Notifications.publish("decidim.admin.participatorty_space.destroy_admin:after", valuator_role.class.name, valuator_role.id)
         end.to change(Decidim::Proposals::ValuationAssignment, :count).by(-1)
       end
     end