Merge pull request #13499 from mitocw/blarghmatey/update_compute_grades_command

Updated `compute_grades` command for Django 1.8

lms/djangoapps/instructor/management/commands/compute_grades.py

@@ -0,0 +1,55 @@
+#!/usr/bin/python
+"""
+django management command: dump grades to csv files
+for use by batch processes
+"""
+from django.http import Http404
+from django.core.management.base import BaseCommand
+
+from courseware.courses import get_course_by_id
+from instructor.offline_gradecalc import offline_grade_calculation
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
+
+
+class Command(BaseCommand):
+    help = "Compute grades for all students in a course, and store result in DB.\n"
+    help += "Usage: compute_grades course_id_or_dir \n"
+    help += "   course_id_or_dir: space separated list of either course_ids or course_dirs\n"
+    help += 'Example course_id: MITx/8.01rq_MW/Classical_Mechanics_Reading_Questions_Fall_2012_MW_Section'
+
+    def add_arguments(self, parser):
+        parser.add_argument('course_id_or_dir', nargs='+')
+
+    def handle(self, *args, **options):
+
+        print "options = ", options
+
+        try:
+            course_ids = options['course_id_or_dir']
+        except KeyError:
+            print self.help
+            return
+        course_key = None
+        # parse out the course id into a coursekey
+        for course_id in course_ids:
+            try:
+                course_key = CourseKey.from_string(course_id)
+            # if it's not a new-style course key, parse it from an old-style
+            # course key
+            except InvalidKeyError:
+                course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+            try:
+                get_course_by_id(course_key)
+            except Http404 as err:
+                print "-----------------------------------------------------------------------------"
+                print "Sorry, cannot find course with id {}".format(course_id)
+                print "Got exception {}".format(err)
+                print "Please provide a course ID or course data directory name, eg content-mit-801rq"
+                return
+
+            print "-----------------------------------------------------------------------------"
+            print "Computing grades for {}".format(course_id)
+
+            offline_grade_calculation(course_key)

lms/djangoapps/instructor/management/tests/test_compute_grades.py

@@ -0,0 +1,34 @@
+# coding=utf-8
+
+"""Tests for Django instructor management commands"""
+
+from unittest import TestCase
+
+from django.core.management import call_command
+from mock import Mock
+
+from instructor.offline_gradecalc import offline_grade_calculation  # pylint: disable=unused-import
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locator import CourseLocator
+
+
+class InstructorCommandsTest(TestCase):
+    """Unittest subclass for instructor module management commands."""
+
+    def test_compute_grades_command(self):
+        course_id = 'MITx/0.0001/2016_Fall'
+        offline_grade_calculation = Mock()  # pylint: disable=redefined-outer-name
+        CourseKey.from_string = Mock(return_value=CourseLocator(*course_id.split('/')))
+        call_command('compute_grades', )
+        self.asertEqual(offline_grade_calculation.call_count, 1)  # pylint: disable=no-member
+        offline_grade_calculation.assert_called_with(CourseKey.from_string('MITx/0.0001/2016_Fall'))
+
+    def test_compute_grades_command_multiple_courses(self):
+        course_id1 = 'MITx/0.0001/2016_Fall'
+        course_id2 = 'MITx/0.0002/2016_Fall'
+        CourseKey.from_string = Mock()
+        offline_grade_calculation = Mock()  # pylint: disable=redefined-outer-name
+        call_command('compute_grades', '{0} {1}'.format(course_id1, course_id1))
+        self.asertEqual(offline_grade_calculation.call_count, 2)  # pylint: disable=no-member
+        CourseKey.from_string.assert_called_with(course_id1)
+        CourseKey.from_string.assert_called_with(course_id2)