From ed09ee78ccbee605163fb3837201823d1ea0e78d Mon Sep 17 00:00:00 2001
From: Anatoly <a.feteleu@spider.ru>
Date: Mon, 28 Oct 2019 13:11:07 +0300
Subject: [PATCH] small refactoring

---
 apps/product/filters.py | 20 ++++++++++----------
 apps/product/models.py  |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/product/filters.py b/apps/product/filters.py
index 9318b943..7894a6e6 100644
--- a/apps/product/filters.py
+++ b/apps/product/filters.py
@@ -9,26 +9,26 @@ class ProductListFilterSet(filters.FilterSet):
     """Product filter set."""
 
     establishment_id = filters.NumberFilter()
-    type = filters.ChoiceFilter(method='by_type',
-                                choices=models.ProductType.INDEX_NAME_TYPES)
-    subtype = filters.ChoiceFilter(method='by_subtype',
-                                   choices=models.ProductSubType.INDEX_NAME_TYPES)
+    product_type = filters.ChoiceFilter(method='by_product_type',
+                                        choices=models.ProductType.INDEX_NAME_TYPES)
+    product_subtype = filters.ChoiceFilter(method='by_product_subtype',
+                                           choices=models.ProductSubType.INDEX_NAME_TYPES)
 
     class Meta:
         """Meta class."""
         model = models.Product
         fields = [
             'establishment_id',
-            'type',
-            'subtype',
+            'product_type',
+            'product_subtype',
         ]
 
-    def by_type(self, queryset, name, value):
+    def by_product_type(self, queryset, name, value):
         if value not in EMPTY_VALUES:
-            return queryset.by_type(value)
+            return queryset.by_product_type(value)
         return queryset
 
-    def by_subtype(self, queryset, name, value):
+    def by_product_subtype(self, queryset, name, value):
         if value not in EMPTY_VALUES:
-            return queryset.by_subtype(value)
+            return queryset.by_product_subtype(value)
         return queryset
diff --git a/apps/product/models.py b/apps/product/models.py
index b0b1795e..40007f18 100644
--- a/apps/product/models.py
+++ b/apps/product/models.py
@@ -91,13 +91,13 @@ class ProductQuerySet(models.QuerySet):
     def wines(self):
         return self.filter(type__index_name=ProductType.WINE)
 
-    def by_type(self, type: str):
+    def by_product_type(self, product_type: str):
         """Filter by type."""
-        return self.filter(product_type__index_name=type)
+        return self.filter(product_type__index_name=product_type)
 
-    def by_subtype(self, subtype: str):
+    def by_product_subtype(self, product_subtype: str):
         """Filter by subtype."""
-        return self.filter(subtypes__index_name=subtype)
+        return self.filter(subtypes__index_name=product_subtype)
 
 
 class Product(TranslatedFieldsMixin, BaseAttributes):