Ajout d'un peu de logs

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

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index ba39787aa1b8689bcfc9d56e4b09c24ccfac6757..ba4c6a2f50749dba8df9546a1d68bc727870d140 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -25,13 +25,12 @@ 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
@@ -59,13 +58,21 @@ 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!
@@ -80,6 +87,7 @@ module NosOignons
           next if (anniversary - today).to_i > reminder.days
           next if member.reminded_on && (anniversary - member.reminded_on).to_i <= reminder.days
 
+          $stdout.puts "Envoi d'un rappel de cotisation a #{member.to_s}"
           member.remind(reminder)
           break
         end