Merge e3ec9f1 into f3d5c67

edx · Oct 25, 2016 · ba90035 · ba90035
2 parents f3d5c67 + e3ec9f1
commit ba90035
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/analytics_data_api/v0/serializers.py b/analytics_data_api/v0/serializers.py
@@ -300,13 +300,13 @@ class CourseActivityWeeklySerializer(serializers.ModelSerializer):
     any = serializers.IntegerField(required=False)
     attempted_problem = serializers.IntegerField(required=False)
     played_video = serializers.IntegerField(required=False)
-    # posted_forum = serializers.IntegerField(required=False)
+    posted_forum = serializers.IntegerField(required=False)
     created = serializers.DateTimeField(format=settings.DATETIME_FORMAT)
 
     class Meta(object):
         model = models.CourseActivityWeekly
-        # TODO: Add 'posted_forum' here to restore forum data
-        fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video', 'created')
+        fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video',
+                  'posted_forum', 'created')
 
 
 class VideoSerializer(ModelSerializerWithCreatedField):

diff --git a/analytics_data_api/v0/tests/views/test_courses.py b/analytics_data_api/v0/tests/views/test_courses.py
@@ -165,9 +165,8 @@ def generate_data(self, course_id=None):
         course_id = course_id or self.course_id
         interval_start = datetime.datetime(2014, 1, 1, tzinfo=pytz.utc)
         interval_end = interval_start + datetime.timedelta(weeks=1)
-        # G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
-        # interval_end=interval_end,
-        # activity_type='POSTED_FORUM', count=100)
+        G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
+          interval_end=interval_end, activity_type='POSTED_FORUM', count=100)
         G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
           interval_end=interval_end,
           activity_type='ATTEMPTED_PROBLEM', count=200)