back to 💯

Author: mfosterw

democrasite/webiscite/models.py

@@ -155,8 +155,9 @@ def create_from_github(
             self._bill.full_clean()
             self._bill.save()
             logger.info("PR %s: Bill %s created", pull_request.number, self._bill.id)
+            bill = self._bill
 
-        return self._bill
+        return bill  # noqa: RET504
 
     @contextmanager
     def _create_submit_task(self) -> Iterator[PeriodicTask]:
@@ -165,7 +166,7 @@ def _create_submit_task(self) -> Iterator[PeriodicTask]:
         Returns:
             The task that was scheduled
         """
-        # This can be extracted to a signal if we want to support other creation methods
+        # This might be better as a signal but I want to keep it localized
         voting_ends, __ = IntervalSchedule.objects.get_or_create(
             every=settings.WEBISCITE_VOTING_PERIOD, period=IntervalSchedule.DAYS
         )
@@ -182,9 +183,15 @@ def _create_submit_task(self) -> Iterator[PeriodicTask]:
         try:
             yield submit_task
         finally:
-            # This might be better as a signal but I want to keep it localized
-            if not isinstance(self._bill.id, int):
-                raise TypeError("self._bill was not saved in the submit task context")
+            if not (
+                hasattr(self, "_bill")
+                and hasattr(self._bill, "id")
+                and isinstance(self._bill.id, int)
+            ):
+                raise AttributeError(
+                    "self._bill was not saved in the submit task context"
+                )
+
             submit_task.name = f"bill_submit:{self._bill.id}"
             submit_task.args = json.dumps([self._bill.id])
             submit_task.save()
@@ -194,6 +201,8 @@ def _create_submit_task(self) -> Iterator[PeriodicTask]:
                 submit_task.name,
             )
 
+            del self._bill
+
 
 class Bill(StatusModel, TimeStampedModel):
     """Model for a proposal to merge a particular pull request into the main branch"""

democrasite/webiscite/tests/test_models.py

@@ -86,6 +86,17 @@ def test_create_from_github(self, user: User):
         assert bill.pk is not None
         assert bill._submit_task.enabled is True  # noqa: SLF001
 
+    def test__create_submit_task(self):
+        # just hit the error branch of finally clause
+        with (
+            pytest.raises(
+                AttributeError,
+                match="self._bill was not saved in the submit task context",
+            ),
+            Bill.objects._create_submit_task(),  # noqa: SLF001
+        ):
+            pass
+
 
 class TestBill:
     def test_unique_open_pull_request(self, bill: Bill):