Refactor 'trigger_initial_build' to allow calling from other places

Author: humitos

readthedocs/core/utils/__init__.py

@@ -5,7 +5,7 @@
 import os
 import re
 
-from celery import chord, group
+from celery import chord, group, chain
 from django.conf import settings
 from django.utils.functional import keep_lazy
 from django.utils.safestring import SafeText, mark_safe
@@ -165,6 +165,27 @@ def trigger_build(project, version=None, record=True, force=False):
     return (update_docs_task.apply_async(), build)
 
 
+def trigger_initial_build(project, user):
+    """
+    Trigger initial build after project is imported.
+
+    :param project: project's documentation to be built
+    :returns: Celery AsyncResult promise
+    """
+
+    update_docs, build = prepare_build(project)
+    if (update_docs, build) == (None, None):
+        return None
+
+    from readthedocs.oauth.tasks import attach_webhook
+    task_promise = chain(
+        attach_webhook.si(project.pk, user.pk),
+        update_docs,
+    )
+    async_result = task_promise.apply_async()
+    return async_result
+
+
 def send_email(
         recipient, subject, template, template_html, context=None, request=None,
         from_email=None, **kwargs

readthedocs/projects/views/private.py

@@ -3,7 +3,6 @@
 import logging
 
 from allauth.socialaccount.models import SocialAccount
-from celery import chain
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
@@ -24,9 +23,9 @@
 from vanilla import CreateView, DeleteView, DetailView, GenericView, UpdateView
 
 from readthedocs.builds.forms import VersionForm
-from readthedocs.builds.models import Build, Version
+from readthedocs.builds.models import Version
 from readthedocs.core.mixins import ListViewWithForm, LoginRequiredMixin
-from readthedocs.core.utils import broadcast, prepare_build, trigger_build
+from readthedocs.core.utils import broadcast, trigger_build, trigger_initial_build
 from readthedocs.integrations.models import HttpExchange, Integration
 from readthedocs.oauth.services import registry
 from readthedocs.oauth.tasks import attach_webhook
@@ -272,17 +271,7 @@ def done(self, form_list, **kwargs):
         )
 
     def trigger_initial_build(self, project):
-        """Trigger initial build."""
-        update_docs, build = prepare_build(project)
-        if (update_docs, build) == (None, None):
-            return None
-
-        task_promise = chain(
-            attach_webhook.si(project.pk, self.request.user.pk),
-            update_docs,
-        )
-        async_result = task_promise.apply_async()
-        return async_result
+        return trigger_initial_build(project, self.request.user)
 
     def is_advanced(self):
         """Determine if the user selected the `show advanced` field."""