diff --git a/core/management/commands/loadgisdata.py b/core/management/commands/loadgisdata.py index 3ea9381..efdd312 100644 --- a/core/management/commands/loadgisdata.py +++ b/core/management/commands/loadgisdata.py @@ -61,7 +61,6 @@ class Command(BaseCommand): logging.info(f"Country instance created for: {name}") except Exception as e: logging.error(f"[{name}][{type(e)}] {str(e)}") - # import ipdb; ipdb.set_trace() # region instances logging.info("loading region instances") @@ -83,7 +82,6 @@ class Command(BaseCommand): logging.info(f"Region instance created for: {name}") except Exception as e: logging.error(f"[{name}][{type(e)}] {str(e)}") - # import ipdb; ipdb.set_trace() # province instances logging.info("loading province instances") @@ -106,7 +104,6 @@ class Command(BaseCommand): logging.info(f"Province instance created for: {name}") except Exception as e: logging.error(f"[{name}][{type(e)}] {str(e)}") - import ipdb; ipdb.set_trace() # city instances logging.info("loading city instances") @@ -129,7 +126,6 @@ class Command(BaseCommand): logging.debug(f"City instance created for: {name}") except Exception as e: logging.error(f"[{type(e)}] {str(e)}") - # import ipdb; ipdb.set_trace() logging.info(f"Country instances created: {country_counter}") logging.info(f"Region instances created: {region_counter}") diff --git a/products/models.py b/products/models.py index 8fce915..d3468dc 100644 --- a/products/models.py +++ b/products/models.py @@ -1,11 +1,18 @@ from django.contrib.gis.db import models -from tagulous.models import SingleTagField, TagField +from tagulous.models import SingleTagField, TagField, TagTreeModel from companies.models import Company # Create your models here. +class MyTreeTags(TagTreeModel): + class TagMeta: + initial = "colors/blue, colors/red, colors/green" + force_lowercase = True + # autocomplete_view = 'myapp.views.hobbies_autocomplete' + + class Product(models.Model): SYNCHRONIZED = 'SYNCHRONIZED' diff --git a/products/serializers.py b/products/serializers.py index c20e5b7..0f09d36 100644 --- a/products/serializers.py +++ b/products/serializers.py @@ -1,4 +1,5 @@ from rest_framework import serializers +from tagulous.serializers.json import Serializer from products.models import Product diff --git a/products/tests.py b/products/tests.py index 12eee20..9f9d471 100644 --- a/products/tests.py +++ b/products/tests.py @@ -80,6 +80,88 @@ class ProductViewSetTest(APITestCase): # Assert access is forbidden self.assertEqual(response.status_code, status.HTTP_200_OK) + def test_anon_user_can_filter_name(self): + # create instances + self.factory(name='product1', tags="zapatos, verdes") + self.factory(name='product2', tags="rojos") + + url = f"{self.endpoint}?name=product1" + + # Request list + response = self.client.get(url) + payload = response.json() + + # Assert access is granted + self.assertEqual(response.status_code, status.HTTP_200_OK) + # Assert number of instnaces in response + self.assertEquals(1, len(payload)) + + def test_anon_user_can_filter_tags(self): + # create instances + expected_instance = [ + self.factory(name='product1', tags="zapatos, rojos"), + self.factory(name='product2', tags="rojos") + ] + unexpected_instance = [ + self.factory(name='sadfdsa', tags="zapatos, azules"), + self.factory(name='qwerw', tags="xxl") + ] + # prepare url + url = f"{self.endpoint}?tags=rojos" + + # Request list + response = self.client.get(url) + payload = response.json() + + # Assert access is granted + self.assertEqual(response.status_code, status.HTTP_200_OK) + # Assert number of instnaces in response + self.assertEquals(len(expected_instance), len(payload)) + + def test_anon_user_can_filter_attributes(self): + # create instances + expected_instance = [ + self.factory(attributes='xxl', tags="zapatos, rojos"), + self.factory(attributes='blue, xxl', tags="rojos") + ] + unexpected_instance = [ + self.factory(name='sadfdsa', tags="zapatos, azules"), + self.factory(name='qwerw', tags="xxl") + ] + # prepare url + url = f"{self.endpoint}?attributes=xxl" + + # Request list + response = self.client.get(url) + payload = response.json() + + # Assert access is granted + self.assertEqual(response.status_code, status.HTTP_200_OK) + # Assert number of instnaces in response + self.assertEquals(len(expected_instance), len(payload)) + + def test_anon_user_can_filter_category(self): + # create instances + expected_instance = [ + self.factory(category='ropa', tags="zapatos, rojos"), + self.factory(category='ropa', tags="rojos") + ] + unexpected_instance = [ + self.factory(category='roperos', tags="zapatos, azules"), + self.factory(category='enropados', tags="xxl") + ] + # prepare url + url = f"{self.endpoint}?category=ropa" + + # Request list + response = self.client.get(url) + payload = response.json() + + # Assert access is granted + self.assertEqual(response.status_code, status.HTTP_200_OK) + # Assert number of instnaces in response + self.assertEquals(len(expected_instance), len(payload)) + # authenticated user def test_auth_user_can_list_instances(self): """Regular logged-in user can list instance diff --git a/products/views.py b/products/views.py index 947d1c8..790f785 100644 --- a/products/views.py +++ b/products/views.py @@ -25,6 +25,8 @@ from history.models import HistorySync from back_latienda.permissions import IsCreator from .utils import extract_search_filters from utils.tag_serializers import TaggitSerializer +from utils.tag_filters import ProductTagFilter + logging.basicConfig( filename='logs/product-load.log', @@ -38,6 +40,8 @@ class ProductViewSet(viewsets.ModelViewSet): queryset = Product.objects.all() serializer_class = ProductSerializer permission_classes = [IsAuthenticatedOrReadOnly, IsCreator] + filterset_class = ProductTagFilter + filterset_fields = ['name', 'tags', 'category', 'attributes'] def perform_create(self, serializer): serializer.save(creator=self.request.user) diff --git a/utils/tag_filters.py b/utils/tag_filters.py new file mode 100644 index 0000000..7394ac0 --- /dev/null +++ b/utils/tag_filters.py @@ -0,0 +1,18 @@ +import django_filters +from products.models import Product + + +class ProductTagFilter(django_filters.FilterSet): + + tags = django_filters.CharFilter(method='tag_filter') + attributes = django_filters.CharFilter(method='tag_filter') + category = django_filters.CharFilter(method='tag_filter') + + class Meta: + model = Product + fields = ['name', 'tags', 'category', 'attributes'] + + def tag_filter(self, queryset, name, value): + return queryset.filter(**{ + name: value, + })