Commit 804b11e2338a423462b84506fd8caae4a16e3057
Exists in
master
Merge branch 'master' of git.ucsd.edu:110swag/flashy-backend
Showing 2 changed files Side-by-side Diff
flashcards/models.py
View file @
804b11e
| ... | ... | @@ -175,9 +175,8 @@ |
| 175 | 175 | return address |
| 176 | 176 | |
| 177 | 177 | def by_retention(self, sections, material_date_begin, material_date_end): |
| 178 | - section_pks = sections.values_list('pk') | |
| 179 | 178 | user_flashcard_filter = UserFlashcard.objects.filter( |
| 180 | - user=self, flashcard__section__pk__in=section_pks, | |
| 179 | + user=self, flashcard__section__pk__in=sections, | |
| 181 | 180 | flashcard__material_date__gte=material_date_begin, |
| 182 | 181 | flashcard__material_date__lte=material_date_end |
| 183 | 182 | ) |
| ... | ... | @@ -185,9 +184,7 @@ |
| 185 | 184 | if not user_flashcard_filter.exists(): |
| 186 | 185 | raise ValidationError("No matching flashcard found in your decks") |
| 187 | 186 | |
| 188 | - return user_flashcard_filter.prefetch_related('userflashcardquiz_set').annotate( | |
| 189 | - study_count=Count('pk'), | |
| 190 | - ).order_by('next_review') | |
| 187 | + return user_flashcard_filter.order_by('next_review') | |
| 191 | 188 | |
| 192 | 189 | |
| 193 | 190 | class UserFlashcard(Model): |
flashcards/serializers.py
View file @
804b11e
| ... | ... | @@ -196,7 +196,7 @@ |
| 196 | 196 | |
| 197 | 197 | |
| 198 | 198 | class QuizRequestSerializer(serializers.Serializer): |
| 199 | - sections = ListField(child=IntegerField(min_value=1), required=False) | |
| 199 | + sections = ListField(child=IntegerField(min_value=1), required=False, default=[]) | |
| 200 | 200 | material_date_begin = DateTimeField(default=QUARTER_START) |
| 201 | 201 | material_date_end = DateTimeField(default=QUARTER_END) |
| 202 | 202 |