Fix people excluded from mailing list in alps recipients (#2570)

Author: codez

app/domain/export/tabular/people/alps_recipients_scope.rb

@@ -95,18 +95,26 @@ def mitglied_or_abonnent_condition
         <<-SQL.squish,
           (roles.type = :mitglied_type AND
            (roles.beitragskategorie <> :beitragskategorie OR people.sac_family_main_person) AND
-           (subscriptions.mailing_list_id IS NULL OR
-             subscriptions.mailing_list_id <> :mailing_list_id OR
-             NOT subscriptions.excluded)) OR
+           NOT people.id IN (:excluded_from_mailing_list)) OR
           roles.type IN (:abonnent_types)
         SQL
         mitglied_type: SacCas::MITGLIED_STAMMSEKTION_ROLES.map(&:sti_name),
         beitragskategorie: SacCas::Beitragskategorie::Calculator::CATEGORY_FAMILY,
-        mailing_list_id: sac_magazine_mailing_list_id,
+        excluded_from_mailing_list:,
         abonnent_types: SacCas::ABONNENT_MAGAZIN_ROLES.map(&:sti_name)
       ]
     end
 
+    def excluded_from_mailing_list
+      Subscription
+        .where(
+          mailing_list_id: sac_magazine_mailing_list_id,
+          excluded: true,
+          subscriber_type: "Person"
+        )
+        .select(:subscriber_id)
+    end
+
     def language_condition(lang, abo_group_ids)
       [
         <<-SQL.squish,

spec/domain/export/tabular/people/alps_recipients_test_data.rb

@@ -28,11 +28,13 @@
       start_on: "2020-03-24").person
   end
   let!(:mitglied_fr) do
-    Fabricate("Group::SektionsMitglieder::Mitglied",
+    p = Fabricate("Group::SektionsMitglieder::Mitglied",
       beitragskategorie: :adult,
       person: Fabricate(:person, language: "fr"),
       group: sektion,
       start_on: "2020-03-25").person
+    mailing_lists(:newsletter).subscriptions.create!(subscriber: p) # other subscription
+    p
   end
   let!(:mitglied_france) do
     Fabricate("Group::SektionsMitglieder::Mitglied",
@@ -47,6 +49,7 @@
       group: sektion,
       start_on: "2020-03-27").person
     mailing_lists(:sac_magazine).subscriptions.create!(subscriber: p, excluded: true)
+    mailing_lists(:newsletter).subscriptions.create!(subscriber: p) # other subscription
     p
   end
   let!(:new_entry) do