From 939e4a26a09bd397b7ba32d172b9781e68ea250a Mon Sep 17 00:00:00 2001
From: Semyon Yekhmenin <s.yekhmenin@id-east.ru>
Date: Tue, 22 Oct 2019 13:00:22 +0000
Subject: [PATCH] Feature/cities by country

---
 apps/location/models.py       | 11 ++++++++++-
 apps/location/urls/mobile.py  |  3 +--
 apps/location/views/common.py | 16 ++++++++++------
 project/urls/mobile.py        |  3 ++-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/apps/location/models.py b/apps/location/models.py
index 2b7aa363..c12f7ff0 100644
--- a/apps/location/models.py
+++ b/apps/location/models.py
@@ -53,6 +53,14 @@ class Region(models.Model):
         return self.name
 
 
+class CityQuerySet(models.QuerySet):
+    """Extended queryset for City model."""
+
+    def by_country_code(self, code):
+        """Return establishments by country code"""
+        return self.filter(country__code=code)
+
+
 class City(models.Model):
     """Region model."""
 
@@ -68,6 +76,8 @@ class City(models.Model):
 
     is_island = models.BooleanField(_('is island'), default=False)
 
+    objects = CityQuerySet.as_manager()
+
     class Meta:
         verbose_name_plural = _('cities')
         verbose_name = _('city')
@@ -77,7 +87,6 @@ class City(models.Model):
 
 
 class Address(models.Model):
-
     """Address model."""
     city = models.ForeignKey(City, verbose_name=_('city'), on_delete=models.CASCADE)
     street_name_1 = models.CharField(
diff --git a/apps/location/urls/mobile.py b/apps/location/urls/mobile.py
index b808d5b6..879ded79 100644
--- a/apps/location/urls/mobile.py
+++ b/apps/location/urls/mobile.py
@@ -1,7 +1,6 @@
 """Location app mobile urlconf."""
 from location.urls.common import urlpatterns as common_urlpatterns
 
-
 urlpatterns = []
 
-urlpatterns.extend(common_urlpatterns)
\ No newline at end of file
+urlpatterns.extend(common_urlpatterns)
diff --git a/apps/location/views/common.py b/apps/location/views/common.py
index 792fce91..b4a3f1cb 100644
--- a/apps/location/views/common.py
+++ b/apps/location/views/common.py
@@ -10,7 +10,7 @@ class CountryViewMixin(generics.GenericAPIView):
     """View Mixin for model Country"""
 
     serializer_class = serializers.CountrySerializer
-    permission_classes = (permissions.AllowAny, )
+    permission_classes = (permissions.AllowAny,)
     queryset = models.Country.objects.all()
 
 
@@ -56,7 +56,7 @@ class RegionRetrieveView(RegionViewMixin, generics.RetrieveAPIView):
 
 class RegionListView(RegionViewMixin, generics.ListAPIView):
     """List view for model Country"""
-    permission_classes = (permissions.AllowAny, )
+    permission_classes = (permissions.AllowAny,)
     serializer_class = serializers.CountrySerializer
 
 
@@ -83,9 +83,15 @@ class CityRetrieveView(CityViewMixin, generics.RetrieveAPIView):
 
 class CityListView(CityViewMixin, generics.ListAPIView):
     """List view for model City"""
-    permission_classes = (permissions.AllowAny, )
+    permission_classes = (permissions.AllowAny,)
     serializer_class = serializers.CitySerializer
 
+    def get_queryset(self):
+        qs = super().get_queryset()
+        if self.request.country_code:
+            qs = qs.by_country_code(self.request.country_code)
+        return qs
+
 
 class CityDestroyView(CityViewMixin, generics.DestroyAPIView):
     """Destroy view for model City"""
@@ -110,7 +116,5 @@ class AddressRetrieveView(AddressViewMixin, generics.RetrieveAPIView):
 
 class AddressListView(AddressViewMixin, generics.ListAPIView):
     """List view for model Address"""
-    permission_classes = (permissions.AllowAny, )
+    permission_classes = (permissions.AllowAny,)
     serializer_class = serializers.AddressDetailSerializer
-
-
diff --git a/project/urls/mobile.py b/project/urls/mobile.py
index 0bea5305..77d007dc 100644
--- a/project/urls/mobile.py
+++ b/project/urls/mobile.py
@@ -4,7 +4,8 @@ app_name = 'mobile'
 
 urlpatterns = [
     path('establishments/', include('establishment.urls.mobile')),
-    path('main/', include('main.urls.mobile'))
+    path('main/', include('main.urls.mobile')),
+    path('location/', include('location.urls.mobile'))
     # path('account/', include('account.urls.web')),
     # path('advertisement/', include('advertisement.urls.web')),
     # path('collection/', include('collection.urls.web')),