Merge pull request #178 from edx/edx/kdmccormick/course-listing-reimp…

…-final EDUCATOR-852: Add filtering, sorting, pagination to course_summaries/ and create course_totals/
openedx-unsupported · Aug 18, 2017 · 14e3a01 · 14e3a01
2 parents 859d376 + 7e5476c
commit 14e3a01
Show file tree

Hide file tree

Showing 57 changed files with 2,154 additions and 865 deletions.
diff --git a/analytics_data_api/constants/enrollment_modes.py b/analytics_data_api/constants/enrollment_modes.py
@@ -5,4 +5,4 @@
 PROFESSIONAL_NO_ID = u'no-id-professional'
 VERIFIED = u'verified'
 
-ALL = [AUDIT, CREDIT, HONOR, PROFESSIONAL, PROFESSIONAL_NO_ID, VERIFIED]
+ALL = frozenset([AUDIT, CREDIT, HONOR, PROFESSIONAL, PROFESSIONAL_NO_ID, VERIFIED])
diff --git a/analytics_data_api/fixtures/problem_response_answer_distribution.json b/analytics_data_api/fixtures/problem_response_answer_distribution.json
@@ -14,7 +14,7 @@
             "problem_display_name": "Earth Science Question",
             "question_text": "Enter your answer:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 1
     },
     {
@@ -32,7 +32,7 @@
             "problem_display_name": "Earth Science Question",
             "question_text": "Enter your answer:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 2
     },
     {
@@ -50,7 +50,7 @@
             "problem_display_name": "Earth Science Question",
             "question_text": "Enter your answer:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 3
     },
     {
@@ -68,7 +68,7 @@
             "problem_display_name": "Earth Science Question",
             "question_text": "Enter your answer:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 4
     },
     {
@@ -86,7 +86,7 @@
             "problem_display_name": null,
             "question_text": null
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 5
     },
     {
@@ -104,7 +104,7 @@
             "problem_display_name": null,
             "question_text": null
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 6
     },
     {
@@ -122,7 +122,7 @@
             "problem_display_name": null,
             "question_text": null
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 7
     },
     {
@@ -140,7 +140,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Enter an answer:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 8
     },
     {
@@ -158,7 +158,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Enter an answer:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 9
     },
     {
@@ -176,7 +176,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Enter an answer:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 10
     },
     {
@@ -194,7 +194,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Randomized answer"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 11
     },
     {
@@ -212,7 +212,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Randomized answer"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 12
     },
 
@@ -231,7 +231,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Select from the choices below:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 13
     },
     {
@@ -249,7 +249,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Select from the choices below:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 14
     },
     {
@@ -267,7 +267,7 @@
             "problem_display_name": "Example problem",
             "question_text": "Select from the choices below:"
         },
-        "model": "v0.problemfirstlastresponseanswerdistribution",
+        "model": "v1.problemfirstlastresponseanswerdistribution",
         "pk": 15
     }
 

diff --git a/analytics_data_api/management/commands/generate_fake_course_data.py b/analytics_data_api/management/commands/generate_fake_course_data.py
@@ -12,7 +12,7 @@
 from django.utils import timezone
 
 from analytics_data_api.constants import engagement_events
-from analytics_data_api.v0 import models
+from analytics_data_api.v1 import models
 from analyticsdataserver.clients import CourseBlocksApiClient
 
 logging.basicConfig(level=logging.INFO)

diff --git a/analytics_data_api/urls.py b/analytics_data_api/urls.py
@@ -2,7 +2,7 @@
 from rest_framework.urlpatterns import format_suffix_patterns
 
 urlpatterns = [
-    url(r'^v0/', include('analytics_data_api.v0.urls', 'v0')),
+    url(r'^v1/', include('analytics_data_api.v1.urls', 'v1')),
 ]
 
 urlpatterns = format_suffix_patterns(urlpatterns)
diff --git a/analytics_data_api/utils.py b/analytics_data_api/utils.py
@@ -10,7 +10,7 @@
 from opaque_keys.edx.locator import CourseKey
 from opaque_keys import InvalidKeyError
 
-from analytics_data_api.v0.exceptions import (
+from analytics_data_api.v1.exceptions import (
     ReportFileNotFoundError,
     CannotCreateReportDownloadLinkError
 )
@@ -230,3 +230,25 @@ def get_expiration_date(seconds):
     Determine when a given link will expire, based on a given lifetime
     """
     return datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
+
+
+class classproperty(object):
+    """
+    A decorator for declaring a class-level property.
+
+    Conceptually ike combining @classmethod and @property, however that
+    doesn't work in practice, so we have to define our own decorator here.
+    """
+
+    def __init__(self, getter):
+        self.getter = getter
+
+    def __get__(self, instance, owner):
+        return self.getter(owner)
+
+
+def join_dicts(*dicts):
+    joined = {}
+    for d in dicts:
+        joined.update(d)
+    return joined
diff --git a/analytics_data_api/v0/__init__.py b/analytics_data_api/v0/__init__.py
diff --git a/analytics_data_api/v0/tests/views/test_course_summaries.py b/analytics_data_api/v0/tests/views/test_course_summaries.py