Fix send-membership-reminders broken logic

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

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 26ffdc63e09b25e9eed5349246a6b4ef23c70c28..4ecd3c4b7e23600c50d8b3c38c5adae4e48b5d56 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -26,21 +26,21 @@ module NosOignons
       current_emails = NosOignons::Mailman.list_members(list)
       uptodate_emails = NosOignons::Member.all.select(&:up_to_date?).collect(&:email)
 
-      NosOignons::Mailman.add_members(list, uptodate_emails - current_emails)
-      NosOignons::Mailman.remove_members(list, current_emails - uptodate_emails)
+      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?
     end
 
     def send_membership_reminders!
       today = Time.now.to_date
       NosOignons::Member.all.select(&:up_to_date?).each do |member|
+        anniversary = Time.new(today.year, member.joined_on.month,
+                               member.joined_on.day).to_date
+        next if member.membership_fee_paid_on >= anniversary
+        next if member.reminded_on && member.reminded_on >= today
         NosOignons::Reminder.all.sort_by(&:days).reverse.each do |reminder|
-          anniversary = Time.new(today.year, member.joined_on.month,
-                                 member.joined_on.day).to_date
-
-          next if member.membership_fee_paid_on > anniversary
-          next if member.membership_fee_paid_on > today - reminder.days
-          next if anniversary > today - reminder.days
-          next if member.reminded_on && member.reminded_on >= today
+          next if anniversary < today + reminder.days
 
           member.remind(reminder)
           break
@@ -62,7 +62,7 @@ module NosOignons
           begin
             # Use empty ref to get the index
             NosOignons::Member.read_from_git('', file)
-          rescue ArgumentError
+          rescue ArgumentError, Psych::SyntaxError
             $stderr.puts "Désolé : #{file} n'a pas le bon format !"
             exit 1
           end
@@ -78,7 +78,7 @@ module NosOignons
             next unless file.start_with?("#{NosOignons::MEMBERS_DB_DIR}/")
             begin
               NosOignons::Member.read_from_git(new_value, file)
-            rescue ArgumentError
+            rescue ArgumentError, Psych::SyntaxError
               $stderr.puts "Désolé : #{file} n'a pas le bon format !"
               exit 1
             end