foreman-tasks 8.1.2 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f756b8531e37e0f3e1b5c8656497ef1386484aae197a25be5b157343b65d3859
-  data.tar.gz: 6e83619c23d91aeaf92d3ddd01a76bb65f331d5c48041f3e1aa037d97c3da4f6
+  metadata.gz: 6b47d3165d26d95f9799243481ff75c14aaa59ec3966edcf8afe95ee1da77a97
+  data.tar.gz: 2b0eb29411d81b496169b970f0edb93abda50f6a109ee13d21830f918e52e29f
 SHA512:
-  metadata.gz: 96d0a2eb2c41ec9643119c8bb7e0447ddb43f249cf4d217713c77042fabdb54da44b635c9e4d538b9daca760fec82077810e31d684122313dc9fb1191a77c59f
-  data.tar.gz: 73e47dceafb38096f63cf605d8016a3dfb112cc5320f2dd70fb527c805c99f86255c882e40b7504f9383e03dc441802b0cf208d4957ea3c77fde4b7dc5d93154
+  metadata.gz: 686ecd66afcaab661bb7916746547dad1a8b33dc9087a2dfd874a87e87d0d426b4fe05f9807337be8fcd13a2861a02dc98c4ae03326df482a7970eed89745fa9
+  data.tar.gz: 4424d6de0469d10129d6c53d5abc190307e497524b6a80a4349be630a383ce1c4fcde172241c64567ea843ba5ef0f804e3c93d7e54ff5f36dd350c12a3ba289a

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.1.2'.freeze
+  VERSION = '8.1.3'.freeze
 end

metadata

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