Merge pull request #430 from maheshgudi/multiple_answerpaper

Fix multiple Answerpaper objects returned error

1 files changed, 6 insertions, 9 deletions

diff --git a/yaksh/models.py b/yaksh/models.py
index 9a406c3..93e656a 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -1172,7 +1172,7 @@ class QuestionPaper(models.Model):
         return all_questions
 
     def make_answerpaper(self, user, ip, attempt_num, course_id):
-        """Creates an  answer paper for the user to attempt the quiz"""
+        """Creates an answer paper for the user to attempt the quiz"""
         try:
             ans_paper = AnswerPaper.objects.get(user=user,
                                                 attempt_number=attempt_num,
@@ -1197,14 +1197,6 @@ class QuestionPaper(models.Model):
             ans_paper.questions_order = ",".join(question_ids)
             ans_paper.save()
             ans_paper.questions_unanswered.add(*questions)
-        except AnswerPaper.MultipleObjectsReturned:
-            ans_paper = AnswerPaper.objects.get(user=user,
-                                                attempt_number=attempt_num,
-                                                question_paper=self,
-                                                course_id=course_id
-                                                ).order_by('-id')
-            ans_paper = ans_paper[0]
-
         return ans_paper
 
     def _is_attempt_allowed(self, user, course_id):
@@ -1514,6 +1506,11 @@ class AnswerPaper(models.Model):
 
     objects = AnswerPaperManager()
 
+    class Meta:
+        unique_together = ('user', 'question_paper',
+                           'attempt_number', "course"
+                           )
+
     def get_per_question_score(self, question_id):
         if question_id not in self.get_questions().values_list('id', flat=True):
             return 'NA'