Merge pull request openedx-unsupported#31 from edx/no-forum-data

Removed forum data from activity resource
edx · Sep 26, 2014 · 0d6266f · 0d6266f
2 parents 4cd7450 + c4ff28e
commit 0d6266f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/analytics_data_api/v0/serializers.py b/analytics_data_api/v0/serializers.py
@@ -122,11 +122,10 @@ 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 = CourseActivityWeekly
-        fields = (
-            'interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video', 'posted_forum',
-            'created')
+        # TODO: Add 'posted_forum' here to restore forum data
+        fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video', 'created')
diff --git a/analytics_data_api/v0/tests/test_views.py b/analytics_data_api/v0/tests/test_views.py
@@ -135,9 +135,9 @@ def setUp(self):
         self.course_id = 'edX/DemoX/Demo_Course'
         interval_start = datetime.datetime(2014, 1, 1, tzinfo=pytz.utc)
         interval_end = interval_start + datetime.timedelta(weeks=1)
-        G(models.CourseActivityWeekly, course_id=self.course_id, interval_start=interval_start,
-          interval_end=interval_end,
-          activity_type='POSTED_FORUM', count=100)
+        # G(models.CourseActivityWeekly, course_id=self.course_id, interval_start=interval_start,
+        #   interval_end=interval_end,
+        #   activity_type='POSTED_FORUM', count=100)
         G(models.CourseActivityWeekly, course_id=self.course_id, interval_start=interval_start,
           interval_end=interval_end,
           activity_type='ATTEMPTED_PROBLEM', count=200)
@@ -367,7 +367,8 @@ class CourseActivityWeeklyViewTests(CourseViewTestCaseMixin, TestCaseWithAuthent
     path = '/activity/'
     default_order_by = 'interval_end'
     model = CourseActivityWeekly
-    activity_types = ['ACTIVE', 'ATTEMPTED_PROBLEM', 'PLAYED_VIDEO', 'POSTED_FORUM']
+    # activity_types = ['ACTIVE', 'ATTEMPTED_PROBLEM', 'PLAYED_VIDEO', 'POSTED_FORUM']
+    activity_types = ['ACTIVE', 'ATTEMPTED_PROBLEM', 'PLAYED_VIDEO']
 
     def setUp(self):
         super(CourseActivityWeeklyViewTests, self).setUp()