[Announcement] Exclude events with disabled monthly announcements in scope (#11401)

Author: polypixeldev

app/controllers/events_controller.rb

@@ -418,9 +418,7 @@ def announcement_overview
     end
     @announcements = @all_announcements.page(params[:page]).per(10)
 
-    if @event.config.generate_monthly_announcement
-      @monthly_announcement = Announcement.monthly_for(Date.today).where(event: @event).first
-    end
+    @monthly_announcement = Announcement.monthly_for(Date.today).where(event: @event).first
   end
 
   before_action(only: :feed) { request.format = :atom }

app/jobs/announcement/monthly_job.rb

@@ -5,14 +5,12 @@ class MonthlyJob < ApplicationJob
     queue_as :default
 
     def perform
-      Event.includes(:config).where(config: { generate_monthly_announcement: true }).find_each do |event|
-        event.announcements.approved_monthly_for(Date.today.prev_month).find_each do |announcement|
-          Rails.error.handle do
-            announcement.mark_published!
-          end
+      Announcement.approved_monthly_for(Date.today.prev_month).find_each do |announcement|
+        Rails.error.handle do
+          announcement.mark_published!
         end
 
-        Announcement::Templates::Monthly.new(event:, author: User.system_user).create
+        Announcement::Templates::Monthly.new(event: announcement.event, author: User.system_user).create
       end
     end
 

app/models/announcement.rb

@@ -54,7 +54,7 @@ class Announcement < ApplicationRecord
     end
   end
 
-  scope :monthly, -> { where(template_type: Announcement::Templates::Monthly.name) }
+  scope :monthly, -> { joins(event: :config).where(:template_type => Announcement::Templates::Monthly.name, "event_configurations.generate_monthly_announcement" => true) }
   scope :monthly_for, ->(date) { monthly.where("announcements.created_at BETWEEN ? AND ?", date.beginning_of_month, date.end_of_month) }
   scope :approved_monthly_for, ->(date) { monthly_for(date).draft }
   validate :content_is_json