Merge pull request #14151 from edx/sstudent/TNL-6178

context manager for course id in context

lms/djangoapps/grades/models.py

@@ -20,6 +20,7 @@ from django.db import models
 from django.utils.timezone import now
 from eventtracking import tracker
 from model_utils.models import TimeStampedModel
+from track import contexts
 from track.event_transaction_utils import get_event_transaction_id, get_event_transaction_type
 
 from coursewarehistoryextended.fields import UnsignedBigIntAutoField
@@ -433,8 +434,12 @@ class PersistentSubsectionGrade(TimeStampedModel):
         Emits an edx.grades.subsection.grade_calculated event
         with data from the passed grade.
         """
+        # TODO: remove this context manager after completion of AN-6134
+        event_name = u'edx.grades.subsection.grade_calculated'
+        context = contexts.course_context_from_course_id(grade.course_id)
+        with tracker.get_tracker().context(event_name, context):
             tracker.emit(
-            u'edx.grades.subsection.grade_calculated',
+                event_name,
                 {
                     'user_id': unicode(grade.user_id),
                     'course_id': unicode(grade.course_id),
@@ -543,8 +548,12 @@ class PersistentCourseGrade(TimeStampedModel):
         Emits an edx.grades.course.grade_calculated event
         with data from the passed grade.
         """
+        # TODO: remove this context manager after completion of AN-6134
+        event_name = u'edx.grades.course.grade_calculated'
+        context = contexts.course_context_from_course_id(grade.course_id)
+        with tracker.get_tracker().context(event_name, context):
             tracker.emit(
-            u'edx.grades.course.grade_calculated',
+                event_name,
                 {
                     'user_id': unicode(grade.user_id),
                     'course_id': unicode(grade.course_id),

lms/djangoapps/grades/tests/integration/test_events.py

@@ -80,8 +80,8 @@ class GradesEventIntegrationTest(ProblemSubmissionTestMixin, SharedModuleStoreTe
         self.submit_question_answer('p1', {'2_1': 'choice_choice_2'})
 
         # check logging to make sure id's are tracked correctly across events
-        event_transaction_id = handlers_tracker.method_calls[0][1][1]['event_transaction_id']
-        for call in models_tracker.method_calls:
+        event_transaction_id = handlers_tracker.emit.mock_calls[0][1][1]['event_transaction_id']
+        for call in models_tracker.emit.mock_calls:
             self.assertEqual(event_transaction_id, call[1][1]['event_transaction_id'])
             self.assertEqual(unicode(SUBMITTED_TYPE), call[1][1]['event_transaction_type'])
 
@@ -123,7 +123,7 @@ class GradesEventIntegrationTest(ProblemSubmissionTestMixin, SharedModuleStoreTe
         event_transaction_id = enrollment_tracker.method_calls[0][1][1]['event_transaction_id']
 
         # make sure the id is propagated throughout the event flow
-        for call in models_tracker.method_calls:
+        for call in models_tracker.emit.mock_calls:
             self.assertEqual(event_transaction_id, call[1][1]['event_transaction_id'])
             self.assertEqual(unicode(STATE_DELETED_TYPE), call[1][1]['event_transaction_type'])
 
@@ -188,13 +188,23 @@ class GradesEventIntegrationTest(ProblemSubmissionTestMixin, SharedModuleStoreTe
         )
         # check logging to make sure id's are tracked correctly across
         # events
-        event_transaction_id = instructor_task_tracker.method_calls[0][1][1]['event_transaction_id']
-
+        event_transaction_id = instructor_task_tracker.emit.mock_calls[0][1][1]['event_transaction_id']
+        self.assertEqual(
+            instructor_task_tracker.get_tracker().context.call_args[0],
+            ('edx.grades.problem.rescored', {'course_id': unicode(self.course.id), 'org_id': unicode(self.course.org)})
+        )
         # make sure the id is propagated throughout the event flow
-        for call in models_tracker.method_calls:
+        for call in models_tracker.emit.mock_calls:
             self.assertEqual(event_transaction_id, call[1][1]['event_transaction_id'])
             self.assertEqual(unicode(RESCORE_TYPE), call[1][1]['event_transaction_type'])
 
+        # make sure the models calls have re-added the course id to the context
+        for args in models_tracker.get_tracker().context.call_args_list:
+            self.assertEqual(
+                args[0][1],
+                {'course_id': unicode(self.course.id), 'org_id': unicode(self.course.org)}
+            )
+
         handlers_tracker.assert_not_called()
 
         instructor_task_tracker.emit.assert_called_with(

lms/djangoapps/instructor_task/tasks_helper.py

@@ -28,6 +28,7 @@ from lms.djangoapps.instructor.paidcourse_enrollment_report import PaidCourseEnr
 from lms.djangoapps.teams.models import CourseTeamMembership
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
 from pytz import UTC
+from track import contexts
 from xmodule.modulestore.django import modulestore
 from xmodule.split_test_module import get_split_user_partitions
 
@@ -573,6 +574,10 @@ def rescore_problem_module_state(xmodule_instance_args, module_descriptor, stude
                 result['new_raw_possible'],
                 module_descriptor.weight,
             )
+
+            # TODO: remove this context manager after completion of AN-6134
+            context = contexts.course_context_from_course_id(course_id)
+            with tracker.get_tracker().context(GRADES_RESCORE_EVENT_TYPE, context):
                 tracker.emit(
                     unicode(GRADES_RESCORE_EVENT_TYPE),
                     {