foreman-tasks 8.2.0 → 8.2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b4f35490448b3b8f50b3632eae9f565b954642055c8d81726e0774cbf0d5fbc5
4
- data.tar.gz: f837f11d4a5e7c1d5d4fcc831bd20139d822374cb0289e5d9990f64830eac2f9
3
+ metadata.gz: 22060604fd8a95549a4654f29ae7f5a6c78da4b427af5f0db6c6466c40ed3371
4
+ data.tar.gz: 74c7c96f5e6e139cc10a36b1000c3a24986424ebec66c4f798dc7cfd6b98cc56
5
5
  SHA512:
6
- metadata.gz: 83be04fc0573f35f6caa81af65adb8a5e81dbde915fa6f7465837d580dce1abe5e92fad16a4d3970e16170a0c195e08067d1e6fc2af97719f4e51bd7364c09af
7
- data.tar.gz: ac31f6183e48f5dd4040e4679c2dc394afdc624bee2d0bf2beab8c94ca7661f8e72f165b92177551f1bb097bfb676669e5fa4c248c856b1bea2bd6080d3d54aa
6
+ metadata.gz: a51ae604b2a044609d9fb68458d29cc64cb81b90f691f3d2a2a001a9b97b479c12c516714e37bb2ab210158ad5ff4eab06262fc9cb169f1e78e7ea3870f07b66
7
+ data.tar.gz: 2d7aab0839a5c278f1b885dd73d00cce73f9231e0ee7cf311839cffc2e64d2103d3aa99f3d4be85fa3c0f2e198ee13684268d651fbb2b6a525967f33ef8150c0
@@ -8,12 +8,10 @@ module Actions
8
8
  def plan
9
9
  time = Time.now.utc
10
10
  cutoff = time - INTERVAL
11
- notification = ::ForemanTasks::TasksMailNotification.find_by(name: "long_running_tasks")
12
- org_admin_role = Role.find_by(name: 'Organization admin')
13
- users = User.left_joins(:roles)
14
- .where(id: UserMailNotification.where(mail_notification_id: notification.id).select(:role_id))
15
- .or(User.where(admin: true))
16
- .or(User.where(id: UserRole.where(id: [org_admin_role.id] + org_admin_role.cloned_role_ids).select(:owner_id)))
11
+ users = User.joins(:mail_notifications)
12
+ .where(mail_enabled: true, mail_notifications: { name: 'long_running_tasks' })
13
+ .where.not(mail: [nil, ''])
14
+ .where(disabled: [nil, false])
17
15
 
18
16
  query = "state ^ (#{STATES.join(', ')}) AND state_updated_at <= \"#{cutoff}\""
19
17
  users.each do |user|
@@ -41,5 +39,9 @@ module Actions
41
39
  def humanized_name
42
40
  _('Check for long running tasks')
43
41
  end
42
+
43
+ def rescue_strategy_for_self
44
+ Dynflow::Action::Rescue::Skip
45
+ end
44
46
  end
45
47
  end
@@ -18,5 +18,9 @@ module Actions
18
18
  def humanized_name
19
19
  _('Deliver notifications about long running tasks')
20
20
  end
21
+
22
+ def rescue_strategy_for_self
23
+ ::Dynflow::Action::Rescue::Skip
24
+ end
21
25
  end
22
26
  end
@@ -8,6 +8,25 @@ module ForemanTasks
8
8
  has_many :tasks, :dependent => :nullify,
9
9
  :class_name => ::ForemanTasks::Task.name
10
10
  # rubocop:enable Rails/ReflectionClassName
11
+
12
+ before_validation :attach_task_mail_notifications, on: :create
13
+ end
14
+
15
+ def attach_task_mail_notifications
16
+ return if ::ForemanSeeder.is_seeding
17
+
18
+ org_admin_role = Role.find_by(name: 'Organization admin')
19
+ admin_by_role = org_admin_role &&
20
+ (roles.map(&:id) & ([org_admin_role.id] + org_admin_role.cloned_role_ids)).any?
21
+
22
+ return unless admin || admin_by_role
23
+
24
+ notification = MailNotification.find_by(name: 'long_running_tasks')
25
+ return if notification.nil?
26
+
27
+ if user_mail_notifications.none? { |n| n.mail_notification_id == notification.id }
28
+ user_mail_notifications.build(mail_notification_id: notification.id, interval: 'Subscribe')
29
+ end
11
30
  end
12
31
  end
13
32
  end
@@ -20,5 +20,19 @@ notifications.each do |notification|
20
20
  raise ::Foreman::Exception.new(N_("Unable to create mail notification: %s"),
21
21
  SeedHelper.format_errors(created_notification))
22
22
  end
23
+
24
+ org_admin_role = Role.find_by(name: 'Organization admin')
25
+
26
+ users = User.left_joins(:roles)
27
+ .joins(:auth_source)
28
+ .where(admin: true)
29
+ .or(User.where(id: UserRole.where(id: [org_admin_role.id] + org_admin_role.cloned_role_ids).select(:owner_id)))
30
+ .where.not(auth_source: { name: 'Hidden' })
31
+ users.each do |user|
32
+ mail = UserMailNotification.create(mail_notification_id: created_notification.id, user_id: user.id, interval: 'Subscribe')
33
+ if mail.nil? || mail.errors.any?
34
+ raise ::Foreman::Exception.new(N_("Unable to enable mail notification to user '%s': %s"), user.login, SeedHelper.format_errors(mail))
35
+ end
36
+ end
23
37
  end
24
38
  end
@@ -1,3 +1,3 @@
1
1
  module ForemanTasks
2
- VERSION = '8.2.0'.freeze
2
+ VERSION = '8.2.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman-tasks
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.2.0
4
+ version: 8.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-08-28 00:00:00.000000000 Z
11
+ date: 2023-11-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dynflow