Automatically move patches in open CF to in progress CF if they get committed

Author: JelteF

pgcommitfest/commitfest/models.py

@@ -265,6 +265,10 @@ def next_draft_cf(start_date):
             draft=True,
         )
 
+    @classmethod
+    def get_in_progress(cls):
+        return cls.objects.filter(status=CommitFest.STATUS_INPROGRESS).first()
+
     def __str__(self):
         return self.name
 
@@ -406,7 +410,9 @@ def update_lastmail(self):
         else:
             self.lastmail = max(threads, key=lambda t: t.latestmessage).latestmessage
 
-    def move(self, from_cf, to_cf):
+    def move(self, from_cf, to_cf, by_user, allow_move_to_in_progress=False):
+        """Returns the new PatchOnCommitFest object, or raises UserInputError"""
+
         current_poc = self.current_patch_on_commitfest()
         if from_cf.id != current_poc.commitfest.id:
             raise UserInputError("Patch not in source commitfest.")
@@ -423,7 +429,10 @@ def move(self, from_cf, to_cf):
                 f"Patch in state {current_poc.statusstring} cannot be moved."
             )
 
-        if not to_cf.is_open:
+        if to_cf.is_in_progress:
+            if not allow_move_to_in_progress:
+                raise UserInputError("Patch can only be moved to an open commitfest")
+        elif not to_cf.is_open:
             raise UserInputError("Patch can only be moved to an open commitfest")
 
         old_status = current_poc.status
@@ -443,6 +452,14 @@ def move(self, from_cf, to_cf):
         self.set_modified()
         self.save()
 
+        PatchHistory(
+            patch=self,
+            by=by_user,
+            what=f"Moved from CF {from_cf} to CF {to_cf}",
+        ).save_and_notify()
+
+        return new_poc
+
     def __str__(self):
         return self.name
 

pgcommitfest/commitfest/views.py

@@ -1053,6 +1053,17 @@ def close(request, patchid, status):
                 by=request.user,
                 what="Changed committer to %s" % committer,
             ).save_and_notify(prevcommitter=prevcommitter)
+
+        if poc.is_open:
+            in_progress_cf = CommitFest.get_in_progress()
+            if in_progress_cf is not None:
+                poc = patch.move(
+                    poc.commitfest,
+                    in_progress_cf,
+                    request.user,
+                    allow_move_to_in_progress=True,
+                )
+
         poc.status = PatchOnCommitFest.STATUS_COMMITTED
 
     status_mapping = {
@@ -1098,17 +1109,11 @@ def move(request, patchid):
 
     patch = get_object_or_404(Patch, pk=patchid)
     try:
-        patch.move(from_cf, to_cf)
+        patch.move(from_cf, to_cf, request.user)
     except UserInputError as e:
         messages.error(request, f"Failed to move patch: {e}")
         return HttpResponseRedirect(f"/patch/{patchid}/")
 
-    PatchHistory(
-        patch=patch,
-        by=request.user,
-        what=f"Moved from CF {from_cf} to CF {to_cf}",
-    ).save_and_notify()
-
     return HttpResponseRedirect(f"/patch/{patchid}/")