Merge pull request #106 from taaviteska/fix/price-availability-views

Fetch products properly in ProductPrice and ProductAvailability views

oscarapi/tests/testproduct.py

@@ -38,8 +38,14 @@ def test_product_price(self):
         self.response.assertStatusEqual(200)
         self.assertIn('excl_tax', self.response.body)
 
+        self.response = self.get(reverse('product-price', args=(999999,)))
+        self.response.assertStatusEqual(404)
+
     def test_product_availability(self):
         "See if we get the availability information"
         self.response = self.get(reverse('product-availability', args=(1,)))
         self.response.assertStatusEqual(200)
         self.assertIn('num_available', self.response.body)
+
+        self.response = self.get(reverse('product-availability', args=(999999,)))
+        self.response.assertStatusEqual(404)

oscarapi/views/basic.py

@@ -92,9 +92,10 @@ class ProductDetail(generics.RetrieveAPIView):
 
 
 class ProductPrice(generics.RetrieveAPIView):
+    queryset = Product.objects.all()
 
     def get(self, request, pk=None, format=None):
-        product = Product.objects.get(id=pk)
+        product = self.get_object()
         strategy = Selector().strategy(request=request, user=request.user)
         ser = serializers.PriceSerializer(
             strategy.fetch_for_product(product).price,
@@ -103,9 +104,10 @@ def get(self, request, pk=None, format=None):
 
 
 class ProductAvailability(generics.RetrieveAPIView):
+    queryset = Product.objects.all()
 
     def get(self, request, pk=None, format=None):
-        product = Product.objects.get(id=pk)
+        product = self.get_object()
         strategy = Selector().strategy(request=request, user=request.user)
         ser = serializers.AvailabilitySerializer(
             strategy.fetch_for_product(product).availability,