refactor: expire last calls via celery

bin/daily

@@ -43,9 +43,5 @@ $DTDIR/ietf/manage.py populate_yang_model_dirs -v0
 # Re-run yang checks on active documents
 $DTDIR/ietf/manage.py run_yang_model_checks -v0
 
-# Expire last calls
-# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
-$DTDIR/ietf/bin/expire-last-calls
-
 # Purge older PersonApiKeyEvents
 $DTDIR/ietf/manage.py purge_old_personal_api_key_events 14

ietf/doc/tasks.py

@@ -20,6 +20,7 @@
     get_soon_to_expire_drafts,
     send_expire_warning_for_draft,
 )
+from .lastcall import get_expired_last_calls, expire_last_call
 from .models import Document
 
 
@@ -54,3 +55,14 @@ def expire_ids_task():
 def notify_expirations_task(notify_days=14):
     for doc in get_soon_to_expire_drafts(notify_days):
         send_expire_warning_for_draft(doc)
+
+
+@shared_task
+def expire_last_calls_task():
+    for doc in get_expired_last_calls():
+        try:
+            expire_last_call(doc)
+        except Exception:
+            log.log(f"ERROR: Failed to expire last call for {doc.file_tag()} (id={doc.pk})")
+        else:
+            log.log(f"Expired last call for {doc.file_tag()} (id={doc.pk})")

ietf/doc/tests_tasks.py

@@ -6,7 +6,7 @@
 
 from .factories import DocumentFactory
 from .models import Document
-from .tasks import expire_ids_task, notify_expirations_task
+from .tasks import expire_ids_task, expire_last_calls_task, notify_expirations_task
 
 
 class TaskTests(TestCase):
@@ -61,3 +61,26 @@ def test_notify_expirations_task(self, get_drafts_mock, send_warning_mock):
         notify_expirations_task()
         self.assertEqual(send_warning_mock.call_count, 1)
         self.assertEqual(send_warning_mock.call_args[0], ("sentinel",))
+
+    @mock.patch("ietf.doc.tasks.expire_last_call")
+    @mock.patch("ietf.doc.tasks.get_expired_last_calls")
+    def test_expire_last_calls_task(self, mock_get_expired, mock_expire):
+        docs = DocumentFactory.create_batch(3)
+        mock_get_expired.return_value = docs
+        expire_last_calls_task()
+        self.assertTrue(mock_get_expired.called)
+        self.assertEqual(mock_expire.call_count, 3)
+        self.assertEqual(mock_expire.call_args_list[0], mock.call(docs[0]))
+        self.assertEqual(mock_expire.call_args_list[1], mock.call(docs[1]))
+        self.assertEqual(mock_expire.call_args_list[2], mock.call(docs[2]))
+
+        # Check that it runs even if exceptions occur
+        mock_get_expired.reset_mock()
+        mock_expire.reset_mock()
+        mock_expire.side_effect = ValueError
+        expire_last_calls_task()
+        self.assertTrue(mock_get_expired.called)
+        self.assertEqual(mock_expire.call_count, 3)
+        self.assertEqual(mock_expire.call_args_list[0], mock.call(docs[0]))
+        self.assertEqual(mock_expire.call_args_list[1], mock.call(docs[1]))
+        self.assertEqual(mock_expire.call_args_list[2], mock.call(docs[2]))

ietf/utils/management/commands/periodic_tasks.py

@@ -141,6 +141,16 @@ def create_default_tasks(self):
             ),
         )
 
+        PeriodicTask.objects.get_or_create(
+            name="Expire Last Calls",
+            task="ietf.doc.tasks.expire_last_calls_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Move docs whose last call has expired to their next states",
+            ),
+        )
+
         PeriodicTask.objects.get_or_create(
             name="Sync with IANA changes",
             task="ietf.sync.tasks.iana_changes_update_task",