From f95a082db395b2668671c49e74d28542c4995890 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Fri, 22 Nov 2019 16:00:06 +0300 Subject: [PATCH 1/6] update geoip feature --- apps/establishment/views/web.py | 3 +- apps/main/methods.py | 52 +++++++++++++-------------------- apps/main/views/common.py | 5 ++-- apps/main/views/web.py | 3 +- load_geiopdb.sh | 23 --------------- project/settings/base.py | 1 - 6 files changed, 25 insertions(+), 62 deletions(-) delete mode 100755 load_geiopdb.sh diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index 4f1fe07c..0b6f1ba0 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -56,12 +56,11 @@ class EstablishmentRecentReviewListView(EstablishmentListView): def get_queryset(self): """Overridden method 'get_queryset'.""" qs = super().get_queryset() - user_ip = methods.get_user_ip(self.request) query_params = self.request.query_params if 'longitude' in query_params and 'latitude' in query_params: longitude, latitude = query_params.get('longitude'), query_params.get('latitude') else: - longitude, latitude = methods.determine_coordinates(user_ip) + longitude, latitude = methods.determine_coordinates(self.request) if not longitude or not latitude: return qs.none() point = Point(x=float(longitude), y=float(latitude), srid=settings.GEO_DEFAULT_SRID) diff --git a/apps/main/methods.py b/apps/main/methods.py index d5f307eb..f19d595a 100644 --- a/apps/main/methods.py +++ b/apps/main/methods.py @@ -28,31 +28,25 @@ def get_user_ip(request): return ip -def determine_country_code(ip_addr): +def determine_country_code(request): """Determine country code.""" - country_code = None - if ip_addr: - try: - geoip = GeoIP2() - country_code = geoip.country_code(ip_addr) - country_code = country_code.lower() - except GeoIP2Exception as ex: - logger.info(f'GEOIP Exception: {ex}. ip: {ip_addr}') - except Exception as ex: - logger.error(f'GEOIP Base exception: {ex}') - return country_code + META = request.META + country_code = META.get('X-GeoIP-Country-Code', + META.get('HTTP_X_GEOIP_COUNTRY_CODE')) + if isinstance(country_code, str): + return country_code.lower() -def determine_coordinates(ip_addr: str) -> Tuple[Optional[float], Optional[float]]: - if ip_addr: - try: - geoip = GeoIP2() - return geoip.coords(ip_addr) - except GeoIP2Exception as ex: - logger.warning(f'GEOIP Exception: {ex}. ip: {ip_addr}') - except Exception as ex: - logger.warning(f'GEOIP Base exception: {ex}') - return None, None +def determine_coordinates(request): + META = request.META + longitude = META.get('X-GeoIP-Longitude', + META.get('HTTP_X_GEOIP_LONGITUDE')) + latitude = META.get('X-GeoIP-Latitude', + META.get('HTTP_X_GEOIP_LATITUDE')) + try: + return float(longitude), float(latitude) + except (TypeError, ValueError): + return None, None def determine_user_site_url(country_code): @@ -76,15 +70,11 @@ def determine_user_site_url(country_code): return site.site_url -def determine_user_city(ip_addr: str) -> Optional[City]: - try: - geoip = GeoIP2() - return geoip.city(ip_addr) - except GeoIP2Exception as ex: - logger.warning(f'GEOIP Exception: {ex}. ip: {ip_addr}') - except Exception as ex: - logger.warning(f'GEOIP Base exception: {ex}') - return None +def determine_user_city(request): + META = request.META + city = META.get('X-GeoIP-City', + META.get('HTTP_X_GEOIP_CITY')) + return city def determine_subdivision( diff --git a/apps/main/views/common.py b/apps/main/views/common.py index 18ee0d8d..674d045e 100644 --- a/apps/main/views/common.py +++ b/apps/main/views/common.py @@ -86,9 +86,8 @@ class DetermineLocation(generics.GenericAPIView): serializer_class = EmptySerializer def get(self, request, *args, **kwargs): - user_ip = methods.get_user_ip(request) - longitude, latitude = methods.determine_coordinates(user_ip) - city = methods.determine_user_city(user_ip) + longitude, latitude = methods.determine_coordinates(request) + city = methods.determine_user_city(request) if longitude and latitude and city: return Response(data={'latitude': latitude, 'longitude': longitude, 'city': city}) else: diff --git a/apps/main/views/web.py b/apps/main/views/web.py index e1dc32ef..3a634457 100644 --- a/apps/main/views/web.py +++ b/apps/main/views/web.py @@ -14,8 +14,7 @@ class DetermineSiteView(generics.GenericAPIView): serializer_class = EmptySerializer def get(self, request, *args, **kwargs): - user_ip = methods.get_user_ip(request) - country_code = methods.determine_country_code(user_ip) + country_code = methods.determine_country_code(request) url = methods.determine_user_site_url(country_code) return Response(data={'url': url}) diff --git a/load_geiopdb.sh b/load_geiopdb.sh deleted file mode 100755 index 48d16af1..00000000 --- a/load_geiopdb.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -DB_CITY_URL="https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz" -DB_COUNTRY_URL="https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz" -DIR_PATH="geoip_db" -ARCH_PATH="archive" - -mkdir -p $DIR_PATH -cd $DIR_PATH - -mkdir -p $ARCH_PATH - -find . -not -path "./$ARCH_PATH/*" -type f -name "*.mmdb" -exec mv -t "./$ARCH_PATH/" {} \+ - -filename=$(basename $DB_CITY_URL) -wget -O $filename $DB_CITY_URL -tar xzvf "$filename" - -filename=$(basename $DB_COUNTRY_URL) -wget -O $filename $DB_COUNTRY_URL -tar xzvf "$filename" - -find . -mindepth 1 -type f -name "*.mmdb" -not -path "./$ARCH_PATH/*" -exec mv -t . {} \+ diff --git a/project/settings/base.py b/project/settings/base.py index 2e29c92d..87f85065 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -487,7 +487,6 @@ LIMITING_QUERY_OBJECTS = QUERY_OUTPUT_OBJECTS * 3 # GEO # A Spatial Reference System Identifier GEO_DEFAULT_SRID = 4326 -GEOIP_PATH = os.path.join(PROJECT_ROOT, 'geoip_db') # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ From 7e878956e37c01b807bc7f916462a6a94e619fa3 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 22 Nov 2019 16:22:31 +0300 Subject: [PATCH 2/6] carousel api for news --- apps/news/serializers.py | 23 ++++++++++++++++++++++- apps/news/urls/common.py | 5 ++++- apps/news/views.py | 9 ++++++++- apps/utils/exceptions.py | 8 ++++++++ apps/utils/serializers.py | 26 ++++++++++++++++++++++---- apps/utils/views.py | 5 +++-- 6 files changed, 67 insertions(+), 9 deletions(-) diff --git a/apps/news/serializers.py b/apps/news/serializers.py index c96d05da..f58e7c24 100644 --- a/apps/news/serializers.py +++ b/apps/news/serializers.py @@ -11,7 +11,7 @@ from news import models from tag.serializers import TagBaseSerializer from utils import exceptions as utils_exceptions from utils.serializers import (TranslatedField, ProjectModelSerializer, - FavoritesCreateSerializer, ImageBaseSerializer) + FavoritesCreateSerializer, ImageBaseSerializer, CarouselCreateSerializer) class AgendaSerializer(ProjectModelSerializer): @@ -269,3 +269,24 @@ class NewsFavoritesCreateSerializer(FavoritesCreateSerializer): 'content_object': validated_data.pop('news') }) return super().create(validated_data) + + +class NewsCarouselCreateSerializer(CarouselCreateSerializer): + """Serializer to carousel object w/ model News.""" + + def validate(self, attrs): + news = models.News.objects.filter(slug=self.slug).first() + if not news: + raise serializers.ValidationError({'detail': _('Object not found.')}) + + if news.carousels.exists(): + raise utils_exceptions.CarouselError() + + attrs['news'] = news + return attrs + + def create(self, validated_data, *args, **kwargs): + validated_data.update({ + 'content_object': validated_data.pop('news') + }) + return super().create(validated_data) diff --git a/apps/news/urls/common.py b/apps/news/urls/common.py index b42905eb..e2aae7a1 100644 --- a/apps/news/urls/common.py +++ b/apps/news/urls/common.py @@ -5,5 +5,8 @@ common_urlpatterns = [ path('', views.NewsListView.as_view(), name='list'), path('types/', views.NewsTypeListView.as_view(), name='type'), path('slug//', views.NewsDetailView.as_view(), name='rud'), - path('slug//favorites/', views.NewsFavoritesCreateDestroyView.as_view(), name='create-destroy-favorites') + path('slug//favorites/', views.NewsFavoritesCreateDestroyView.as_view(), + name='create-destroy-favorites'), + path('slug//carousels/', views.NewsCarouselCreateDestroyView.as_view(), + name='create-destroy-carousels'), ] diff --git a/apps/news/views.py b/apps/news/views.py index bdb75fc7..7845ab0d 100644 --- a/apps/news/views.py +++ b/apps/news/views.py @@ -6,7 +6,7 @@ from rest_framework import generics, permissions from news import filters, models, serializers from rating.tasks import add_rating from utils.permissions import IsCountryAdmin, IsContentPageManager -from utils.views import CreateDestroyGalleryViewMixin, FavoritesCreateDestroyMixinView +from utils.views import CreateDestroyGalleryViewMixin, FavoritesCreateDestroyMixinView, CarouselCreateDestroyMixinView from utils.serializers import ImageBaseSerializer @@ -155,3 +155,10 @@ class NewsFavoritesCreateDestroyView(FavoritesCreateDestroyMixinView): _model = models.News serializer_class = serializers.NewsFavoritesCreateSerializer + + +class NewsCarouselCreateDestroyView(CarouselCreateDestroyMixinView): + """View for create/destroy news from carousel.""" + + _model = models.News + serializer_class = serializers.NewsCarouselCreateSerializer diff --git a/apps/utils/exceptions.py b/apps/utils/exceptions.py index 37786ce7..c82ff023 100644 --- a/apps/utils/exceptions.py +++ b/apps/utils/exceptions.py @@ -135,6 +135,14 @@ class FavoritesError(exceptions.APIException): default_detail = _('Item is already in favorites.') +class CarouselError(exceptions.APIException): + """ + The exception should be thrown when the object is already in carousels. + """ + status_code = status.HTTP_400_BAD_REQUEST + default_detail = _('Item is already in carousels.') + + class PasswordResetRequestExistedError(exceptions.APIException): """ The exception should be thrown when password reset request diff --git a/apps/utils/serializers.py b/apps/utils/serializers.py index b78c202c..634246b7 100644 --- a/apps/utils/serializers.py +++ b/apps/utils/serializers.py @@ -2,10 +2,11 @@ import pytz from django.core import exceptions from rest_framework import serializers -from utils import models -from translation.models import Language + from favorites.models import Favorites -from gallery.models import Image +from main.models import Carousel +from translation.models import Language +from utils import models class EmptySerializer(serializers.Serializer): @@ -80,7 +81,6 @@ class FavoritesCreateSerializer(serializers.ModelSerializer): """Serializer to favorite object.""" class Meta: - """Serializer for model Comment.""" model = Favorites fields = [ 'id', @@ -101,6 +101,24 @@ class FavoritesCreateSerializer(serializers.ModelSerializer): return self.request.parser_context.get('kwargs').get('slug') +class CarouselCreateSerializer(serializers.ModelSerializer): + """Carousel to favorite object.""" + + class Meta: + model = Carousel + fields = [ + 'id', + ] + + @property + def request(self): + return self.context.get('request') + + @property + def slug(self): + return self.request.parser_context.get('kwargs').get('slug') + + class RecursiveFieldSerializer(serializers.Serializer): def to_representation(self, value): serializer = self.parent.parent.__class__(value, context=self.context) diff --git a/apps/utils/views.py b/apps/utils/views.py index e08e0bf5..c09df2a2 100644 --- a/apps/utils/views.py +++ b/apps/utils/views.py @@ -170,9 +170,10 @@ class CarouselCreateDestroyMixinView(BaseCreateDestroyMixinView): Returns the object the view is displaying. """ obj = self.get_base_object() - carousels = get_object_or_404(obj.carousels.filter(user=self.request.user)) + carousels = get_object_or_404(obj.carousels.all()) # May raise a permission denied - self.check_object_permissions(self.request, carousels) + # TODO: возможно нужны пермишены + # self.check_object_permissions(self.request, carousels) return carousels From fa183bfc92b343565384b0857dc33fdd11b13c4f Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 22 Nov 2019 17:00:43 +0300 Subject: [PATCH 3/6] carousel back api url --- apps/news/urls/back.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/news/urls/back.py b/apps/news/urls/back.py index 7e54928f..9126b3e9 100644 --- a/apps/news/urls/back.py +++ b/apps/news/urls/back.py @@ -13,4 +13,6 @@ urlpatterns = [ name='gallery-list'), path('/gallery//', views.NewsBackOfficeGalleryCreateDestroyView.as_view(), name='gallery-create-destroy'), + path('slug//carousels/', views.NewsCarouselCreateDestroyView.as_view(), + name='create-destroy-carousels'), ] From a5d5dc133546e6f5862eb8dff0e400fd382e6165 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 22 Nov 2019 17:13:41 +0300 Subject: [PATCH 4/6] establishment carousel web and mobile api --- apps/establishment/models.py | 1 + apps/establishment/serializers/common.py | 23 ++++++++++++++++++++++- apps/establishment/urls/common.py | 4 +++- apps/establishment/views/web.py | 17 ++++++++++++----- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index f0260cf9..f8ffd456 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -395,6 +395,7 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, verbose_name=_('Tag')) reviews = generic.GenericRelation(to='review.Review') comments = generic.GenericRelation(to='comment.Comment') + carousels = generic.GenericRelation(to='main.Carousel') favorites = generic.GenericRelation(to='favorites.Favorites') currency = models.ForeignKey(Currency, blank=True, null=True, default=None, on_delete=models.PROTECT, diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 0c183477..c85b3123 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -13,7 +13,7 @@ from review.serializers import ReviewShortSerializer from tag.serializers import TagBaseSerializer from timetable.serialziers import ScheduleRUDSerializer from utils import exceptions as utils_exceptions -from utils.serializers import ImageBaseSerializer +from utils.serializers import ImageBaseSerializer, CarouselCreateSerializer from utils.serializers import (ProjectModelSerializer, TranslatedField, FavoritesCreateSerializer) @@ -426,6 +426,27 @@ class EstablishmentFavoritesCreateSerializer(FavoritesCreateSerializer): return super().create(validated_data) +class EstablishmentCarouselCreateSerializer(CarouselCreateSerializer): + """Serializer to carousel object w/ model News.""" + + def validate(self, attrs): + establishment = models.Establishment.objects.filter(slug=self.slug).first() + if not establishment: + raise serializers.ValidationError({'detail': _('Object not found.')}) + + if establishment.carousels.exists(): + raise utils_exceptions.CarouselError() + + attrs['establishment'] = establishment + return attrs + + def create(self, validated_data, *args, **kwargs): + validated_data.update({ + 'content_object': validated_data.pop('establishment') + }) + return super().create(validated_data) + + class CompanyBaseSerializer(serializers.ModelSerializer): """Company base serializer""" phone_list = serializers.SerializerMethodField(source='phones', read_only=True) diff --git a/apps/establishment/urls/common.py b/apps/establishment/urls/common.py index 49cd3631..3f46df90 100644 --- a/apps/establishment/urls/common.py +++ b/apps/establishment/urls/common.py @@ -17,5 +17,7 @@ urlpatterns = [ path('slug//comments//', views.EstablishmentCommentRUDView.as_view(), name='rud-comment'), path('slug//favorites/', views.EstablishmentFavoritesCreateDestroyView.as_view(), - name='create-destroy-favorites') + name='create-destroy-favorites'), + path('slug//carousels/', views.EstablishmentCarouselCreateDestroyView.as_view(), + name='create-destroy-carousels') ] diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index 0b6f1ba0..bd826e4e 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -9,7 +9,7 @@ from comment.serializers import CommentRUDSerializer from establishment import filters, models, serializers from main import methods from utils.pagination import EstablishmentPortionPagination -from utils.views import FavoritesCreateDestroyMixinView +from utils.views import FavoritesCreateDestroyMixinView, CarouselCreateDestroyMixinView class EstablishmentMixinView: @@ -34,7 +34,7 @@ class EstablishmentListView(EstablishmentMixinView, generics.ListAPIView): serializer_class = serializers.EstablishmentListRetrieveSerializer def get_queryset(self): - return super().get_queryset().with_schedule()\ + return super().get_queryset().with_schedule() \ .with_extended_address_related().with_currency_related() @@ -105,9 +105,9 @@ class EstablishmentCommentListView(generics.ListAPIView): establishment = get_object_or_404(models.Establishment, slug=self.kwargs['slug']) return comment_models.Comment.objects.by_content_type(app_label='establishment', - model='establishment')\ - .by_object_id(object_id=establishment.pk)\ - .order_by('-created') + model='establishment') \ + .by_object_id(object_id=establishment.pk) \ + .order_by('-created') class EstablishmentCommentRUDView(generics.RetrieveUpdateDestroyAPIView): @@ -139,6 +139,13 @@ class EstablishmentFavoritesCreateDestroyView(FavoritesCreateDestroyMixinView): serializer_class = serializers.EstablishmentFavoritesCreateSerializer +class EstablishmentCarouselCreateDestroyView(CarouselCreateDestroyMixinView): + """View for create/destroy establishment from carousel.""" + + _model = models.Establishment + serializer_class = serializers.EstablishmentCarouselCreateSerializer + + class EstablishmentNearestRetrieveView(EstablishmentListView, generics.ListAPIView): """Resource for getting list of nearest establishments.""" From e565406729509fa9f3028c63ece228cdfbe0b985 Mon Sep 17 00:00:00 2001 From: Semyon Yekhmenin Date: Fri, 22 Nov 2019 14:21:25 +0000 Subject: [PATCH 5/6] Feature/bo employee update --- apps/establishment/filters.py | 20 +++++++ .../migrations/0066_auto_20191122_1144.py | 28 +++++++++ .../migrations/0067_auto_20191122_1244.py | 39 ++++++++++++ apps/establishment/models.py | 59 +++++++++++++++++-- apps/establishment/serializers/back.py | 46 ++++++++++++++- apps/establishment/serializers/common.py | 57 +++++++++++++++++- apps/establishment/urls/back.py | 8 +++ apps/establishment/views/back.py | 44 +++++++++++++- 8 files changed, 289 insertions(+), 12 deletions(-) create mode 100644 apps/establishment/migrations/0066_auto_20191122_1144.py create mode 100644 apps/establishment/migrations/0067_auto_20191122_1244.py diff --git a/apps/establishment/filters.py b/apps/establishment/filters.py index adbcae76..db419989 100644 --- a/apps/establishment/filters.py +++ b/apps/establishment/filters.py @@ -55,3 +55,23 @@ class EstablishmentTypeTagFilter(filters.FilterSet): fields = ( 'type_id', ) + + +class EmployeeBackFilter(filters.FilterSet): + """Employee filter set.""" + + search = filters.CharFilter(method='search_by_name_or_last_name') + + class Meta: + """Meta class.""" + + model = models.Employee + fields = ( + 'search', + ) + + def search_by_name_or_last_name(self, queryset, name, value): + """Search by name or last name.""" + if value not in EMPTY_VALUES: + return queryset.search_by_name_or_last_name(value) + return queryset diff --git a/apps/establishment/migrations/0066_auto_20191122_1144.py b/apps/establishment/migrations/0066_auto_20191122_1144.py new file mode 100644 index 00000000..edff3333 --- /dev/null +++ b/apps/establishment/migrations/0066_auto_20191122_1144.py @@ -0,0 +1,28 @@ +# Generated by Django 2.2.7 on 2019-11-22 11:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0065_establishment_purchased_products'), + ] + + operations = [ + migrations.AddField( + model_name='employee', + name='last_name', + field=models.CharField(default=None, max_length=255, null=True, verbose_name='Last Name'), + ), + migrations.AddField( + model_name='establishmentemployee', + name='status', + field=models.CharField(choices=[('I', 'Idle'), ('A', 'Accepted'), ('D', 'Declined')], default='I', max_length=1), + ), + migrations.AlterField( + model_name='employee', + name='name', + field=models.CharField(max_length=255, verbose_name='Name'), + ), + ] diff --git a/apps/establishment/migrations/0067_auto_20191122_1244.py b/apps/establishment/migrations/0067_auto_20191122_1244.py new file mode 100644 index 00000000..8dfdc3a4 --- /dev/null +++ b/apps/establishment/migrations/0067_auto_20191122_1244.py @@ -0,0 +1,39 @@ +# Generated by Django 2.2.7 on 2019-11-22 12:44 + +from django.db import migrations, models +import phonenumber_field.modelfields + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0066_auto_20191122_1144'), + ] + + operations = [ + migrations.AddField( + model_name='employee', + name='birth_date', + field=models.DateTimeField(default=None, null=True, verbose_name='Birth date'), + ), + migrations.AddField( + model_name='employee', + name='email', + field=models.EmailField(blank=True, default=None, max_length=254, null=True, verbose_name='Email'), + ), + migrations.AddField( + model_name='employee', + name='phone', + field=phonenumber_field.modelfields.PhoneNumberField(default=None, max_length=128, null=True), + ), + migrations.AddField( + model_name='employee', + name='sex', + field=models.PositiveSmallIntegerField(choices=[(0, 'Male'), (1, 'Female')], default=None, null=True, verbose_name='Sex'), + ), + migrations.AddField( + model_name='employee', + name='toque_number', + field=models.PositiveSmallIntegerField(default=None, null=True, verbose_name='Toque number'), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index f8ffd456..d22aebaa 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -1,6 +1,7 @@ """Establishment models.""" from datetime import datetime from functools import reduce +from typing import List from operator import or_ import elasticsearch_dsl @@ -435,11 +436,12 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, @property def visible_tags(self): - return super().visible_tags\ - .exclude(category__index_name__in=['guide', 'collection', 'purchased_item', - 'business_tag', 'business_tags_de'])\ + return super().visible_tags \ + .exclude(category__index_name__in=['guide', 'collection', 'purchased_item', + 'business_tag', 'business_tags_de']) \ + \ + # todo: recalculate toque_number - # todo: recalculate toque_number def recalculate_toque_number(self): toque_number = 0 if self.address and self.public_mark: @@ -612,7 +614,6 @@ class EstablishmentNote(ProjectBaseMixin): class EstablishmentGallery(IntermediateGalleryModelMixin): - establishment = models.ForeignKey(Establishment, null=True, related_name='establishment_gallery', on_delete=models.CASCADE, @@ -663,6 +664,16 @@ class EstablishmentEmployeeQuerySet(models.QuerySet): class EstablishmentEmployee(BaseAttributes): """EstablishmentEmployee model.""" + IDLE = 'I' + ACCEPTED = 'A' + DECLINED = 'D' + + STATUS_CHOICES = ( + (IDLE, 'Idle'), + (ACCEPTED, 'Accepted'), + (DECLINED, 'Declined'), + ) + establishment = models.ForeignKey(Establishment, on_delete=models.PROTECT, verbose_name=_('Establishment')) employee = models.ForeignKey('establishment.Employee', on_delete=models.PROTECT, @@ -673,19 +684,53 @@ class EstablishmentEmployee(BaseAttributes): verbose_name=_('To date')) position = models.ForeignKey(Position, on_delete=models.PROTECT, verbose_name=_('Position')) + + status = models.CharField(max_length=1, choices=STATUS_CHOICES, default=IDLE) + # old_id = affiliations_id old_id = models.IntegerField(verbose_name=_('Old id'), null=True, blank=True) objects = EstablishmentEmployeeQuerySet.as_manager() +class EmployeeQuerySet(models.QuerySet): + + def _generic_search(self, value, filter_fields_names: List[str]): + """Generic method for searching value in specified fields""" + filters = [ + {f'{field}__icontains': value} + for field in filter_fields_names + ] + return self.filter(reduce(lambda x, y: x | y, [models.Q(**i) for i in filters])) + + def search_by_name_or_last_name(self, value): + """Search by name or last_name.""" + return self._generic_search(value, ['name', 'last_name']) + + class Employee(BaseAttributes): """Employee model.""" user = models.OneToOneField('account.User', on_delete=models.PROTECT, null=True, blank=True, default=None, verbose_name=_('User')) - name = models.CharField(max_length=255, verbose_name=_('Last name')) + name = models.CharField(max_length=255, verbose_name=_('Name')) + last_name = models.CharField(max_length=255, verbose_name=_('Last Name'), null=True, default=None) + + # SEX CHOICES + MALE = 0 + FEMALE = 1 + + SEX_CHOICES = ( + (MALE, _('Male')), + (FEMALE, _('Female')) + ) + sex = models.PositiveSmallIntegerField(choices=SEX_CHOICES, verbose_name=_('Sex'), null=True, default=None) + birth_date = models.DateTimeField(editable=True, verbose_name=_('Birth date'), null=True, default=None) + email = models.EmailField(blank=True, null=True, default=None, verbose_name=_('Email')) + phone = PhoneNumberField(null=True, default=None) + toque_number = models.PositiveSmallIntegerField(verbose_name=_('Toque number'), null=True, default=None) + establishments = models.ManyToManyField(Establishment, related_name='employees', through=EstablishmentEmployee, ) awards = generic.GenericRelation(to='main.Award', related_query_name='employees') @@ -694,6 +739,8 @@ class Employee(BaseAttributes): # old_id = profile_id old_id = models.IntegerField(verbose_name=_('Old id'), null=True, blank=True) + objects = EmployeeQuerySet.as_manager() + class Meta: """Meta class.""" diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index a78bce07..52af0574 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -2,8 +2,9 @@ from rest_framework import serializers from establishment import models from establishment import serializers as model_serializers -from location.serializers import AddressDetailSerializer +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 gallery.models import Image @@ -161,12 +162,53 @@ class ContactEmailBackSerializers(model_serializers.PlateSerializer): class EmployeeBackSerializers(serializers.ModelSerializer): """Employee serializers.""" + awards = AwardSerializer(many=True) + class Meta: model = models.Employee fields = [ 'id', 'user', - 'name' + 'name', + 'last_name', + 'sex', + 'birth_date', + 'email', + 'phone', + 'toque_number', + 'awards', + ] + + +class PositionBackSerializer(serializers.ModelSerializer): + """Position Back serializer.""" + + name_translated = TranslatedField() + + class Meta: + model = models.Position + fields = [ + 'id', + 'name_translated', + 'priority', + 'index_name', + ] + + +class EstablishmentEmployeeBackSerializer(serializers.ModelSerializer): + """Establishment Employee serializer.""" + + employee = EmployeeBackSerializers() + position = PositionBackSerializer() + + class Meta: + model = models.EstablishmentEmployee + fields = [ + 'id', + 'employee', + 'from_date', + 'to_date', + 'position', ] diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index c85b3123..9419c449 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -168,12 +168,51 @@ class EstablishmentEmployeeSerializer(serializers.ModelSerializer): awards = AwardSerializer(source='employee.awards', many=True) priority = serializers.IntegerField(source='position.priority') position_index_name = serializers.CharField(source='position.index_name') + status = serializers.CharField() class Meta: """Meta class.""" model = models.Employee - fields = ('id', 'name', 'position_translated', 'awards', 'priority', 'position_index_name') + fields = ('id', 'name', 'position_translated', 'awards', 'priority', 'position_index_name', 'status') + + +class EstablishmentEmployeeCreateSerializer(serializers.ModelSerializer): + """Serializer for establishment employee relation.""" + + class Meta: + """Meta class.""" + + model = models.EstablishmentEmployee + fields = ('id',) + + def _validate_entity(self, entity_id_param: str, entity_class): + entity_id = self.context.get('request').parser_context.get('kwargs').get(entity_id_param) + entity_qs = entity_class.objects.filter(id=entity_id) + if not entity_qs.exists(): + raise serializers.ValidationError({'detail': _(f'{entity_class.__name__} not found.')}) + return entity_qs.first() + + def validate(self, attrs): + """Override validate method""" + establishment = self._validate_entity("establishment_id", models.Establishment) + employee = self._validate_entity("employee_id", models.Employee) + position = self._validate_entity("position_id", models.Position) + + attrs['establishment'] = establishment + attrs['employee'] = employee + attrs['position'] = position + + return attrs + + def create(self, validated_data, *args, **kwargs): + """Override create method""" + validated_data.update({ + 'employee': validated_data.pop('employee'), + 'establishment': validated_data.pop('establishment'), + 'position': validated_data.pop("position") + }) + return super().create(validated_data) class EstablishmentShortSerializer(serializers.ModelSerializer): @@ -396,6 +435,22 @@ class EstablishmentCommentCreateSerializer(comment_serializers.CommentSerializer return super().create(validated_data) +class EstablishmentCommentRUDSerializer(comment_serializers.CommentSerializer): + """Retrieve/Update/Destroy comment serializer.""" + + class Meta: + """Meta class.""" + model = comment_models.Comment + fields = [ + 'id', + 'created', + 'text', + 'mark', + 'nickname', + 'profile_pic', + ] + + class EstablishmentFavoritesCreateSerializer(FavoritesCreateSerializer): """Serializer to favorite object w/ model Establishment.""" diff --git a/apps/establishment/urls/back.py b/apps/establishment/urls/back.py index f06e2187..a06adc3b 100644 --- a/apps/establishment/urls/back.py +++ b/apps/establishment/urls/back.py @@ -38,8 +38,16 @@ urlpatterns = [ path('phones//', views.PhonesRUDView.as_view(), name='phones-rud'), path('emails/', views.EmailListCreateView.as_view(), name='emails'), path('emails//', views.EmailRUDView.as_view(), name='emails-rud'), + path('/employees/', views.EstablishmentEmployeeListView.as_view(), + name='establishment-employees'), path('employees/', views.EmployeeListCreateView.as_view(), name='employees'), path('employees//', views.EmployeeRUDView.as_view(), name='employees-rud'), + path('/employee//position/', + views.EstablishmentEmployeeCreateView.as_view(), + name='employees-establishment-create'), + path('/employee/', + views.EstablishmentEmployeeDeleteView.as_view(), + name='employees-establishment-delete'), path('types/', views.EstablishmentTypeListCreateView.as_view(), name='type-list'), path('types//', views.EstablishmentTypeRUDView.as_view(), name='type-rud'), path('subtypes/', views.EstablishmentSubtypeListCreateView.as_view(), name='subtype-list'), diff --git a/apps/establishment/views/back.py b/apps/establishment/views/back.py index d1897397..312bb171 100644 --- a/apps/establishment/views/back.py +++ b/apps/establishment/views/back.py @@ -1,7 +1,9 @@ """Establishment app views.""" +from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404 -from rest_framework import generics, permissions +from rest_framework import generics, permissions, status +from utils.permissions import IsCountryAdmin, IsEstablishmentManager from establishment import filters, models, serializers from timetable.serialziers import ScheduleRUDSerializer, ScheduleCreateSerializer from utils.permissions import IsCountryAdmin, IsEstablishmentManager @@ -43,8 +45,8 @@ class EstablishmentScheduleRUDView(generics.RetrieveUpdateDestroyAPIView): """ Returns the object the view is displaying. """ - establishment_pk = self.kwargs.get('pk') - schedule_id = self.kwargs.get('schedule_id') + establishment_pk = self.kwargs['pk'] + schedule_id = self.kwargs['schedule_id'] establishment = get_object_or_404(klass=models.Establishment.objects.all(), pk=establishment_pk) @@ -156,11 +158,23 @@ class EmailRUDView(generics.RetrieveUpdateDestroyAPIView): class EmployeeListCreateView(generics.ListCreateAPIView): """Emplyoee list create view.""" + permission_classes = (permissions.AllowAny, ) + filter_class = filters.EmployeeBackFilter serializer_class = serializers.EmployeeBackSerializers queryset = models.Employee.objects.all() pagination_class = None +class EstablishmentEmployeeListView(generics.ListAPIView): + """Establishment emplyoees list view.""" + permission_classes = (permissions.AllowAny, ) + serializer_class = serializers.EstablishmentEmployeeBackSerializer + + def get_queryset(self): + establishment_id = self.kwargs['establishment_id'] + return models.EstablishmentEmployee.objects.filter(establishment__id=establishment_id) + + class EmployeeRUDView(generics.RetrieveUpdateDestroyAPIView): """Employee RUD view.""" serializer_class = serializers.EmployeeBackSerializers @@ -318,3 +332,27 @@ class EstablishmentNoteRUDView(EstablishmentMixinViews, self.check_object_permissions(self.request, note) return note + + +class EstablishmentEmployeeCreateView(generics.CreateAPIView): + serializer_class = serializers.EstablishmentEmployeeCreateSerializer + queryset = models.EstablishmentEmployee.objects.all() + # TODO send email to all admins and add endpoint for changing status + + +class EstablishmentEmployeeDeleteView(generics.DestroyAPIView): + + def _get_object_to_delete(self, establishment_id, employee_id): + result_qs = models.EstablishmentEmployee\ + .objects\ + .filter(establishment_id=establishment_id, employee_id=employee_id) + if not result_qs.exists(): + raise Http404 + return result_qs.first() + + def delete(self, request, *args, **kwargs): + establishment_id = self.kwargs["establishment_id"] + employee_id = self.kwargs["employee_id"] + object_to_delete = self._get_object_to_delete(establishment_id, employee_id) + object_to_delete.delete() + return HttpResponse(status=status.HTTP_204_NO_CONTENT) From 586f2a7a0356fb247499c7c18db523ca60eeb6e2 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 22 Nov 2019 18:21:37 +0300 Subject: [PATCH 6/6] boost detail establishment speed (cherry picked from commit c2bb9f0) --- apps/establishment/models.py | 6 ++++-- project/settings/production.py | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index d22aebaa..cb490aa4 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -119,11 +119,13 @@ class EstablishmentQuerySet(models.QuerySet): 'address__city__country') def with_extended_related(self): - return self.select_related('establishment_type'). \ + return self.with_extended_address_related().select_related('establishment_type'). \ prefetch_related('establishment_subtypes', 'awards', 'schedule', - 'phones'). \ + 'phones', 'gallery', 'menu_set', 'menu_set__plate_set', + 'menu_set__plate_set__currency', 'currency'). \ prefetch_actual_employees() + def with_type_related(self): return self.prefetch_related('establishment_subtypes') diff --git a/project/settings/production.py b/project/settings/production.py index 3192acea..e745f3bc 100644 --- a/project/settings/production.py +++ b/project/settings/production.py @@ -51,4 +51,6 @@ GUESTONLINE_SERVICE = 'https://api.guestonline.fr/' GUESTONLINE_TOKEN = '' LASTABLE_SERVICE = '' LASTABLE_TOKEN = '' -LASTABLE_PROXY = '' \ No newline at end of file +LASTABLE_PROXY = '' + +THUMBNAIL_FORCE_OVERWRITE = True # see: https://github.com/jazzband/sorl-thumbnail/issues/351 \ No newline at end of file