fix rest api duplication

cartologic · May 13, 2019 · 0a86c3d · 0a86c3d
1 parent 83d51c9
commit 0a86c3d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/cartoview/api/views/app_manager.py b/cartoview/api/views/app_manager.py
@@ -21,19 +21,19 @@
 
 
 class AppStoreViewSet(viewsets.ModelViewSet):
-    queryset = AppStore.objects.all()
+    queryset = AppStore.objects.all().distinct()
     serializer_class = AppStoreSerializer
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
 
 class AppTypeViewSet(viewsets.ModelViewSet):
-    queryset = AppType.objects.all()
+    queryset = AppType.objects.all().distinct()
     serializer_class = AppTypeSerializer
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
 
 class AppInstanceViewSet(viewsets.ModelViewSet):
-    queryset = AppInstance.objects.all().prefetch_related("app_map")
+    queryset = AppInstance.objects.all().prefetch_related("app_map").distinct()
     serializer_class = AppInstanceSerializer
     filterset_class = AppInstanceFilter
     permission_classes = (IsOwnerOrReadOnly,)
@@ -43,7 +43,7 @@ def perform_create(self, serializer):
 
 
 class BookmarkViewSet(viewsets.ModelViewSet):
-    queryset = Bookmark.objects.all()
+    queryset = Bookmark.objects.all().distinct()
     serializer_class = BookmarkSerializer
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
@@ -52,7 +52,7 @@ def perform_create(self, serializer):
 
 
 class AppViewSet(viewsets.ModelViewSet):
-    queryset = App.objects.all()
+    queryset = App.objects.all().distinct()
     serializer_class = AppSerializer
     permission_classes = (AppPermission,)
     filterset_class = AppFilter

diff --git a/cartoview/api/views/connections.py b/cartoview/api/views/connections.py
@@ -46,17 +46,17 @@ def perform_create(self, serializer):
 
 
 class SimpleAuthConnectionViewSet(AuthConnectionViewSet):
-    queryset = SimpleAuthConnection.objects.all()
+    queryset = SimpleAuthConnection.objects.all().distinct()
     serializer_class = SimpleAuthConnectionSerializer
 
 
 class TokenAuthConnectionViewSet(AuthConnectionViewSet):
-    queryset = TokenAuthConnection.objects.all()
+    queryset = TokenAuthConnection.objects.all().distinct()
     serializer_class = TokenAuthConnectionSerializer
 
 
 class ServerViewSet(viewsets.ModelViewSet):
-    queryset = Server.objects.all()
+    queryset = Server.objects.all().distinct()
     serializer_class = ServerSerializer
     permission_classes = (
         permissions.IsAuthenticatedOrReadOnly, IsOwnerOrReadOnly)

diff --git a/cartoview/api/views/layers.py b/cartoview/api/views/layers.py
@@ -24,7 +24,7 @@ def build_describe_feature_type(layer):
 
 
 class LayerViewSet(viewsets.ModelViewSet):
-    queryset = Layer.objects.all()
+    queryset = Layer.objects.all().distinct()
     serializer_class = LayerSerializer
     filterset_class = LayerFilter
     permission_classes = (permissions.DjangoModelPermissionsOrAnonReadOnly,)

diff --git a/cartoview/api/views/maps.py b/cartoview/api/views/maps.py
@@ -13,7 +13,7 @@
 
 
 class MapViewSet(viewsets.ModelViewSet):
-    queryset = Map.objects.all().prefetch_related('layers')
+    queryset = Map.objects.all().prefetch_related('layers').distinct()
     serializer_class = MapSerializer
     permission_classes = [
         permissions.IsAuthenticatedOrReadOnly, IsOwnerOrReadOnly]