diff --git a/.flake8 b/.flake8 index af375ad..a1cce8e 100644 --- a/.flake8 +++ b/.flake8 @@ -1,2 +1,2 @@ [flake8] -ignore = E501,W504 +ignore = E501,W503 diff --git a/terra_layer/apps.py b/terra_layer/apps.py index acde24e..bb11cae 100644 --- a/terra_layer/apps.py +++ b/terra_layer/apps.py @@ -1,5 +1,4 @@ from django.apps import AppConfig -from django.db.models.signals import post_migrate from terra_accounts.permissions_mixins import PermissionRegistrationMixin diff --git a/terra_layer/management/commands/layer_load_dump.py b/terra_layer/management/commands/layer_load_dump.py index 63a7fbc..72158d5 100644 --- a/terra_layer/management/commands/layer_load_dump.py +++ b/terra_layer/management/commands/layer_load_dump.py @@ -1,8 +1,8 @@ import argparse from django.core.management.base import BaseCommand, CommandError -from terra_layer.models import Layer, Scene, LayerGroup +from terra_layer.models import Layer, Scene from terra_layer.serializers import LayerDetailSerializer -from django_geosource.models import Field, Source +from django_geosource.models import Source import json diff --git a/terra_layer/schema.py b/terra_layer/schema.py index 9dcdfac..45d9f16 100644 --- a/terra_layer/schema.py +++ b/terra_layer/schema.py @@ -11,7 +11,7 @@ class JSONSchemaValidator(BaseValidator): def compare(self, a, b): try: jsonschema.validate(a, b) - except jsonschema.exceptions.ValidationError as e: + except jsonschema.exceptions.ValidationError: raise django.core.exceptions.ValidationError( "%(value)s failed JSON schema check", params={"value": a} ) @@ -69,13 +69,6 @@ def compare(self, a, b): "type": "object", "title": "The settings of group", }, - "group": { - "$id": "#/items/properties/exclusive", - "type": "boolean", - "title": "Is the group exclusive ?", - "default": False, - "examples": [True], - }, "children": {"$ref": "#"}, }, }, diff --git a/terra_layer/serializers.py b/terra_layer/serializers.py index 335000b..3fa09ee 100644 --- a/terra_layer/serializers.py +++ b/terra_layer/serializers.py @@ -8,7 +8,7 @@ ValidationError, ) -from .models import CustomStyle, FilterField, Layer, LayerGroup, Scene +from .models import CustomStyle, FilterField, Layer, Scene class SceneListSerializer(ModelSerializer): diff --git a/terra_layer/tests/test_commands/test_layer_dump.py b/terra_layer/tests/test_commands/test_layer_dump.py index 22fdc5d..d3b9f37 100644 --- a/terra_layer/tests/test_commands/test_layer_dump.py +++ b/terra_layer/tests/test_commands/test_layer_dump.py @@ -8,7 +8,6 @@ from django.test import TestCase from terra_layer.models import CustomStyle, FilterField, Layer -from terra_layer.tests import factories from django_geosource.models import PostGISSource, Field diff --git a/terra_layer/tests/test_commands/test_load_layer_dump.py b/terra_layer/tests/test_commands/test_load_layer_dump.py index 46c9f40..1a7f839 100644 --- a/terra_layer/tests/test_commands/test_load_layer_dump.py +++ b/terra_layer/tests/test_commands/test_load_layer_dump.py @@ -1,15 +1,11 @@ -import json -from io import StringIO import os -from unittest import mock from django.contrib.auth import get_user_model from django.core.management import call_command from django.core.management.base import CommandError from django.test import TestCase -from terra_layer.models import CustomStyle, FilterField, Layer, Scene -from terra_layer.tests import factories +from terra_layer.models import FilterField, Layer, Scene from django_geosource.models import PostGISSource, Field @@ -71,7 +67,7 @@ def test_command_launch_command_error(self): def test_command_launch_multiple_name_found(self): self.maxDiff = None self.scene.tree = [ - {"label": "layer1", "group": True, "expanded": True, "children": [],}, + {"label": "layer1", "group": True, "expanded": True, "children": []}, ] self.scene.save() file = os.path.join( diff --git a/terra_layer/tests/test_views.py b/terra_layer/tests/test_views.py index 9b0ec24..d308434 100644 --- a/terra_layer/tests/test_views.py +++ b/terra_layer/tests/test_views.py @@ -1,7 +1,7 @@ from django.contrib.auth import get_user_model from django.test import TestCase from django.urls import reverse -from django_geosource.models import PostGISSource, Source, FieldTypes, Field, WMTSSource +from django_geosource.models import PostGISSource, Source, FieldTypes, WMTSSource from rest_framework.status import ( HTTP_200_OK, HTTP_201_CREATED, @@ -50,10 +50,6 @@ def test_list_view(self): response = self.client.get(reverse("layer-list")) self.assertEqual(response.status_code, HTTP_200_OK) - layer_from_group = [ - layer for layer in response.json() if layer["group"] == group.id - ] - self.assertEqual(Layer.objects.count(), len(response.json())) def test_create_layer(self): @@ -200,7 +196,7 @@ def test_create_scene_with_layer_in_tree(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -221,7 +217,7 @@ def test_layer_view_with_source_model(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -256,7 +252,7 @@ def test_layer_view_with_wmtsource(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -309,7 +305,7 @@ def test_layer_view_with_custom_style(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -342,7 +338,7 @@ def test_layer_view_with_table_enable(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -364,7 +360,7 @@ def test_layer_view_with_table_enable(self): ) def test_layer_view_with_table_enable_no_layer(self): - field = self.source.fields.create( + self.source.fields.create( name="_test_field", label="test_label", data_type=FieldTypes.String.value ) layer = Layer.objects.create( @@ -373,7 +369,7 @@ def test_layer_view_with_table_enable_no_layer(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -401,7 +397,7 @@ def test_create_scene_with_complexe_tree(self): "label": "Sub group 1", "group": True, "expanded": True, - "children": [{"geolayer": layers[2].id,}], + "children": [{"geolayer": layers[2].id}], }, {"geolayer": layers[3].id}, ], @@ -409,13 +405,13 @@ def test_create_scene_with_complexe_tree(self): { "label": "My group 2", "group": True, - "children": [{"geolayer": layers[4].id,}], + "children": [{"geolayer": layers[4].id}], }, - {"geolayer": layers[5].id,}, + {"geolayer": layers[5].id}, { "label": "My group 3", "group": True, - "children": [{"geolayer": layers[6].id,}], + "children": [{"geolayer": layers[6].id}], }, ] @@ -486,7 +482,7 @@ def test_validation_error_on_scene_create(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } self.client.post(reverse("scene-list"), query) @@ -495,7 +491,7 @@ def test_validation_error_on_scene_create(self): query = { "name": "Another scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -505,7 +501,7 @@ def test_validation_error_on_scene_create(self): query = { "name": "Yet another scene Name", "category": "map", - "tree": [{"geolayer": 20000},], + "tree": [{"geolayer": 20000}], } response = self.client.post(reverse("scene-list"), query) @@ -530,7 +526,7 @@ def test_validation_error_on_delete_attached_layer(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } self.client.post(reverse("scene-list"), query) @@ -592,7 +588,7 @@ def test_scene_list_no_permission(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -605,7 +601,7 @@ def test_source_list_no_permission(self): query = { "name": "Scene Name", "category": "map", - "tree": [{"geolayer": layer.id},], + "tree": [{"geolayer": layer.id}], } response = self.client.post(reverse("scene-list"), query) @@ -635,7 +631,7 @@ def test_geostore_no_permission(self): name="no schema point geom", geom_type=GeometryTypes.Point ) response = self.client.post( - reverse("feature-list", args=[point_layer.pk,]), + reverse("feature-list", args=[point_layer.pk]), data={"geom": "POINT(0 0)", "properties": {"toto": "ok"}}, ) self.assertEqual(response.status_code, HTTP_403_FORBIDDEN) diff --git a/terra_layer/urls/__init__.py b/terra_layer/urls/__init__.py index 4d33313..2e7edcf 100644 --- a/terra_layer/urls/__init__.py +++ b/terra_layer/urls/__init__.py @@ -1,10 +1,9 @@ from django.urls import include, path -from django.conf.urls import url from rest_framework import routers from .geostore import urlpatterns as geostore_patterns from .geosource import router as geosource_router -from ..views import LayerViewset, LayerView, SceneViewset, GeoSourceModelViewset +from ..views import LayerViewset, LayerView, SceneViewset router = routers.SimpleRouter() diff --git a/terra_layer/urls/geostore.py b/terra_layer/urls/geostore.py index 5f303ce..6a02275 100644 --- a/terra_layer/urls/geostore.py +++ b/terra_layer/urls/geostore.py @@ -1,4 +1,3 @@ -from django.http import HttpResponseNotFound from django.urls import path, include from rest_framework import routers diff --git a/terra_layer/views/__init__.py b/terra_layer/views/__init__.py index 0e1395e..08dcd7a 100644 --- a/terra_layer/views/__init__.py +++ b/terra_layer/views/__init__.py @@ -1,5 +1,5 @@ -from .layers import SceneViewset, LayerViewset, LayerView -from .extras import ( +from .layers import SceneViewset, LayerViewset, LayerView # NOQA +from .extras import ( # NOQA GeoSourceModelViewset, GeostoreLayerViewSet, GeostoreFeatureViewSet, diff --git a/terra_layer/views/layers.py b/terra_layer/views/layers.py index 10cb7a1..1307b24 100644 --- a/terra_layer/views/layers.py +++ b/terra_layer/views/layers.py @@ -11,7 +11,6 @@ from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.viewsets import ModelViewSet -from url_filter.integrations.drf import URLFilterBackend from rest_framework.serializers import ValidationError from ..models import Layer, LayerGroup, FilterField, Scene