Added listing views and tests

prdickson · prdickson · commit 3064b744e6f9 · 2018-05-19T20:48:26.000+01:00
diff --git a/shiptrader/migrations/0003_listing_active.py b/shiptrader/migrations/0003_listing_active.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-05-19 15:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shiptrader', '0002_auto_20180519_1004'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='listing',
+            name='active',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/shiptrader/models.py b/shiptrader/models.py
@@ -15,10 +15,15 @@ class Starship(models.Model):
     crew = models.IntegerField()
     passengers = models.IntegerField()
 
+    def __str__(self):
+        return self.name
+
 
 class Listing(models.Model):
     name = models.CharField(max_length=255)
     ship_type = models.ForeignKey(Starship, related_name='listings')
     price = models.IntegerField()
 
+    active = models.BooleanField(default=True)
+
     created = models.DateTimeField(auto_now_add=True)
diff --git a/shiptrader/serializers.py b/shiptrader/serializers.py
@@ -0,0 +1,20 @@
+from shiptrader.models import Starship, Listing
+from rest_framework import serializers
+
+
+class StarshipSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Starship
+        fields = '__all__'
+
+
+class ListingSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Listing
+        fields = '__all__'
+
+
+class ListingUpdateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Listing
+        fields = ('active',)
diff --git a/shiptrader/tests/test_starships.py b/shiptrader/tests/test_starships.py
diff --git a/shiptrader/tests/test_views.py b/shiptrader/tests/test_views.py
@@ -0,0 +1,160 @@
+import json
+from urllib.parse import urlencode
+
+from django.test import TestCase
+from rest_framework.reverse import reverse
+
+from shiptrader.models import Starship, Listing
+
+
+class TestStarshipView(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        ships = get_ship_test_data()
+
+        for ship in ships:
+            Starship.objects.create(**ship)
+
+    def tearDown(self):
+        Listing.objects.all().delete()
+
+    def test_can_get_starships(self):
+        response = self.client.get(reverse('starship-list'))
+        self.assertEqual(response.status_code, 200)
+
+        starships = response.data
+        expected_data = get_ship_test_data()
+
+        self.assertEqual(len(starships), len(expected_data))
+
+        for i in range(len(expected_data)):
+            self.assertGreater(starships[i].pop('id'), 0)
+            self.assertDictEqual(starships[i], expected_data[i])
+
+    def test_can_get_listings(self):
+        ship = Starship.objects.get(name='Ship 1')
+
+        self.client.post(reverse('listing-list'), {'name':'New Listing 1', 'price': 5,
+                                                   'ship_type': ship.id, 'active': False})
+
+        listing = Listing.objects.all().first()
+
+        self.assertEqual(listing.name, 'New Listing 1')
+        self.assertEqual(listing.price, 5)
+        self.assertEqual(listing.ship_type, ship)
+        self.assertEqual(listing.active, False)
+
+    def test_can_create_listings(self):
+
+        ship = Starship.objects.get(name='Ship 1')
+        Listing.objects.create(name='Another New Listing', price=10, ship_type=ship)
+
+        response = self.client.get(reverse('listing-list'))
+
+        self.assertEqual(response.status_code, 200)
+
+        self.assertEqual(len(response.data), 1)
+        self.assertEqual(response.data[0]['name'], 'Another New Listing')
+        self.assertEqual(response.data[0]['ship_type'], ship.id)
+        self.assertEqual(response.data[0]['price'], 10)
+        self.assertEqual(response.data[0]['active'], True)
+
+    def test_can_filter_by_class(self):
+        for ship in Starship.objects.all():
+            Listing.objects.create(name='Listing', price=10, ship_type=ship)
+
+        url = '{0}?{1}'.format(reverse('listing-list'),
+                               urlencode({'ship_type__starship_class': 'Class 2'}))
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 2)
+
+        ship_ids = [s.id for s in Starship.objects.filter(starship_class='Class 2')]
+        self.assertTrue(response.data[0]['ship_type'] in ship_ids)
+        self.assertTrue(response.data[1]['ship_type'] in ship_ids)
+
+    def test_can_sort_by_price(self):
+        ships = Starship.objects.all()
+        Listing.objects.create(name='Listing', price=10, ship_type=ships[0])
+        Listing.objects.create(name='Listing', price=20, ship_type=ships[1])
+        Listing.objects.create(name='Listing', price=15, ship_type=ships[2])
+
+        response = self.client.get('{0}?{1}'.format(reverse('listing-list'), urlencode({'ordering': '-price'})))
+        self.assertEqual(response.data[0]['price'], 20)
+        self.assertEqual(response.data[1]['price'], 15)
+        self.assertEqual(response.data[2]['price'], 10)
+
+        response = self.client.get('{0}?{1}'.format(reverse('listing-list'), urlencode({'ordering': 'price'})))
+        self.assertEqual(response.data[0]['price'], 10)
+        self.assertEqual(response.data[1]['price'], 15)
+        self.assertEqual(response.data[2]['price'], 20)
+
+    def test_can_sort_by_created(self):
+        ships = Starship.objects.all()
+        Listing.objects.create(name='Listing A', price=1, ship_type=ships[0])
+        Listing.objects.create(name='Listing B', price=1, ship_type=ships[1])
+        Listing.objects.create(name='Listing C', price=1, ship_type=ships[2])
+
+        response = self.client.get('{0}?{1}'.format(reverse('listing-list'), urlencode({'ordering': '-created'})))
+        self.assertEqual(response.data[0]['name'], 'Listing C')
+        self.assertEqual(response.data[1]['name'], 'Listing B')
+        self.assertEqual(response.data[2]['name'], 'Listing A')
+
+        response = self.client.get('{0}?{1}'.format(reverse('listing-list'), urlencode({'ordering': 'created'})))
+        self.assertEqual(response.data[0]['name'], 'Listing A')
+        self.assertEqual(response.data[1]['name'], 'Listing B')
+        self.assertEqual(response.data[2]['name'], 'Listing C')
+
+    def test_can_toggle_active(self):
+
+        listing = Listing.objects.create(name='Listing', price=10, ship_type=Starship.objects.first(), active=False)
+
+        print(reverse('listing-detail', args=[listing.id]))
+
+        response = self.client.patch(reverse('listing-detail', args=[listing.id]), json.dumps({'active': True}),
+                                     content_type='application/json')
+        listing = Listing.objects.get(id=listing.id)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(listing.active)
+
+
+def get_ship_test_data():
+    return [
+        {
+            'name': 'Ship 1',
+            'model': 'Model 1',
+            'starship_class': 'Class 1',
+            'manufacturer': 'Manufacturer 1',
+            'length': 11.0,
+            'hyperdrive_rating': 12.0,
+            'cargo_capacity': 13,
+            'crew': 14,
+            'passengers': 15
+        },
+        {
+            'name': 'Ship 2a',
+            'model': 'Model 2a',
+            'starship_class': 'Class 2',
+            'manufacturer': 'Manufacturer 2',
+            'length': 21.0,
+            'hyperdrive_rating': 22.0,
+            'cargo_capacity': 23,
+            'crew': 24,
+            'passengers': 25
+        },
+        {
+            'name': 'Ship 2b',
+            'model': 'Model 2b',
+            'starship_class': 'Class 2',
+            'manufacturer': 'Manufacturer 2',
+            'length': 21.0,
+            'hyperdrive_rating': 22.0,
+            'cargo_capacity': 23,
+            'crew': 24,
+            'passengers': 25
+        }
+
+    ]
diff --git a/shiptrader/views.py b/shiptrader/views.py
@@ -1,16 +1,31 @@
-from rest_framework import serializers, viewsets
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework import mixins
+from rest_framework.viewsets import GenericViewSet
+from rest_framework.filters import OrderingFilter
 
