Merge branch 'feature/establishment-award' into 'develop'

Feature/establishment award

See merge request gm/gm-backend!40

apps/establishment/models.py

@@ -8,13 +8,13 @@ from django.contrib.gis.geos import Point
 from django.contrib.gis.measure import Distance as DistanceMeasure
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import When, Case, F, ExpressionWrapper, Subquery
+from django.db.models import When, Case, F, ExpressionWrapper, Subquery, Q
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
 
 from collection.models import Collection
-from main.models import MetaDataContent
+from main.models import Award, MetaDataContent
 from location.models import Address
 from review.models import Review
 from utils.models import (ProjectBaseMixin, TJSONField, URLImageMixin,
@@ -281,7 +281,7 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin):
     slug = models.SlugField(unique=True, max_length=50, null=True,
                             verbose_name=_('Establishment slug'), editable=True)
 
-    awards = generic.GenericRelation(to='main.Award')
+    awards = generic.GenericRelation(to='main.Award', related_query_name='establishment')
     tags = generic.GenericRelation(to='main.MetaDataContent')
     reviews = generic.GenericRelation(to='review.Review')
     comments = generic.GenericRelation(to='comment.Comment')
@@ -330,6 +330,13 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin):
             raise ValidationError('Establishment type of subtype does not match')
         self.establishment_subtypes.add(establishment_subtype)
 
+
+    @property
+    def vintage_year(self):
+        last_review = self.reviews.by_status(Review.READY).last()
+        if last_review:
+            return last_review.vintage
+
     @property
     def best_price_menu(self):
         return 150
@@ -356,6 +363,11 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin):
         """
         return self.address.coordinates
 
+    @property
+    def the_most_recent_award(self):
+        return Award.objects.filter(Q(establishment=self) | Q(employees__establishments=self)).latest(
+            field_name='vintage_year')
+
 
 class Position(BaseAttributes, TranslatedFieldsMixin):
     """Position model."""
@@ -409,8 +421,8 @@ class Employee(BaseAttributes):
                                 verbose_name=_('User'))
     name = models.CharField(max_length=255, verbose_name=_('Last name'))
     establishments = models.ManyToManyField(Establishment, related_name='employees',
-                                            through=EstablishmentEmployee)
+                                            through=EstablishmentEmployee,)
-    awards = generic.GenericRelation(to='main.Award')
+    awards = generic.GenericRelation(to='main.Award', related_query_name='employees')
     tags = generic.GenericRelation(to='main.MetaDataContent')
 
     class Meta:

apps/establishment/serializers/common.py

@@ -205,6 +205,7 @@ class EstablishmentDetailSerializer(EstablishmentListSerializer):
     menu = MenuSerializers(source='menu_set', many=True, read_only=True)
     best_price_menu = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True)
     best_price_carte = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True)
+    vintage_year = serializers.ReadOnlyField()
 
     class Meta(EstablishmentListSerializer.Meta):
         """Meta class."""
@@ -229,6 +230,7 @@ class EstablishmentDetailSerializer(EstablishmentListSerializer):
             'best_price_menu',
             'best_price_carte',
             'transportation',
+            'vintage_year',
         ]
 
     # def get_in_favorites(self, obj):

apps/main/models.py

@@ -318,9 +318,9 @@ class Carousel(models.Model):
     @property
     def vintage_year(self):
         if hasattr(self.content_object, 'reviews'):
-            review_qs = self.content_object.reviews.by_status(Review.READY)
+            last_review = self.content_object.reviews.by_status(Review.READY).last()
-            if review_qs.exists():
+            if last_review:
-                return review_qs.last().vintage
+                return last_review.vintage
 
     @property
     def toque_number(self):
@@ -337,6 +337,16 @@ class Carousel(models.Model):
         if hasattr(self.content_object, 'image_url'):
             return self.content_object.image_url
 
+    @property
+    def slug(self):
+        if hasattr(self.content_object, 'slug'):
+            return self.content_object.slug
+
+    @property
+    def the_most_recent_award(self):
+        if hasattr(self.content_object, 'the_most_recent_award'):
+            return self.content_object.the_most_recent_award
+
     @property
     def model_name(self):
         return self.content_object.__class__.__name__

apps/main/serializers.py

@@ -3,6 +3,7 @@ from rest_framework import serializers
 from advertisement.serializers.web import AdvertisementSerializer
 from location.serializers import CountrySerializer
 from main import models
+from establishment.models import Establishment
 from utils.serializers import TranslatedField
 
 
@@ -141,6 +142,7 @@ class CarouselListSerializer(serializers.ModelSerializer):
     image = serializers.URLField(source='image_url')
     awards = AwardBaseSerializer(many=True)
     vintage_year = serializers.IntegerField()
+    last_award = AwardBaseSerializer(source='the_most_recent_award', allow_null=True)
 
     class Meta:
         """Meta class."""
@@ -154,6 +156,8 @@ class CarouselListSerializer(serializers.ModelSerializer):
             'public_mark',
             'image',
             'vintage_year',
+            'last_award',
+            'slug',
         ]
 
 

apps/timetable/models.py

@@ -36,3 +36,4 @@ class Timetable(ProjectBaseMixin):
         """Meta class."""
         verbose_name = _('Timetable')
         verbose_name_plural = _('Timetables')
+        ordering = ['weekday']