Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 75467f6

Browse files
authored
Merge pull request #142 from edx/thallada/enable-posted-forum
AN-7880 Uncomment including "posted_forum" events
2 parents f3d5c67 + e3ec9f1 commit 75467f6

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

analytics_data_api/v0/serializers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,13 @@ class CourseActivityWeeklySerializer(serializers.ModelSerializer):
300300
any = serializers.IntegerField(required=False)
301301
attempted_problem = serializers.IntegerField(required=False)
302302
played_video = serializers.IntegerField(required=False)
303-
# posted_forum = serializers.IntegerField(required=False)
303+
posted_forum = serializers.IntegerField(required=False)
304304
created = serializers.DateTimeField(format=settings.DATETIME_FORMAT)
305305

306306
class Meta(object):
307307
model = models.CourseActivityWeekly
308-
# TODO: Add 'posted_forum' here to restore forum data
309-
fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video', 'created')
308+
fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video',
309+
'posted_forum', 'created')
310310

311311

312312
class VideoSerializer(ModelSerializerWithCreatedField):

analytics_data_api/v0/tests/views/test_courses.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,8 @@ def generate_data(self, course_id=None):
165165
course_id = course_id or self.course_id
166166
interval_start = datetime.datetime(2014, 1, 1, tzinfo=pytz.utc)
167167
interval_end = interval_start + datetime.timedelta(weeks=1)
168-
# G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
169-
# interval_end=interval_end,
170-
# activity_type='POSTED_FORUM', count=100)
168+
G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
169+
interval_end=interval_end, activity_type='POSTED_FORUM', count=100)
171170
G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
172171
interval_end=interval_end,
173172
activity_type='ATTEMPTED_PROBLEM', count=200)

0 commit comments

Comments
 (0)