From 3709ee64556a8c5b57de8ed131d90832f2a75163 Mon Sep 17 00:00:00 2001 From: Laura Hawkins Date: Thu, 14 May 2015 15:38:04 -0700 Subject: [PATCH] working on deck view --- flashcards/tests/test_api.py | 4 ++++ flashcards/views.py | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/flashcards/tests/test_api.py b/flashcards/tests/test_api.py index 329f733..66ee259 100644 --- a/flashcards/tests/test_api.py +++ b/flashcards/tests/test_api.py @@ -253,3 +253,7 @@ class SectionViewSetTest(APITestCase): def test_section_search(self): response = self.client.get('/api/sections/search/?q=Kramer') self.assertEqual(response.status_code, HTTP_200_OK) + + def test_section_deck(self): + response = self.client.get('/api/sections/deck/') + self.assertEqual(response.status_code, HTTP_200_OK) diff --git a/flashcards/views.py b/flashcards/views.py index 0509b3e..bbb5f26 100644 --- a/flashcards/views.py +++ b/flashcards/views.py @@ -80,14 +80,18 @@ class SectionViewSet(ReadOnlyModelViewSet): qs = Section.search(query.split(' '))[:8] serializer = SectionSerializer(qs, many=True) return Response(serializer.data) -""" + @list_route(methods=['get'], permission_classes=[IsAuthenticated]) def deck(self, request): - query = request.GET.get('q', None) + """ + Gets the contents of a user's deck for a given section. + """ + query = request.GET.get(Flashcard.objects.all(), None) if not query: return Response('[]') - qs = Section.search(query.split(' '))[:8] - serializer = SectionSerializer(qs, many=True) - return Response(serializer.data)""" + qs = Flashcard.objects.all() + qs = qs.filter(userflashcard__user=request.user) + serializer = FlashcardSerializer(qs, many=True) + return Response(serializer.data) class UserSectionListView(ListAPIView): -- 1.9.1