added filters and endpoint to get winery list

apps/establishment/filters.py

@@ -10,6 +10,10 @@ class EstablishmentFilter(filters.FilterSet):
     tag_id = filters.NumberFilter(field_name='tags__metadata__id',)
     award_id = filters.NumberFilter(field_name='awards__id',)
     search = filters.CharFilter(method='search_text')
+    est_type = filters.ChoiceFilter(choices=models.EstablishmentType.INDEX_NAME_TYPES,
+                                    method='by_type')
+    est_subtype = filters.ChoiceFilter(choices=models.EstablishmentSubType.INDEX_NAME_TYPES,
+                                       method='by_subtype')
 
     class Meta:
         """Meta class."""
@@ -19,6 +23,8 @@ class EstablishmentFilter(filters.FilterSet):
             'tag_id',
             'award_id',
             'search',
+            'est_type',
+            'est_subtype',
         )
 
     def search_text(self, queryset, name, value):
@@ -27,6 +33,12 @@ class EstablishmentFilter(filters.FilterSet):
             return queryset.search(value, locale=self.request.locale)
         return queryset
 
+    def by_type(self, queryset, name, value):
+        return queryset.by_type(value)
+
+    def by_subtype(self, queryset, name, value):
+        return queryset.by_subtype(value)
+
 
 class EstablishmentTypeTagFilter(filters.FilterSet):
     """Establishment tag filter set."""

apps/establishment/migrations/0038_establishmenttype_index_name.py

@@ -3,8 +3,9 @@
 from django.db import migrations, models
 
 
-def fill_establishment_type(apps, schemaeditor):
-    import ipdb; ipdb.set_trace()
+def fill_establishment_type(apps, schema_editor):
+    # We can't import the Person model directly as it may be a newer
+    # version than this migration expects. We use the historical version.
     EstablishmentType = apps.get_model('establishment', 'EstablishmentType')
     for n, et in enumerate(EstablishmentType.objects.all()):
         et.index_name = f'Type {n}'

apps/establishment/migrations/0039_establishmentsubtype_index_name.py

@@ -0,0 +1,35 @@
+# Generated by Django 2.2.4 on 2019-10-18 13:47
+
+from django.db import migrations, models
+
+
+def fill_establishment_subtype(apps, schema_editor):
+    # We can't import the Person model directly as it may be a newer
+    # version than this migration expects. We use the historical version.
+    EstablishmentSubType = apps.get_model('establishment', 'EstablishmentSubType')
+    for n, et in enumerate(EstablishmentSubType.objects.all()):
+        et.index_name = f'Type {n}'
+        et.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('establishment', '0038_establishmenttype_index_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='establishmentsubtype',
+            name='index_name',
+            field=models.CharField(blank=True, db_index=True, max_length=50, null=True, unique=True, default=None, verbose_name='Index name'),
+        ),
+        migrations.RunPython(fill_establishment_subtype),
+        migrations.AlterField(
+            model_name='establishmentsubtype',
+            name='index_name',
+            field=models.CharField(choices=[('winery', 'Winery'), ], db_index=True, max_length=50,
+                                   unique=True, verbose_name='Index name'),
+        ),
+
+    ]

apps/establishment/models.py

@@ -68,8 +68,18 @@ class EstablishmentSubTypeManager(models.Manager):
 class EstablishmentSubType(ProjectBaseMixin, TranslatedFieldsMixin):
     """Establishment type model."""
 
+    # INDEX NAME CHOICES
+    WINERY = 'winery'
+
+    INDEX_NAME_TYPES = (
+        (WINERY, _('Winery')),
+    )
+
     name = TJSONField(blank=True, null=True, default=None, verbose_name=_('Description'),
                       help_text='{"en-GB":"some text"}')
+    index_name = models.CharField(max_length=50, choices=INDEX_NAME_TYPES,
+                                  unique=True, db_index=True,
+                                  verbose_name=_('Index name'))
     establishment_type = models.ForeignKey(EstablishmentType,
                                            on_delete=models.CASCADE,
                                            verbose_name=_('Type'))
@@ -104,6 +114,9 @@ class EstablishmentQuerySet(models.QuerySet):
                              'phones').\
             prefetch_actual_employees()
 
+    def with_type_related(self):
+        return self.prefetch_related('establishment_subtypes')
+
     def search(self, value, locale=None):
         """Search text in JSON fields."""
         if locale is not None:
@@ -251,6 +264,31 @@ class EstablishmentQuerySet(models.QuerySet):
         kwargs = {unit: radius}
         return self.filter(address__coordinates__distance_lte=(center, DistanceMeasure(**kwargs)))
 
+    def artisans(self):
+        """Return artisans."""
+        return self.filter(establishment_type__index_name=EstablishmentType.ARTISAN)
+
+    def producers(self):
+        """Return producers."""
+        return self.filter(establishment_type__index_name=EstablishmentType.PRODUCER)
+
+    def restaurants(self):
+        """Return restaurants."""
+        return self.filter(establishment_type__index_name=EstablishmentType.RESTAURANT)
+
+    def wineries(self):
+        """Return wineries."""
+        return self.producers().filter(
+            establishment_subtypes__index_name=EstablishmentSubType.WINERY)
+
+    def by_type(self, value):
+        """Return QuerySet with type by value."""
+        return self.filter(establishment_type__index_name=value)
+
+    def by_subtype(self, value):
+        """Return QuerySet with subtype by value."""
+        return self.filter(establishment_subtypes__index_name=value)
+
 
 class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin):
     """Establishment model."""

apps/establishment/urls/common.py

@@ -9,6 +9,7 @@ urlpatterns = [
     path('', views.EstablishmentListView.as_view(), name='list'),
     path('recent-reviews/', views.EstablishmentRecentReviewListView.as_view(),
          name='recent-reviews'),
+    # path('wineries/', views.WineriesListView.as_view(), name='wineries-list'),
     path('slug/<slug:slug>/', views.EstablishmentRetrieveView.as_view(), name='detail'),
     path('slug/<slug:slug>/similar/', views.EstablishmentSimilarListView.as_view(), name='similar'),
     path('slug/<slug:slug>/comments/', views.EstablishmentCommentListView.as_view(), name='list-comments'),

apps/establishment/views/web.py

@@ -174,3 +174,14 @@ class EstablishmentNearestRetrieveView(EstablishmentListView, generics.ListAPIVi
             return qs.by_distance_from_point(**{k: v for k, v in filter_kwargs.items()
                                                 if v is not None})
         return qs
+
+
+# Wineries
+# todo: find out about difference between subtypes data
+# class WineriesListView(EstablishmentListView):
+#     """Return list establishments with type Wineries"""
+#
+#     def get_queryset(self):
+#         """Overridden get_queryset method."""
+#         qs = super(WineriesListView, self).get_queryset()
+#         return qs.with_type_related().wineries()