Merge pull request #25 from edx/ri/EDUCATOR-3030-donot-submit-complet…

…ion-grader-response EDUCATOR-3030 don't submit completion for grader's response while updating problem score.
openedx · Aug 29, 2018 · 685b4fd · 685b4fd
2 parents cf259f7 + 383ca8a
commit 685b4fd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 32 deletions.
diff --git a/completion/__init__.py b/completion/__init__.py
@@ -5,6 +5,6 @@
 from __future__ import unicode_literals
 
 
-__version__ = '0.1.8'
+__version__ = '0.1.9'
 
 default_app_config = 'completion.apps.CompletionAppConfig'  # pylint: disable=invalid-name
diff --git a/completion/handlers.py b/completion/handlers.py
@@ -30,9 +30,10 @@ def scorable_block_completion(sender, **kwargs):  # pylint: disable=unused-argum
         completion = 0.0
     else:
         completion = 1.0
-    BlockCompletion.objects.submit_completion(
-        user=user,
-        course_key=course_key,
-        block_key=block_key,
-        completion=completion,
-    )
+    if not kwargs.get('grader_response'):
+        BlockCompletion.objects.submit_completion(
+            user=user,
+            course_key=course_key,
+            block_key=block_key,
+            completion=completion,
+        )
diff --git a/completion/models.py b/completion/models.py
@@ -8,7 +8,7 @@
 
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
-from django.db import models, IntegrityError, transaction
+from django.db import models, transaction
 from django.utils.translation import ugettext as _
 
 from model_utils.models import TimeStampedModel
@@ -91,37 +91,24 @@ def submit_completion(self, user, course_key, block_key, completion):
             raise ValueError(
                 "block_key must be an instance of `opaque_keys.edx.keys.UsageKey`.  Got {}".format(type(block_key))
             )
-
         if waffle.waffle().is_enabled(waffle.ENABLE_COMPLETION_TRACKING):
-            is_new = False
-            kwargs = {
-                "user": user,
-                "course_key": course_key,
-                "block_type": block_type,
-                "block_key": block_key
-            }
-            try:
-                obj, is_new = self.get_or_create(  # pylint: disable=unpacking-non-sequence
-                    defaults={'completion': completion},
-                    **kwargs
-                )
-            except IntegrityError:
-                # log information for duplicate entry and get the record as above command failed.
-                log.exception(
-                    'block_completion: IntegrityError for student %s - '
-                    'course_id %s - block_type %s - block_key %s',
-                    user, course_key, block_type, block_key
-                )
-                obj = self.get(**kwargs)
-
+            obj, is_new = self.get_or_create(  # pylint: disable=unpacking-non-sequence
+                user=user,
+                course_key=course_key,
+                block_type=block_type,
+                block_key=block_key,
+                defaults={'completion': completion},
+            )
             if not is_new and obj.completion != completion:
                 obj.completion = completion
                 obj.full_clean()
                 obj.save()
         else:
-            # If the feature is not enabled, this method should not be called.  Error out with a RuntimeError.
+            # If the feature is not enabled, this method should not be called.
+            # Error out with a RuntimeError.
             raise RuntimeError(
-                "BlockCompletion.objects.submit_completion should not be called when the feature is disabled."
+                "BlockCompletion.objects.submit_completion should not be \
+                called when the feature is disabled."
             )
         return obj, is_new