diff --git a/apps/establishment/migrations/0075_employee_photo.py b/apps/establishment/migrations/0075_employee_photo.py new file mode 100644 index 00000000..3b505680 --- /dev/null +++ b/apps/establishment/migrations/0075_employee_photo.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2.7 on 2020-01-17 10:50 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('gallery', '0008_merge_20191212_0752'), + ('establishment', '0074_employee_available_for_events'), + ] + + operations = [ + migrations.AddField( + model_name='employee', + name='photo', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='employee_photo', to='gallery.Image', verbose_name='image instance of model Image'), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 01615271..d7cc9e7e 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -1071,7 +1071,10 @@ class Employee(BaseAttributes): # old_id = profile_id old_id = models.IntegerField(verbose_name=_('Old id'), null=True, blank=True) available_for_events = models.BooleanField(_('Available for events'), default=False) - photo = models + photo = models.ForeignKey('gallery.Image', on_delete=models.SET_NULL, + blank=True, null=True, default=None, + related_name='employee_photo', + verbose_name=_('image instance of model Image')) objects = EmployeeQuerySet.as_manager() @@ -1085,6 +1088,30 @@ class Employee(BaseAttributes): GinIndex(fields=('last_name',)) ] + @property + def image_object(self): + """Return image object.""" + return self.photo.image if self.photo else None + + @property + def crop_image(self): + if hasattr(self, 'photo') and hasattr(self, '_meta'): + if self.photo: + image_property = { + 'id': self.photo.id, + 'title': self.photo.title, + 'original_url': self.photo.image.url, + 'orientation_display': self.photo.get_orientation_display(), + 'auto_crop_images': {}, + } + crop_parameters = [p for p in settings.SORL_THUMBNAIL_ALIASES + if p.startswith(self._meta.model_name.lower())] + for crop in crop_parameters: + image_property['auto_crop_images'].update( + {crop: self.photo.get_image_url(crop)} + ) + return image_property + class EstablishmentScheduleQuerySet(models.QuerySet): """QuerySet for model EstablishmentSchedule""" diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index e1818cfc..a6246d47 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -11,7 +11,7 @@ from location.serializers import AddressDetailSerializer, TranslatedField from main.models import Currency from main.serializers import AwardSerializer from utils.decorators import with_base_attributes -from utils.serializers import TimeZoneChoiceField +from utils.serializers import TimeZoneChoiceField, ImageBaseSerializer def phones_handler(phones_list, establishment): @@ -230,6 +230,7 @@ class EmployeeBackSerializers(serializers.ModelSerializer): establishment = serializers.SerializerMethodField() awards = AwardSerializer(many=True, read_only=True) toque_number = serializers.SerializerMethodField() + photo = ImageBaseSerializer(source='crop_image', read_only=True) def get_public_mark(self, obj): """Get last list actual public_mark""" @@ -288,6 +289,7 @@ class EmployeeBackSerializers(serializers.ModelSerializer): 'phone', 'toque_number', 'available_for_events', + 'photo', ] diff --git a/apps/establishment/views/back.py b/apps/establishment/views/back.py index b34cc845..efa93316 100644 --- a/apps/establishment/views/back.py +++ b/apps/establishment/views/back.py @@ -187,7 +187,7 @@ class EmployeesListSearchViews(generics.ListAPIView): queryset = models.Employee.objects.all().prefetch_related( 'establishmentemployee_set', 'establishmentemployee_set__establishment', - ) + ).select_related('photo') filter_class = filters.EmployeeBackSearchFilter serializer_class = serializers.EmployeeBackSerializers