foreman-tasks 8.3.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea98197d16aef3c4ca8f16c10b9533f7e89e916c8cefffed1e8523966dc85fa
-  data.tar.gz: fee12ffd69d32683f091f49c1362df778523a29bba97d411931c0608cedd19cc
+  metadata.gz: 93c84b1a1d6185d2831ad1c1c19968cf32b6e44afc494cc17fdca86e3ed20122
+  data.tar.gz: 1bb7bfd14c8f17758bf0c787e0f5877b00d05bc8cae8851b217ae974bdd1376a
 SHA512:
-  metadata.gz: fbeafbdf22b249957160385253f62b1f901cd4faca182c47fe5f637a375f55e98b57d7fe28ab814bf3f5fadb11aac50133b7f291e6371e2e1a8896c136410c4e
-  data.tar.gz: 946b98f863337862dfbd3b1cf6bd421b139836cd2920368e5642e50aed3a7ba1118bed49d481ee3e2ef208acd921275bcc3ef4c5b7316b1199b894cecbb715e2
+  metadata.gz: c1d8fb885b03ff508cd96d1c4b97c00ce562d77df8a9cdd6a839b142a7db865996ce6141c793f039ad4b64cd9789e741f62a58d8ad2733648a29053fea6dd98c
+  data.tar.gz: 36416c3c59724ce2a71e71ba68601f570c2da1f3608c5835c7cd8705ab425cacddcfdfd228be73834b15ebe15690ec8a2521baf9afb2430511e58dba7042316a

data/app/lib/actions/check_long_running_tasks.rb

@@ -8,12 +8,10 @@ module Actions
     def plan
       time = Time.now.utc
       cutoff = time - INTERVAL
-      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)))
+      users = User.joins(:mail_notifications)
+                  .where(mail_enabled: true, mail_notifications: { name: 'long_running_tasks' })
+                  .where.not(mail: [nil, ''])
+                  .where(disabled: [nil, false])
 
       query = "state ^ (#{STATES.join(', ')}) AND state_updated_at <= \"#{cutoff}\""
       users.each do |user|
@@ -41,5 +39,9 @@ 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,5 +18,9 @@ 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/models/foreman_tasks/concerns/user_extensions.rb

@@ -8,6 +8,23 @@ 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
+        org_admin_role = Role.find_by(name: 'Organization admin')
+        admin_role_ids = ([org_admin_role.id] + org_admin_role.cloned_role_ids)
+        role_ids = roles.map(&:id)
+
+        return unless admin || (role_ids & admin_role_ids).any?
+
+        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,5 +20,19 @@ 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.3.0'.freeze
+  VERSION = '8.3.1'.freeze
 end

metadata

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