Merge branch 'hotfix/favorites-create' into 'develop'

Fix favorites creation by slug

See merge request gm/gm-backend!27

apps/establishment/serializers/common.py

@@ -315,20 +315,22 @@ class EstablishmentFavoritesCreateSerializer(serializers.ModelSerializer):
     def validate(self, attrs):
         """Override validate method"""
         # Check establishment object
-        establishment_id = self.context.get('request').parser_context.get('kwargs').get('pk')
-        establishment_qs = models.Establishment.objects.filter(id=establishment_id)
+        establishment_slug = self.context.get('request').parser_context.get('kwargs').get('slug')
+        establishment_qs = models.Establishment.objects.filter(slug=establishment_slug)
 
-        # Check establishment obj by pk from lookup_kwarg
+        # Check establishment obj by slug from lookup_kwarg
         if not establishment_qs.exists():
             raise serializers.ValidationError({'detail': _('Object not found.')})
+        else:
+            establishment = establishment_qs.first()
 
         # Check existence in favorites
         if self.get_user().favorites.by_content_type(app_label='establishment',
                                                      model='establishment')\
-                                    .by_object_id(object_id=establishment_id).exists():
+                                    .by_object_id(object_id=establishment.id).exists():
             raise utils_exceptions.FavoritesError()
 
-        attrs['establishment'] = establishment_qs.first()
+        attrs['establishment'] = establishment
         return attrs
 
     def create(self, validated_data, *args, **kwargs):

apps/main/serializers.py

@@ -136,8 +136,8 @@ class CarouselListSerializer(serializers.ModelSerializer):
     """Serializer for retrieving list of carousel items."""
     model_name = serializers.CharField()
     name = serializers.CharField()
-    toque_number = serializers.CharField()
-    public_mark = serializers.CharField()
+    toque_number = serializers.IntegerField()
+    public_mark = serializers.IntegerField()
     image = serializers.URLField(source='image_url')
     awards = AwardBaseSerializer(many=True)
     vintage_year = serializers.IntegerField()

apps/search_indexes/documents/establishment.py

@@ -84,6 +84,8 @@ class EstablishmentDocument(Document):
             'name',
             'toque_number',
             'price_level',
+            'preview_image_url',
+            'slug',
         )
 
     def get_queryset(self):

apps/search_indexes/serializers.py

@@ -63,6 +63,8 @@ class EstablishmentDocumentSerializer(DocumentSerializer):
             'collections',
             'establishment_type',
             'establishment_subtypes',
+            'preview_image_url',
+            'slug',
         )
 
     @staticmethod