Merge remote-tracking branch 'origin/develop' into develop

realestate/api/serializers.py

@@ -7,7 +7,8 @@ class PropertySerializer(serializers.Serializer):
     title = serializers.CharField(required=False, max_length=100)
     description = serializers.CharField(widget=widgets.Textarea, max_length=1000)
     absolute_url = serializers.URLField(required=False)
-    price = serializers.FloatField(required=False)
+    price = serializers.SerializerMethodField('get_price')
+    currency = serializers.SerializerMethodField('get_currency')
     address = serializers.CharField(required=False, max_length=255)
     type = serializers.CharField(required=False, max_length=30)
     offer = serializers.CharField(required=False, max_length=10)
@@ -21,5 +22,11 @@ class PropertySerializer(serializers.Serializer):
     last_modified = serializers.CharField(required=False, max_length=100)
     images = serializers.SerializerMethodField('get_images')
 
-    def get_images(self, obj):
-        return obj.image_list
+    def get_images(self, listing):
+        return listing.image_list
+
+    def get_price(self, listing):
+        return listing.price.amount
+
+    def get_currency(self, listing):
+        return listing.price.currency

realestate/api/views.py

@@ -8,7 +8,7 @@ class PropiedadViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = PropertySerializer
 
     def get_queryset(self):
-        queryset = Listing.objects.all()
+        queryset = Listing.objects.active()
 
         last_modified = self.request.QUERY_PARAMS.get('modified_from')
         if last_modified is not None:

testproject/settings.py

@@ -160,6 +160,7 @@
         'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly'
     ],
     'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework.authentication.SessionAuthentication',
         'rest_framework.authentication.TokenAuthentication',
         'realestate.api.authentication.ApiKeyAuthentication',  # this should be the last one cause it never returns none
     )