Merge pull request #12 from edx/aed/group-by-right

Correct the latest_blocks_completed_all_courses query.
openedx · Mar 21, 2018 · 39bddf2 · 39bddf2
2 parents 78e8aa4 + cb4046f
commit 39bddf2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,7 +15,11 @@ Unreleased
 ~~~~~~~~~~
 * Add query method for all completions by course
 
-[0.0.10] - 2018-03-20
+[0.1.0] - 2018-03-20
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixes https://openedx.atlassian.net/browse/EDUCATOR-2540
+
+[0.0.11] - 2018-03-20
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Added "subsection-completion/{username}/{course_key}/{subsection_id}" API

diff --git a/completion/__init__.py b/completion/__init__.py
@@ -5,6 +5,6 @@
 from __future__ import unicode_literals
 
 
-__version__ = '0.0.11'
+__version__ = '0.1.0'
 
 default_app_config = 'completion.apps.CompletionAppConfig'  # pylint: disable=invalid-name
diff --git a/completion/models.py b/completion/models.py
@@ -214,10 +214,28 @@ def latest_blocks_completed_all_courses(cls, user):
 
         latest_completions_by_course = cls.objects.raw(
             '''
-            SELECT id, course_key, block_key, max(modified) as latest
-            FROM completion_blockcompletion
-            WHERE user_id=%s
-            GROUP BY course_key;
+            SELECT
+                cbc.id AS id,
+                cbc.course_key AS course_key,
+                cbc.block_key AS block_key,
+                cbc.modified AS modified
+            FROM
+                completion_blockcompletion cbc
+            JOIN (
+                SELECT
+                     course_key,
+                     MAX(modified) AS modified
+                FROM
+                     completion_blockcompletion
+                WHERE
+                     user_id = %s
+                GROUP BY
+                     course_key
+            ) latest
+            ON
+                cbc.course_key = latest.course_key AND
+                cbc.modified = latest.modified
+            ;
             ''',
             [user.id]
         )

diff --git a/completion/tests/test_models.py b/completion/tests/test_models.py
@@ -166,9 +166,6 @@ def setUp(self):
         self.block_keys = [
             UsageKey.from_string("i4x://edX/MOOC101/video/{}".format(number)) for number in range(5)
         ]
-        self.block_keys_two = [
-            UsageKey.from_string("i4x://edX/MOOC101/video/{}".format(number)) for number in range(5)
-        ]
 
         the_completion_date = datetime.datetime(2050, 1, 1, tzinfo=UTC)
         for idx, block_key in enumerate(self.block_keys[:3]):
@@ -214,7 +211,7 @@ def test_latest_blocks_completed_all_courses(self):
         self.assertDictEqual(
             models.BlockCompletion.latest_blocks_completed_all_courses(self.user_one),
             {
-                self.course_key_two: [datetime.datetime(2050, 1, 10, tzinfo=UTC), self.block_keys_two[4]],
+                self.course_key_two: [datetime.datetime(2050, 1, 10, tzinfo=UTC), self.block_keys[4]],
                 self.course_key_one: [datetime.datetime(2050, 1, 3, tzinfo=UTC), self.block_keys[2]]
             }
         )