Handle & show appropriate error msg when course run create fails.

course_discovery/apps/publisher/signals.py

@@ -14,8 +14,11 @@ logger = logging.getLogger(__name__)
 
 
 def get_related_discovery_course_run(publisher_course_run):
-    discovery_course = publisher_course_run.course.discovery_counterpart
-    return discovery_course.course_runs.latest('start')
+    try:
+        discovery_course = publisher_course_run.course.discovery_counterpart
+        return discovery_course.course_runs.latest('start')
+    except ObjectDoesNotExist:
+        return
 
 
 @receiver(post_save, sender=CourseRun)
@@ -27,7 +30,7 @@ def create_course_run_in_studio_receiver(sender, instance, created, **kwargs):
                 if not organization.organization_extension.auto_create_in_studio:
                     logger.warning(
                         ('Course run [%d] will not be automatically created in studio.'
-                            'Organization [%s] has opted out of this feature.'),
+                         'Organization [%s] has opted out of this feature.'),
                         course.id,
                         organization.key,
                     )
@@ -41,27 +44,38 @@ def create_course_run_in_studio_receiver(sender, instance, created, **kwargs):
         partner = course.partner
 
         if not partner:
-            logger.error('Failed to publish course run [%d] to Studio. Related course [%d] has no associated Partner.',
-                         instance.id, course.id)
+            logger.error(
+                'Failed to publish course run [%d] to Studio. Related course [%d] has no associated Partner.',
+                instance.id, course.id
+            )
             return
 
         logger.info('Publishing course run [%d] to Studio...', instance.id)
         api = StudioAPI(instance.course.partner.studio_api_client)
 
-        try:
+        discovery_course_run = get_related_discovery_course_run(instance)
+
+        if discovery_course_run:
             try:
-                discovery_course_run = get_related_discovery_course_run(instance)
                 logger.info('Creating a re-run of [%s]...', discovery_course_run.key)
                 response = api.create_course_rerun_in_studio(instance, discovery_course_run)
-            except ObjectDoesNotExist:
+            except SlumberBaseException as ex:
+                logger.exception(
+                    'Failed to create course re-run [%s] on Studio: %s',
+                    discovery_course_run.key,
+                    ex.content
+                )
+                raise
+        else:
+            try:
                 logger.info('Creating a new run of [%s]...', instance.course.key)
                 response = api.create_course_run_in_studio(instance)
+            except SlumberBaseException as ex:
+                logger.exception('Failed to create course run [%s] on Studio: %s', instance.id, ex.content)
+                raise
 
-            instance.lms_course_id = response['id']
-            instance.save()
-        except SlumberBaseException as ex:
-            logger.exception('Failed to create course run [%d] on Studio: %s', instance.id, ex.content)
-            raise
+        instance.lms_course_id = response['id']
+        instance.save()
 
         try:
             api.update_course_run_image_in_studio(instance)

course_discovery/apps/publisher/templates/publisher/course_detail.html

@@ -52,7 +52,7 @@
                 <div class="heading">
                     {% trans "Course Team Admin" %}
                 </div>
-                <div>{{ object.course_team_admin.full_name }}</div>
+                <div>{% firstof  object.course_team_admin.full_name object.course_team_admin.username %}</div>
             </div>
 
             <div class="info-item history-field-container">

course_discovery/apps/publisher/tests/test_signals.py

@@ -213,6 +213,39 @@ class TestCreateCourseRunInStudio:
                     json.dumps(body).encode('utf8')
                 )
 
+    @responses.activate
+    @mock.patch.object(Partner, 'access_token', return_value='JWT fake')
+    @override_switch('enable_publisher_create_course_run_in_studio', active=True)
+    def test_create_course_run_error_with_discovery_run(self, mock_access_token):  # pylint: disable=unused-argument
+        """
+        Tests that course run creations raises exception and logs expected exception message
+        """
+        number = 'TestX'
+        organization = OrganizationFactory()
+        partner = organization.partner
+        course_key = '{org}+{number}'.format(org=organization.key, number=number)
+        discovery_course_run = DiscoveryCourseRunFactory(course__partner=partner, course__key=course_key)
+
+        body = {'error': 'Server error'}
+        studio_url_root = partner.studio_url.strip('/')
+
+        url = '{root}/api/v1/course_runs/{course_run_key}/rerun/'.format(
+            root=studio_url_root,
+            course_run_key=discovery_course_run.key
+        )
+        responses.add(responses.POST, url, json=body, status=500)
+
+        with mock.patch('course_discovery.apps.publisher.signals.logger.exception') as mock_logger:
+            with pytest.raises(HttpServerError):
+                CourseRunFactory(lms_course_id=None, course__organizations=[organization], course__number=number)
+
+            assert len(responses.calls) == 1
+            mock_logger.assert_called_with(
+                'Failed to create course re-run [%s] on Studio: %s',
+                discovery_course_run.key,
+                json.dumps(body).encode('utf8')
+            )
+
 
 @pytest.mark.django_db
 class TestCreateOrganizations:

