[sysadmin-bin] Do the same for cleanup_mailgrace

[Andrea Veri <averi src gnome org>]

commit e3db6bba386a91a800dd801e788c798275a94d20
Author: Andrea Veri <averi redhat com>
Date:   Mon May 2 20:25:41 2022 +0200

    Do the same for cleanup_mailgrace

 membership/foundation-operations.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/membership/foundation-operations.py b/membership/foundation-operations.py
index 565cf43..ac34011 100755
--- a/membership/foundation-operations.py
+++ b/membership/foundation-operations.py
@@ -85,9 +85,9 @@ def cleanup_mailgrace():
 
     for member in gracemails:
        ldap_vars = glu.get_attributes_from_ldap(member, 'LastRenewedOn', 'mail', 'cn')
-       last_renewed_on = dt.datetime.strptime(ldap_vars[1], '%Y-%m-%d')
+       last_renewed_on = dt.datetime.strptime(ldap_vars[1], '%Y-%m-%d').date()
 
-       if today == (last_renewed_on + rtdelta_wrap('years', 2) + rtdelta_wrap('months', 3)):
+       if today >= (last_renewed_on + rtdelta_wrap('years', 2) + rtdelta_wrap('months', 3)):
           send_form_letters(alias_decomm, ldap_vars[2], ldap_vars[3], ldap_vars[1])
           glu.remove_user_from_ldap_group(member, 'mailgrace')
 
@@ -105,7 +105,7 @@ def remove_expired_memberships_from_foundation():
 
         if today == (last_renewed_on + rtdelta_wrap('years', 2) - rtdelta_wrap('months', 1)):
            send_form_letters(close_to_expire_membership_form_letter, ldap_vars[2], ldap_vars[3], 
ldap_vars[1])
-        elif (today - rtdelta_wrap('years', 2)) > last_renewed_on:
+        elif (today - rtdelta_wrap('years', 2)) >= last_renewed_on:
             print(f"Removing { member } from the foundation LDAP group as the membership expired on { 
ldap_vars[1] }")
             glu.remove_user_from_ldap_group(member, 'foundation')
             glu.add_user_to_ldap_group(member, 'mailgrace')