Merge branch 'feature/cities_by_country' into 'develop'

Feature/cities by country

See merge request gm/gm-backend!62

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(

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)

apps/location/views/common.py

@@ -86,6 +86,12 @@ class CityListView(CityViewMixin, generics.ListAPIView):
     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"""
@@ -112,5 +118,3 @@ class AddressListView(AddressViewMixin, generics.ListAPIView):
     """List view for model Address"""
     permission_classes = (permissions.AllowAny,)
     serializer_class = serializers.AddressDetailSerializer
-
-

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')),