V2.0 url refactor

konfera/models/ticket_type.py

@@ -65,7 +65,7 @@ class TicketType(FromToModel):
     def __str__(self):
         return self.title
 
-    def _get_current_status(self):
+    def get_current_status(self):
         now = timezone.now()
         status = TicketType.ACTIVE
 
@@ -81,7 +81,7 @@ def _get_current_status(self):
 
     @property
     def status(self):
-        return TicketType.STATUSES[self._get_current_status()]
+        return TicketType.STATUSES[self.get_current_status()]
 
     @property
     def issued_tickets(self):

konfera/serializers.py

@@ -44,10 +44,12 @@ class TicketTypeListSerializer(serializers.ModelSerializer):
     class Meta:
         model = TicketType
         fields = [
+            'uuid',
             'title',
             'description',
             'price',
             'status',
+            'attendee_type',
             'usage',
         ]
 

konfera/tests/test_views.py

@@ -99,10 +99,12 @@ def test_get_ticket_type_list(self):
         # We have 2 events and 2 ticket types, but only PUBLIC ticket type for self.event should be loaded
         self.assertEquals(len(json.loads(response.content.decode('utf-8'))), 1)
         self.assertEquals(json.loads(response.content.decode('utf-8')), [{
+            'uuid': str(self.tt2.uuid),
             'title': self.tt2.title,
             'description': self.tt2.description,
             'price': str(self.tt2.price),
             'status': self.tt2.status,
+            'attendee_type': self.tt2.attendee_type,
             'usage': self.tt2.usage,
         }])
 
@@ -114,7 +116,7 @@ def setUp(self):
                                 cfp_end=now + day, status=Event.PUBLIC)
         self.event2 = mommy.make(Event, organizer=organizer, date_from=now + day, date_to=now + 2 * day,
                                  status=Event.PUBLIC)
-        self.url = '/event/%s/ticket-types/' % self.event.slug
+        self.url = '/event/%s/ticket-types/detail/' % self.event.slug
 
         self.tt = mommy.make(TicketType, event=self.event, date_from=now, date_to=now + 3 * day,
                              attendee_type=TicketType.ATTENDEE, accessibility=TicketType.PRIVATE)
@@ -157,8 +159,8 @@ def test_get_ticket_type_details(self):
 
 class AidTicketViewSetTest(APITestCase):
     def setUp(self):
-        self.url = '/tickets/aid/'
         self.tt = mommy.make(TicketType, date_from=now, date_to=now + day, attendee_type=TicketType.AID)
+        self.url = '/event/%s/tickets/aid/' % self.tt.event.slug
 
     def test_post_valid_data_saves_object_and_returns_uuid(self):
         data = {
@@ -270,7 +272,7 @@ def test_post_valid_data_saves_object_and_returns_uuid(self):
                 'email': '[email protected]',
             },
         }
-        response = self.client.post('/talks/', data, format='json')
+        response = self.client.post('/event/' + self.event.slug + '/talks/', data, format='json')
 
         talks = Talk.objects.all()
         speakers = Speaker.objects.all()
@@ -281,7 +283,7 @@ def test_post_valid_data_saves_object_and_returns_uuid(self):
         self.assertEqual(response.data, {'key': talks.first().uuid})
 
     def test_invalid_data_shows_validation_erros(self):
-        response = self.client.post('/talks/', {'primary_speaker': {}}, format='json')
+        response = self.client.post('/event/' + self.event.slug + '/talks/', {'primary_speaker': {}}, format='json')
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(response.data, {
             'event_uuid': ['This field is required.'],
@@ -296,7 +298,7 @@ def test_invalid_data_shows_validation_erros(self):
 
     def test_get_cfp_by_uuid(self):
         talk = mommy.make(Talk, event=self.event)
-        response = self.client.get('/talks/' + str(talk.uuid) + '/', format='json')
+        response = self.client.get('/event/' + talk.event.slug + '/talks/' + str(talk.uuid) + '/', format='json')
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEquals(json.loads(response.content.decode('utf-8')), {
@@ -359,7 +361,7 @@ def test_update_cfp(self):
             }
         }
 
-        response = self.client.put('/talks/' + str(talk.uuid) + '/', data, format='json')
+        response = self.client.put('/event/' + talk.event.slug + '/talks/' + str(talk.uuid) + '/', data, format='json')
 
         self.maxDiff = None
         self.assertEqual(response.status_code, status.HTTP_200_OK)

konfera/urls.py

@@ -5,14 +5,13 @@
 
 router = routers.SimpleRouter()
 router.register(r'events', EventViewSet)
-router.register(r'talks', TalkViewSet)
-router.register(r'tickets/aid', AidTicketViewSet)
-
-
+router.register(r'event/(?P<slug>.+)/talks', TalkViewSet)
+router.register(r'event/(?P<slug>.+)/tickets/aid', AidTicketViewSet)
 # urlpatterns = router.urls
 
 urlpatterns = [
     url(r'^', include(router.urls)),
+    url('^event/(?P<slug>.+)/ticket-types/detail/(?P<uuid>.+)/$', EventTicketTypeDetail.as_view()),
     url('^event/(?P<slug>.+)/ticket-types/$', EventTicketTypesList.as_view()),
-    url('^event/(?P<slug>.+)/ticket-types/(?P<uuid>.+)/$', EventTicketTypeDetail.as_view()),
+    url('^event/(?P<slug>.+)/ticket-types/(?P<attendee_type>.+)/$', EventTicketTypesList.as_view()),
 ]

konfera/views.py

@@ -18,7 +18,18 @@ class EventTicketTypesList(generics.ListAPIView):
 
     def get_queryset(self):
         slug = self.kwargs['slug']
-        return TicketType.objects.filter(event__slug=slug, accessibility=TicketType.PUBLIC)
+        attendee_type = self.kwargs.get('attendee_type', None)
+        exclude = []
+        all_ticket_types = TicketType.objects.filter(event__slug=slug, accessibility=TicketType.PUBLIC)
+
+        for ticket_type in all_ticket_types:
+            if ticket_type.get_current_status() != TicketType.ACTIVE:
+                exclude.append(str(ticket_type.uuid))
+
+        if attendee_type:
+            all_ticket_types = all_ticket_types.filter(attendee_type=attendee_type)
+
+        return all_ticket_types.exclude(uuid__in=exclude)
 
 
 class EventTicketTypeDetail(generics.RetrieveAPIView):