résolution conflit

[gestion-adh.git] / lib / nos_oignons.rb

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 72cea229df4d17cde186b8389b5ff746c0b22d21..ee6fe7ebd2fc0a9ae8af14d6021f40f7c345f0bf 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -25,19 +25,18 @@ require 'nos_oignons/reminder_db'
 module NosOignons
   BOARD_EMAIL = 'ca@nos-oignons.net'
   ADVISORS_EMAIL = 'deontologie@nos-oignons.net'
-  MEMBER_MAILING_LIST = 'ag'
+  MEMBER_MAILING_LIST = 'ag@nos-oignons.net'
   CONTACT_INFO = <<-EOT.gsub(/^    /, '')
     Identifiant SIREN 842 479 313
     https://nos-oignons.net/
     contact@nos-oignons.net
     Téléphone : +33 9 72 42 96 04
-    Fax : +33 9 72 42 96 06
   EOT
   POSTAL_ADDRESS = <<-EOT.gsub(/^    /, '')
     Nos oignons
     Centre UBIDOCA, 7585
-    105 route des Pommiers
-    74370 Saint Martin Bellevue
+    78 allée Primavera
+    74370 Annecy
     France
   EOT
 
@@ -59,21 +58,29 @@ module NosOignons
     def update_ag_subscribers!
       list = NosOignons::MEMBER_MAILING_LIST
 
-      current_emails = NosOignons::Mailman.list_members(list)
+      current_members = NosOignons::Mailman.list_members(list)
       uptodate_emails = NosOignons::Member.all.select(&:up_to_date?).collect(&:email)
 
-      emails_to_add = uptodate_emails - current_emails
-      NosOignons::Mailman.add_members(list, emails_to_add) unless emails_to_add.empty?
-      emails_to_remove = current_emails - uptodate_emails
-      NosOignons::Mailman.remove_members(list, emails_to_remove) unless emails_to_remove.empty?
+      # Who is not subscribed yet?
+      emails_to_add = uptodate_emails - current_members.collect(&:email)
+      emails_to_add.each do |email|
+        NosOignons::Mailman.susbcribe_email(list, email)
+      end
+
+      # Who should not be subscribed anymore?
+      current_members.each do |list_member|
+        unless uptodate_emails.include?(list_member.email)
+          list_member.unsubscribe!
+        end
+      end
     end
 
     def send_membership_reminders!
       today = Time.now.to_date
+      reminders = NosOignons::Reminder.all.sort_by(&:days)
       NosOignons::Member.all.select(&:up_to_date?).each do |member|
-        next if member.membership_fee_paid_on.year == today.year
-        reminders = NosOignons::Reminder.all.sort_by(&:days)
-        anniversary = Time.new(today.year, member.joined_on.month,
+        next if member.membership_fee_paid_on.year == (today + reminders.last.days).year
+        anniversary = Time.new(today.next_month.year, member.joined_on.month,
                                member.joined_on.day).to_date
         next if member.membership_fee_paid_on >= anniversary - reminders.last.days
         reminders.each do |reminder|