Do not include blocked users in the newsletter recipients

mainio · Dec 10, 2024 · 237fbbc · 237fbbc
1 parent b98c003
commit 237fbbc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/app/queries/concerns/decidim/privacy/admin_newsletter_recipients_extensions.rb b/app/queries/concerns/decidim/privacy/admin_newsletter_recipients_extensions.rb
@@ -27,6 +27,7 @@ def query
       def recipients_base_query
         Decidim::User
           .entire_collection
+          .available
           .where(organization: @form.current_organization)
           .where.not(newsletter_notifications_at: nil)
           .where.not(email: nil)

diff --git a/spec/queries/decidim/admin/newsletter_recipients_spec.rb b/spec/queries/decidim/admin/newsletter_recipients_spec.rb
@@ -48,6 +48,15 @@
           expect(recipients.count).to eq 5
         end
       end
+
+      context "with blocked accounts" do
+        let!(:blocked_recipients) { create_list(:user, 5, :confirmed, :blocked, newsletter_notifications_at: Time.current, organization:) }
+
+        it "returns all not blocked users" do
+          expect(subject.query).to match_array recipients
+          expect(recipients.count).to eq 5
+        end
+      end
     end
 
     context "when sending to followers" do