Additional comments

Author: JelteF

pgcommitfest/commitfest/models.py

@@ -191,22 +191,6 @@ def send_closure_notifications(self):
         if not open_pocs:
             return
 
-        # Get the next open commitfest if available
-        next_cf = (
-            CommitFest.objects.filter(
-                status=CommitFest.STATUS_OPEN,
-                draft=self.draft,
-                startdate__gt=self.enddate,
-            )
-            .order_by("startdate")
-            .first()
-        )
-
-        if next_cf:
-            next_cf_url = f"https://commitfest.postgresql.org/{next_cf.id}/"
-        else:
-            next_cf_url = "https://commitfest.postgresql.org/"
-
         # Collect unique authors and their patches
         authors_patches = {}
         for poc in open_pocs:
@@ -230,14 +214,12 @@ def send_closure_notifications(self):
                 settings.NOTIFICATION_FROM,
                 None,
                 email,
-                f"Commitfest {self.name} has closed",
+                f"Commitfest {self.name} has closed and you have unmoved patches",
                 "mail/commitfest_closure.txt",
                 {
                     "user": author,
                     "commitfest": self,
                     "patches": patches,
-                    "next_cf": next_cf,
-                    "next_cf_url": next_cf_url,
                 },
             )
 

pgcommitfest/commitfest/templates/mail/commitfest_closure.txt

@@ -1,5 +1,3 @@
-Hello {{user.first_name|default:user.username}},
-
 Commitfest {{commitfest.name}} has now closed.
 
 You have {{patches|length}} open patch{{patches|length|pluralize:"es"}} that need{{patches|length|pluralize:"s,"}} attention:
@@ -11,6 +9,6 @@ You have {{patches|length}} open patch{{patches|length|pluralize:"es"}} that nee
 
 Please take action on {{patches|length|pluralize:"these patches,this patch"}} by doing either of the following:
 
-1. If you want to continue working on {{patches|length|pluralize:"them,it"}}, move {{patches|length|pluralize:"them,it"}} to the next commitfest{% if next_cf %}: {{next_cf_url}}{% endif %}
+1. If you want to continue working on {{patches|length|pluralize:"them,it"}}, move {{patches|length|pluralize:"them,it"}} to the next commitfest.
 
 2. If you no longer wish to pursue {{patches|length|pluralize:"these patches,this patch"}}, please close {{patches|length|pluralize:"them,it"}} with an appropriate status (Withdrawn, Returned with feedback, etc.)

pgcommitfest/commitfest/tests/test_refresh_commitfests.py

@@ -35,6 +35,7 @@ def test_inprogress_cf_closes_when_enddate_passed(commitfests, alice):
     in_progress_cf.refresh_from_db()
     assert in_progress_cf.status == CommitFest.STATUS_CLOSED
 
+    # Patch should be auto-moved
     patch.refresh_from_db()
     assert patch.current_commitfest().id == open_cf.id
 
@@ -83,6 +84,7 @@ def test_open_cf_closes_when_enddate_passed(commitfests, alice):
     ).first()
     assert new_open is not None
 
+    # Patch should be auto-moved
     patch.refresh_from_db()
     assert patch.current_commitfest().id == new_open.id
 
@@ -130,6 +132,7 @@ def test_draft_cf_closes_when_enddate_passed(commitfests, alice):
     assert new_draft is not None
     assert new_draft.startdate > draft_cf.enddate
 
+    # Patch should be auto-moved
     patch.refresh_from_db()
     assert patch.current_commitfest().id == new_draft.id