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

Commit 87c4a49

Browse files
thalladadsjen
authored andcommitted
Default gender counts to 0, removed unused imports, fixed linting errors
1 parent 3809ba5 commit 87c4a49

6 files changed

Lines changed: 23 additions & 8 deletions

File tree

analytics_data_api/v0/serializers.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class ModelSerializerWithCreatedField(serializers.ModelSerializer):
4747
created = serializers.DateTimeField(format=settings.DATETIME_FORMAT)
4848

4949

50+
# pylint: disable=abstract-method
5051
class ProblemSerializer(serializers.Serializer):
5152
"""
5253
Serializer for problems.
@@ -59,6 +60,7 @@ class ProblemSerializer(serializers.Serializer):
5960
created = serializers.DateTimeField(format=settings.DATETIME_FORMAT)
6061

6162

63+
# pylint: disable=abstract-method
6264
class ProblemsAndTagsSerializer(serializers.Serializer):
6365
"""
6466
Serializer for problems and tags.
@@ -231,6 +233,7 @@ class Meta(object):
231233
fields = ['course_id', 'date', 'count', 'cumulative_count', 'created'] + ENROLLMENT_MODES
232234

233235

236+
# pylint: disable=abstract-method
234237
class CountrySerializer(serializers.Serializer):
235238
"""
236239
Serialize country to an object with fields for the complete country name
@@ -329,10 +332,12 @@ class Meta(object):
329332
)
330333

331334

335+
# pylint: disable=abstract-method
332336
class LastUpdatedSerializer(serializers.Serializer):
333337
last_updated = serializers.DateTimeField(source='date', format=settings.DATE_FORMAT)
334338

335339

340+
# pylint: disable=abstract-method
336341
class LearnerSerializer(serializers.Serializer):
337342
username = serializers.CharField()
338343
enrollment_mode = serializers.CharField()
@@ -407,6 +412,7 @@ def get_paginated_response(self, data):
407412
]))
408413

409414

415+
# pylint: disable=abstract-method
410416
class EngagementDaySerializer(serializers.Serializer):
411417
date = serializers.DateField(format=settings.DATE_FORMAT)
412418
problems_attempted = serializers.SerializerMethodField()
@@ -427,11 +433,13 @@ def get_videos_viewed(self, obj):
427433
return obj.get('videos_viewed', 0)
428434

429435

436+
# pylint: disable=abstract-method
430437
class DateRangeSerializer(serializers.Serializer):
431438
start = serializers.DateTimeField(source='start_date', format=settings.DATE_FORMAT)
432439
end = serializers.DateTimeField(source='end_date', format=settings.DATE_FORMAT)
433440

434441

442+
# pylint: disable=abstract-method
435443
class EnagementRangeMetricSerializer(serializers.Serializer):
436444
"""
437445
Serializes ModuleEngagementMetricRanges ('bottom', 'average', and 'top') into
@@ -456,6 +464,7 @@ def _transform_range(self, metric_range):
456464
return [metric_range.low_value, metric_range.high_value] if metric_range else None
457465

458466

467+
# pylint: disable=abstract-method
459468
class CourseLearnerMetadataSerializer(serializers.Serializer):
460469
enrollment_modes = serializers.ReadOnlyField(source='es_data.enrollment_modes')
461470
segments = serializers.ReadOnlyField(source='es_data.segments')

analytics_data_api/v0/views/courses.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from analytics_data_api.utils import dictfetchall
1616
from analytics_data_api.v0 import models, serializers
1717

18-
from utils import raise_404_if_none
18+
from analytics_data_api.v0.views.utils import raise_404_if_none
1919

2020

2121
class BaseCourseView(generics.ListAPIView):
@@ -242,7 +242,7 @@ def _get_activity_type(self):
242242

243243
return activity_type
244244

245-
def get_object(self, queryset=None):
245+
def get_object(self):
246246
"""Select the activity report for the given course and activity type."""
247247

248248
warnings.warn('CourseActivityMostRecentWeekView has been deprecated! Use CourseActivityWeeklyView instead.',
@@ -403,7 +403,11 @@ def get_queryset(self):
403403
item = {
404404
u'course_id': key[0],
405405
u'date': key[1],
406-
u'created': None
406+
u'created': None,
407+
u'male': 0,
408+
u'female': 0,
409+
u'other': 0,
410+
u'unknown': 0
407411
}
408412

409413
for enrollment in group:

analytics_data_api/v0/views/learners.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def retrieve(self, request, *args, **kwargs):
103103
def get_queryset(self):
104104
return RosterEntry.get_course_user(self.course_id, self.username)
105105

106-
def get_object(self, queryset=None):
106+
def get_object(self):
107107
queryset = self.get_queryset()
108108
if len(queryset) == 1:
109109
return queryset[0]
@@ -362,7 +362,7 @@ class CourseLearnerMetadata(CourseViewMixin, generics.RetrieveAPIView):
362362
"""
363363
serializer_class = CourseLearnerMetadataSerializer
364364

365-
def get_object(self, queryset=None):
365+
def get_object(self):
366366
# Because we're serializing data from both Elasticsearch and MySQL into
367367
# the same JSON object, we have to pass both sources of data in a dict
368368
# to our custom course metadata serializer.

analytics_data_api/v0/views/problems.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
)
2323
from analytics_data_api.utils import matching_tuple
2424

25-
from utils import raise_404_if_none
25+
from analytics_data_api.v0.views.utils import raise_404_if_none
2626

2727

2828
class ProblemResponseAnswerDistributionView(generics.ListAPIView):

analytics_data_api/v0/views/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ def split_query_argument(argument):
1212
else:
1313
return None
1414

15+
1516
def raise_404_if_none(func):
1617
"""
1718
Decorator for raiseing Http404 if function evaulation is falsey (e.g. empty queryset).
@@ -22,4 +23,4 @@ def func_wrapper(self):
2223
return queryset
2324
else:
2425
raise Http404
25-
return func_wrapper
26+
return func_wrapper

analytics_data_api/v0/views/videos.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from analytics_data_api.v0.models import VideoTimeline
88
from analytics_data_api.v0.serializers import VideoTimelineSerializer
99

10-
from utils import raise_404_if_none
10+
from analytics_data_api.v0.views.utils import raise_404_if_none
11+
1112

1213
class VideoTimelineView(generics.ListAPIView):
1314
"""

0 commit comments

Comments
 (0)