course_discovery/apps/publisher/views.py

@@ -576,6 +576,16 @@ class CreateCourseRunView(mixins.LoginRequiredMixin, mixins.PublisherUserRequire
 
         return initial_seat_data
 
+    def _handle_exception(self, exception):
+        error_msg = _('There was an error saving this course run:')
+        default_message = u'{msg} {ex}'.format(msg=error_msg, ex=exception)
+        try:
+            json_response = exception.response.json()
+            error_fields = ','.join(json_response.keys())
+            return u'{default}. Error fields: {error_fields}'.format(default=default_message, error_fields=error_fields)
+        except:  # pylint: disable=bare-except
+            return default_message
+
     def get_context_data(self, **kwargs):
         parent_course = self.get_parent_course()
         last_run = self.get_last_run()
@@ -590,6 +600,17 @@ class CreateCourseRunView(mixins.LoginRequiredMixin, mixins.PublisherUserRequire
         }
         return context
 
+    def render_bad_response(self, run_form, seat_form):
+        context = self.get_context_data()
+        context.update(
+            {
+                'run_form': run_form,
+                'seat_form': seat_form
+            }
+        )
+
+        return render(self.request, self.template_name, context, status=400)
+
     def post(self, request, *args, **kwargs):
         user = request.user
         parent_course = self.get_parent_course()
@@ -597,36 +618,9 @@ class CreateCourseRunView(mixins.LoginRequiredMixin, mixins.PublisherUserRequire
         run_form = self.run_form(request.POST)
         seat_form = self.seat_form(request.POST)
         course_user_roles = parent_course.course_user_roles.filter(role__in=COURSE_ROLES)
+        publisher_permission_flag_enabled = waffle.switch_is_active('disable_publisher_permissions')
 
-        if course_user_roles.count() == len(COURSE_ROLES) or waffle.switch_is_active('disable_publisher_permissions'):
-            if run_form.is_valid() and seat_form.is_valid():
-                try:
-                    with transaction.atomic():
-                        course_run = run_form.save(commit=False, course=parent_course, changed_by=user)
-                        self.set_last_run_data(course_run)
-                        seat_form.save(course_run=course_run, changed_by=user)
-
-                        # Initialize workflow for Course-run.
-                        CourseRunState.objects.create(course_run=course_run, owner_role=PublisherUserRole.CourseTeam)
-
-                        # pylint: disable=no-member
-                        success_msg = _('You have successfully created a course run for {course_title}.').format(
-                            course_title=parent_course.title
-                        )
-                        messages.success(request, success_msg)
-
-                        emails.send_email_for_course_creation(parent_course, course_run, request.site)
-                        return HttpResponseRedirect(reverse(self.success_url, kwargs={'pk': course_run.id}))
-                except Exception as error:  # pylint: disable=broad-except
-                    # pylint: disable=no-member
-                    error_msg = _('There was an error saving this course run: {error}').format(error=error)
-                    messages.error(request, error_msg)
-                    logger.exception('Unable to create course run and seat for course [%s].', parent_course.id)
-            else:
-                messages.error(
-                    request, _('The page could not be updated. Make sure that all values are correct, then try again.')
-                )
-        else:
+        if not (course_user_roles.count() == len(COURSE_ROLES) or publisher_permission_flag_enabled):
             logger.error(
                 'Course [%s] is missing default course roles. Current roles [%s], required roles [%s]',
                 parent_course.id,
@@ -636,20 +630,42 @@ class CreateCourseRunView(mixins.LoginRequiredMixin, mixins.PublisherUserRequire
             messages.error(
                 request,
                 _(
-                    "Your organization does not have default roles to review/approve this course-run. "
-                    "Please contact your partner manager to create default roles."
+                    'Your organization does not have default roles to review/approve this course-run. '
+                    'Please contact your partner manager to create default roles.'
                 )
             )
+            return self.render_bad_response(run_form, seat_form)
 
-        context = self.get_context_data()
-        context.update(
-            {
-                'run_form': run_form,
-                'seat_form': seat_form
-            }
-        )
+        if not (run_form.is_valid() and seat_form.is_valid()):
+            messages.error(
+                request, _('The page could not be updated. Make sure that all values are correct, then try again.')
+            )
+            return self.render_bad_response(run_form, seat_form)
 
-        return render(request, self.template_name, context, status=400)
+        try:
+            with transaction.atomic():
+                course_run = run_form.save(commit=False, course=parent_course, changed_by=user)
+                self.set_last_run_data(course_run)
+                seat_form.save(course_run=course_run, changed_by=user)
+
+                # Initialize workflow for Course-run.
+                CourseRunState.objects.create(course_run=course_run, owner_role=PublisherUserRole.CourseTeam)
+
+                # pylint: disable=no-member
+                success_msg = _('You have successfully created a course run for {course_title}.').format(
+                    course_title=parent_course.title
+                )
+                messages.success(request, success_msg)
+
+                emails.send_email_for_course_creation(parent_course, course_run, request.site)
+                return HttpResponseRedirect(reverse(self.success_url, kwargs={'pk': course_run.id}))
+        except Exception as ex:  # pylint: disable=broad-except
+            # pylint: disable=no-member
+            error_msg = self._handle_exception(ex)
+            messages.error(request, error_msg)
+            logger.exception('Unable to create course run and seat for course [%s].', parent_course.id)
+
+        return self.render_bad_response(run_form, seat_form)
 
 
 class CreateRunFromDashboardView(CreateCourseRunView):

course_discovery/conf/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 16:13+0000\n"
+"POT-Creation-Date: 2018-01-31 16:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3313,13 +3313,7 @@ msgid "marketing"
 msgstr ""
 
 #: apps/publisher/views.py
-#, python-brace-format
-msgid "You have successfully created a course run for {course_title}."
-msgstr ""
-
-#: apps/publisher/views.py
-#, python-brace-format
-msgid "There was an error saving this course run: {error}"
+msgid "There was an error saving this course run:"
 msgstr ""
 
 #: apps/publisher/views.py
@@ -3329,6 +3323,11 @@ msgid ""
 msgstr ""
 
 #: apps/publisher/views.py
+#, python-brace-format
+msgid "You have successfully created a course run for {course_title}."
+msgstr ""
+
+#: apps/publisher/views.py
 msgid "Course run updated successfully."
 msgstr ""
 

course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 16:13+0000\n"
+"POT-Creation-Date: 2018-01-31 16:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

course_discovery/conf/locale/eo/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 16:13+0000\n"
+"POT-Creation-Date: 2018-01-31 16:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4022,18 +4022,10 @@ msgid "marketing"
 msgstr "märkétïng Ⱡ'σяєм ιρѕυм ∂σł#"
 
 #: apps/publisher/views.py
-#, python-brace-format
-msgid "You have successfully created a course run for {course_title}."
+msgid "There was an error saving this course run:"
 msgstr ""
-"Ýöü hävé süççéssfüllý çréätéd ä çöürsé rün för {course_title}. Ⱡ'σяєм ιρѕυм "
-"∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
-
-#: apps/publisher/views.py
-#, python-brace-format
-msgid "There was an error saving this course run: {error}"
-msgstr ""
-"Théré wäs än érrör sävïng thïs çöürsé rün: {error} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
-"αмєт, ¢σηѕє¢тєтυя α#"
+"Théré wäs än érrör sävïng thïs çöürsé rün: Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя #"
 
 #: apps/publisher/views.py
 msgid ""
@@ -4050,6 +4042,13 @@ msgstr ""
 "ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυηт мσłłιт αηιм ι∂ єѕт #"
 
 #: apps/publisher/views.py
+#, python-brace-format
+msgid "You have successfully created a course run for {course_title}."
+msgstr ""
+"Ýöü hävé süççéssfüllý çréätéd ä çöürsé rün för {course_title}. Ⱡ'σяєм ιρѕυм "
+"∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+
+#: apps/publisher/views.py
 msgid "Course run updated successfully."
 msgstr ""
 "Çöürsé rün üpdätéd süççéssfüllý. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"

course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 16:13+0000\n"
+"POT-Creation-Date: 2018-01-31 16:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"