-from shiptrader.models import Starship
+from shiptrader.models import Starship, Listing
+from shiptrader.serializers import StarshipSerializer, ListingSerializer, ListingUpdateSerializer
 
 
-class StarshipSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Starship
-        fields = '__all__'
-
-
-class StarshipViewSet(viewsets.ReadOnlyModelViewSet):
+class StarshipViewSet(mixins.ListModelMixin, GenericViewSet):
     """View that allows all starships to be listed"""
 
     queryset = Starship.objects.all()
     serializer_class = StarshipSerializer
+
+
+class ListingViewSet(mixins.CreateModelMixin, mixins.ListModelMixin, GenericViewSet):
+    """View to create and list ship listings"""
+
+    queryset = Listing.objects.all()
+    serializer_class = ListingSerializer
+    filter_backends = (DjangoFilterBackend, OrderingFilter)
+    filter_fields = ('ship_type__starship_class',)
+    ordering_fields = ('price', 'created')
+
+
+class ListingActiveViewSet(mixins.UpdateModelMixin, GenericViewSet):
+    """View to update listing to active / inactive"""
+
+    queryset = Listing.objects.all()
+    serializer_class = ListingUpdateSerializer
diff --git a/testsite/settings.py b/testsite/settings.py
@@ -130,8 +130,3 @@
 # https://docs.djangoproject.com/en/1.11/howto/static-files/
 
 STATIC_URL = '/static/'
-
-
-REST_FRAMEWORK = {
-    'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',)
-}
diff --git a/testsite/urls.py b/testsite/urls.py
@@ -17,11 +17,12 @@
 from django.contrib import admin
 from rest_framework import routers
 
-from shiptrader.views import StarshipViewSet
+from shiptrader.views import StarshipViewSet, ListingViewSet, ListingActiveViewSet
 
 router = routers.DefaultRouter()
 router.register(r'starships', StarshipViewSet)
-
+router.register(r'listings', ListingViewSet)
+router.register(r'listings', ListingActiveViewSet)
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
