More fixes

Author: JelteF

pgcommitfest/commitfest/models.py

@@ -208,27 +208,23 @@ def send_closure_notifications(self):
             next_cf_url = "https://commitfest.postgresql.org/"
 
         # Collect unique authors and their patches
-        # Only include authors who have notify_all_author enabled
         authors_patches = {}
         for poc in open_pocs:
             for author in poc.patch.authors.all():
-                if not author.email:
-                    continue
-                try:
-                    if not author.userprofile.notify_all_author:
-                        continue
-                except UserProfile.DoesNotExist:
-                    continue
                 if author not in authors_patches:
                     authors_patches[author] = []
                 authors_patches[author].append(poc)
 
-        # Send email to each author
+        # Send email to each author who has notifications enabled
         for author, patches in authors_patches.items():
-            # Get user's notification email preference
-            email = author.email
-            if author.userprofile.notifyemail:
-                email = author.userprofile.notifyemail.email
+            try:
+                if not author.userprofile.notify_all_author:
+                    continue
+                notifyemail = author.userprofile.notifyemail
+            except UserProfile.DoesNotExist:
+                continue
+
+            email = notifyemail.email if notifyemail else author.email
 
             send_template_mail(
                 settings.NOTIFICATION_FROM,

pgcommitfest/commitfest/tests/test_closure_notifications.py

@@ -200,26 +200,6 @@ def test_coauthors_both_receive_notification(alice, bob, in_progress_cf, topic):
     assert receivers == {alice.email, bob.email}
 
 
-def test_no_notification_for_author_without_email(bob, in_progress_cf, topic):
-    """Authors without email addresses should be skipped even if opted in."""
-    UserProfile.objects.create(user=bob, notify_all_author=True)
-    bob.email = ""
-    bob.save()
-
-    patch = Patch.objects.create(name="Test Patch", topic=topic)
-    patch.authors.add(bob)
-    PatchOnCommitFest.objects.create(
-        patch=patch,
-        commitfest=in_progress_cf,
-        enterdate=datetime.now(),
-        status=PatchOnCommitFest.STATUS_REVIEW,
-    )
-
-    in_progress_cf.send_closure_notifications()
-
-    assert QueuedMail.objects.count() == 0
-
-
 def test_no_notification_for_author_without_notify_all_author(
     bob, in_progress_cf, topic
 ):