foreman-tasks 8.2.1 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22060604fd8a95549a4654f29ae7f5a6c78da4b427af5f0db6c6466c40ed3371
-  data.tar.gz: 74c7c96f5e6e139cc10a36b1000c3a24986424ebec66c4f798dc7cfd6b98cc56
+  metadata.gz: 4ea98197d16aef3c4ca8f16c10b9533f7e89e916c8cefffed1e8523966dc85fa
+  data.tar.gz: fee12ffd69d32683f091f49c1362df778523a29bba97d411931c0608cedd19cc
 SHA512:
-  metadata.gz: a51ae604b2a044609d9fb68458d29cc64cb81b90f691f3d2a2a001a9b97b479c12c516714e37bb2ab210158ad5ff4eab06262fc9cb169f1e78e7ea3870f07b66
-  data.tar.gz: 2d7aab0839a5c278f1b885dd73d00cce73f9231e0ee7cf311839cffc2e64d2103d3aa99f3d4be85fa3c0f2e198ee13684268d651fbb2b6a525967f33ef8150c0
+  metadata.gz: fbeafbdf22b249957160385253f62b1f901cd4faca182c47fe5f637a375f55e98b57d7fe28ab814bf3f5fadb11aac50133b7f291e6371e2e1a8896c136410c4e
+  data.tar.gz: 946b98f863337862dfbd3b1cf6bd421b139836cd2920368e5642e50aed3a7ba1118bed49d481ee3e2ef208acd921275bcc3ef4c5b7316b1199b894cecbb715e2

data/app/lib/actions/check_long_running_tasks.rb

@@ -8,10 +8,12 @@ module Actions
     def plan
       time = Time.now.utc
       cutoff = time - INTERVAL
-      users = User.joins(:mail_notifications)
-                  .where(mail_enabled: true, mail_notifications: { name: 'long_running_tasks' })
-                  .where.not(mail: [nil, ''])
-                  .where(disabled: [nil, false])
+      notification = ::ForemanTasks::TasksMailNotification.find_by(name: "long_running_tasks")
+      org_admin_role = Role.find_by(name: 'Organization admin')
+      users = User.left_joins(:roles)
+                  .where(id: UserMailNotification.where(mail_notification_id: notification.id).select(:role_id))
+                  .or(User.where(admin: true))
+                  .or(User.where(id: UserRole.where(id: [org_admin_role.id] + org_admin_role.cloned_role_ids).select(:owner_id)))
 
       query = "state ^ (#{STATES.join(', ')}) AND state_updated_at <= \"#{cutoff}\""
       users.each do |user|
@@ -39,9 +41,5 @@ module Actions
     def humanized_name
       _('Check for long running tasks')
     end
-
-    def rescue_strategy_for_self
-      Dynflow::Action::Rescue::Skip
-    end
   end
 end

data/app/lib/actions/deliver_long_running_tasks_notification.rb

@@ -18,9 +18,5 @@ module Actions
     def humanized_name
       _('Deliver notifications about long running tasks')
     end
-
-    def rescue_strategy_for_self
-      ::Dynflow::Action::Rescue::Skip
-    end
   end
 end

data/app/lib/actions/observable_action.rb

@@ -36,7 +36,7 @@ module Actions
       end
 
       def event_names
-        [event_name_base + '_' + event_name_suffix(:success)]
+        [:success, :failure].map { |suffix| event_name_base + '_' + event_name_suffix(suffix) }
       end
 
       def namespaced_event_names
@@ -51,7 +51,16 @@ module Actions
     def self.included(base)
       base.extend ClassMethods
       base.include ::Foreman::Observable
-      base.execution_plan_hooks.use :emit_event, :on => :success
+      base.execution_plan_hooks.use :emit_event_success, :on => :success
+      base.execution_plan_hooks.use :emit_event_failure, :on => :failure
+    end
+
+    def emit_event_success(execution_plan)
+      emit_event(execution_plan, :success)
+    end
+
+    def emit_event_failure(execution_plan)
+      emit_event(execution_plan, :failure)
     end
 
     def emit_event(execution_plan, hook = :success)

data/app/models/foreman_tasks/concerns/user_extensions.rb

@@ -8,25 +8,6 @@ module ForemanTasks
         has_many :tasks, :dependent => :nullify,
                          :class_name => ::ForemanTasks::Task.name
         # rubocop:enable Rails/ReflectionClassName
-
-        before_validation :attach_task_mail_notifications, on: :create
-      end
-
-      def attach_task_mail_notifications
-        return if ::ForemanSeeder.is_seeding
-
-        org_admin_role = Role.find_by(name: 'Organization admin')
-        admin_by_role = org_admin_role &&
-                        (roles.map(&:id) & ([org_admin_role.id] + org_admin_role.cloned_role_ids)).any?
-
-        return unless admin || admin_by_role
-
-        notification = MailNotification.find_by(name: 'long_running_tasks')
-        return if notification.nil?
-
-        if user_mail_notifications.none? { |n| n.mail_notification_id == notification.id }
-          user_mail_notifications.build(mail_notification_id: notification.id, interval: 'Subscribe')
-        end
       end
     end
   end

data/db/seeds.d/95-mail_notifications.rb

@@ -20,19 +20,5 @@ notifications.each do |notification|
       raise ::Foreman::Exception.new(N_("Unable to create mail notification: %s"),
                                      SeedHelper.format_errors(created_notification))
     end
-
-    org_admin_role = Role.find_by(name: 'Organization admin')
-
-    users = User.left_joins(:roles)
-                .joins(:auth_source)
-                .where(admin: true)
-                .or(User.where(id: UserRole.where(id: [org_admin_role.id] + org_admin_role.cloned_role_ids).select(:owner_id)))
-                .where.not(auth_source: { name: 'Hidden' })
-    users.each do |user|
-      mail = UserMailNotification.create(mail_notification_id: created_notification.id, user_id: user.id, interval: 'Subscribe')
-      if mail.nil? || mail.errors.any?
-        raise ::Foreman::Exception.new(N_("Unable to enable mail notification to user '%s': %s"), user.login, SeedHelper.format_errors(mail))
-      end
-    end
   end
 end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '8.2.1'.freeze
+  VERSION = '8.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 8.2.1
+  version: 8.3.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow