Merge pull request #308 from OpenGeoscience/remove-redundant-lookup-field

Remove explicit `lookup_field` from all `ViewSet`

Author: brianhelba

pyproject.toml

@@ -178,7 +178,6 @@ ignore = [
   "PLW2901", # redefined-loop-name
   "SLF001", # private-member-access
   "TRY301", # raise-within-try
-  "A002", # builtin-argument-shadowing
 ]
 
 [tool.ruff.lint.per-file-ignores]

uvdat/core/rest/analytics.py

@@ -19,7 +19,6 @@ class AnalyticsViewSet(ReadOnlyModelViewSet):
     serializer_class = uvdat_serializers.TaskResultSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     @action(
         detail=False,

uvdat/core/rest/basemap.py

@@ -12,4 +12,3 @@ class BasemapViewSet(ModelViewSet):
     serializer_class = BasemapSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"

uvdat/core/rest/chart.py

@@ -15,7 +15,6 @@ class ChartViewSet(ModelViewSet):
     serializer_class = ChartSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     def get_queryset(self):
         qs = super().get_queryset()

uvdat/core/rest/colormap.py

@@ -12,4 +12,3 @@ class ColormapViewSet(ModelViewSet):
     serializer_class = ColormapSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"

uvdat/core/rest/data.py

@@ -86,7 +86,6 @@ def get_filter_string(filters: dict | None = None):
 class GenericDataViewSet(GenericViewSet, mixins.RetrieveModelMixin):
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     @property
     def authentication_classes(self):
@@ -143,7 +142,7 @@ def summary(self, request, **kwargs):
         url_path=r"tiles/(?P<z>\d+)/(?P<x>\d+)/(?P<y>\d+)",
         url_name="tiles",
     )
-    def get_vector_tile(self, request, id: str, x: str, y: str, z: str):
+    def get_vector_tile(self, request, pk: str, x: str, y: str, z: str):
         filters = request.query_params.copy()
         filters.pop("token", None)
         filters_string = get_filter_string(filters)
@@ -155,7 +154,7 @@ def get_vector_tile(self, request, id: str, x: str, y: str, z: str):
                     "x": x,
                     "y": y,
                     "srid": 3857,
-                    "vector_data_id": id,
+                    "vector_data_id": pk,
                 },
             )
             row = cursor.fetchone()

uvdat/core/rest/dataset.py

@@ -22,7 +22,6 @@ class DatasetViewSet(ModelViewSet):
     serializer_class = DatasetSerializer
     permission_classes = [DatasetGuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     def get_queryset(self):
         qs = super().get_queryset()

uvdat/core/rest/file_item.py

@@ -19,7 +19,6 @@ class FileItemViewSet(ModelViewSet):
     serializer_class = FileItemSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     def get_queryset(self):
         qs = super().get_queryset()

uvdat/core/rest/layer.py

@@ -20,7 +20,6 @@ class LayerViewSet(ReadOnlyModelViewSet):
     serializer_class = LayerSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     @action(detail=True, methods=["get"])
     def frames(self, request, **kwargs):
@@ -35,15 +34,13 @@ class LayerFrameViewSet(ReadOnlyModelViewSet):
     serializer_class = LayerFrameSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
 
 class LayerStyleViewSet(ModelViewSet):
     queryset = LayerStyle.objects.all()
     serializer_class = LayerStyleSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     def get_queryset(self):
         qs = super().get_queryset()

uvdat/core/rest/networks.py

@@ -28,7 +28,6 @@ class NetworkViewSet(ModelViewSet):
     serializer_class = NetworkSerializer
     permission_classes = [GuardianPermission]
     filter_backends = [GuardianFilter]
-    lookup_field = "id"
 
     @action(detail=True, methods=["get"])
     def nodes(self, request, **kwargs):