[fix] Failing tests fix

Author: dee077

openwisp_controller/config/api/serializers.py

@@ -382,29 +382,29 @@ def update(self, instance, validated_data):
 class ReversionSerializer(BaseSerializer):
     user_id = serializers.SerializerMethodField()
     date_created = serializers.DateTimeField(
-        source="revision.date_created", read_only=True
+        source='revision.date_created', read_only=True
     )
-    comment = serializers.CharField(source="revision.comment", read_only=True)
+    comment = serializers.CharField(source='revision.comment', read_only=True)
     content_type = serializers.SerializerMethodField()
 
     class Meta:
         model = Version
         fields = [
-            "id",
-            "revision_id",
-            "object_id",
-            "content_type",
-            "db",
-            "format",
-            "serialized_data",
-            "object_repr",
-            "user_id",
-            "date_created",
-            "comment",
+            'id',
+            'revision_id',
+            'object_id',
+            'content_type',
+            'db',
+            'format',
+            'serialized_data',
+            'object_repr',
+            'user_id',
+            'date_created',
+            'comment',
         ]
 
     def get_user_id(self, obj):
-        return getattr(obj.revision, "user_id", None)
+        return getattr(obj.revision, 'user_id', None)
 
     def get_content_type(self, obj):
-        return getattr(obj.content_type, "model", None)
+        return getattr(obj.content_type, 'model', None)

openwisp_controller/config/api/urls.py

@@ -14,17 +14,17 @@ def get_api_urls(api_views):
     if getattr(settings, 'OPENWISP_CONTROLLER_API', True):
         return [
             path(
-                'controller/<str:model_slug>/revision/',
+                'controller/<str:model>/revision/',
                 api_views.revision_list,
                 name='revision_list',
             ),
             path(
-                'controller/<str:model_slug>/revision/<str:pk>/',
+                'controller/<str:model>/revision/<str:pk>/',
                 api_views.revision_detail,
                 name='revision_detail',
             ),
             path(
-                'controller/<str:model_slug>/revision/<str:pk>/restore/',
+                'controller/<str:model>/revision/<str:pk>/restore/',
                 api_views.revision_restore,
                 name='revision_restore',
             ),

openwisp_controller/config/api/views.py

@@ -306,7 +306,7 @@ class RevisionListView(ProtectedAPIMixin, AutoRevisionMixin, ListAPIView):
     serializer_class = ReversionSerializer
 
     def get_queryset(self):
-        model_slug = self.kwargs.get('model_slug').lower()
+        model_slug = self.kwargs.get('model').lower()
         return (
             Version.objects.select_related('revision')
             .filter(content_type__model=model_slug)
@@ -318,7 +318,7 @@ class RevisionDetailView(ProtectedAPIMixin, RetrieveAPIView):
     serializer_class = ReversionSerializer
 
     def get_queryset(self):
-        model_slug = self.kwargs.get('model_slug').lower()
+        model_slug = self.kwargs.get('model').lower()
         return (
             Version.objects.select_related('revision')
             .filter(content_type__model=model_slug)
@@ -330,7 +330,7 @@ class RevisionRestoreView(ProtectedAPIMixin, GenericAPIView):
     serializer_class = serializers.Serializer
 
     def get_queryset(self):
-        model_slug = self.kwargs.get('model_slug').lower()
+        model_slug = self.kwargs.get('model').lower()
         return (
             Version.objects.select_related('revision')
             .filter(content_type__model=model_slug)

openwisp_controller/config/tests/test_api.py

@@ -1580,25 +1580,25 @@ def test_revision_list_and_restore_api(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['name'], 'change-test-device')
 
-        path = reverse("config_api:revision_list", args=[model_slug])
+        path = reverse('config_api:revision_list', args=[model_slug])
         response = self.client.get(path)
         response_json = response.json()
         version_id = response_json[1]["id"]
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response_json), 2)
 
-        with self.subTest("Test revision detail"):
-            path = reverse("config_api:revision_detail", args=[model_slug, version_id])
+        with self.subTest('Test revision detail'):
+            path = reverse('config_api:revision_detail', args=[model_slug, version_id])
             response = self.client.get(path)
             self.assertEqual(response.status_code, 200)
-            self.assertEqual(response.json()["id"], version_id)
-            self.assertEqual(response.json()["object_id"], str(device.pk))
+            self.assertEqual(response.json()['id'], version_id)
+            self.assertEqual(response.json()['object_id'], str(device.pk))
 
-        with self.subTest("Test revision restore view"):
-            revision_id = response_json[1]["revision_id"]
+        with self.subTest('Test revision restore view'):
+            revision_id = response_json[1]['revision_id']
             path = reverse(
-                "config_api:revision_restore", args=[model_slug, revision_id]
+                'config_api:revision_restore', args=[model_slug, revision_id]
             )
             response = self.client.post(path)
             self.assertEqual(response.status_code, 200)
-            self.assertEqual(Device.objects.get(name="test").pk, device.pk)
+            self.assertEqual(Device.objects.get(name='test').pk, device.pk)

openwisp_controller/connection/api/views.py

@@ -14,6 +14,7 @@
 from openwisp_users.api.mixins import ProtectedAPIMixin as BaseProtectedAPIMixin
 
 from ...mixins import (
+    AutoRevisionMixin,
     ProtectedAPIMixin,
     RelatedDeviceModelPermission,
     RelatedDeviceProtectedAPIMixin,
@@ -61,7 +62,7 @@ def get_serializer_context(self):
         return context
 
 
-class CommandListCreateView(BaseCommandView, ListCreateAPIView):
+class CommandListCreateView(BaseCommandView, AutoRevisionMixin, ListCreateAPIView):
     pagination_class = ListViewPagination
 
     def create(self, request, *args, **kwargs):
@@ -81,13 +82,15 @@ def get_object(self):
         return obj
 
 
-class CredentialListCreateView(ProtectedAPIMixin, ListCreateAPIView):
+class CredentialListCreateView(ProtectedAPIMixin, AutoRevisionMixin, ListCreateAPIView):
     queryset = Credentials.objects.order_by('-created')
     serializer_class = CredentialSerializer
     pagination_class = ListViewPagination
 
 
-class CredentialDetailView(ProtectedAPIMixin, RetrieveUpdateDestroyAPIView):
+class CredentialDetailView(
+    ProtectedAPIMixin, AutoRevisionMixin, RetrieveUpdateDestroyAPIView
+):
     queryset = Credentials.objects.all()
     serializer_class = CredentialSerializer
 
@@ -119,7 +122,9 @@ def get_parent_queryset(self):
         return Device.objects.filter(pk=self.kwargs['device_pk'])
 
 
-class DeviceConnenctionListCreateView(BaseDeviceConnection, ListCreateAPIView):
+class DeviceConnenctionListCreateView(
+    BaseDeviceConnection, AutoRevisionMixin, ListCreateAPIView
+):
     pagination_class = ListViewPagination
 
     def get_queryset(self):
@@ -131,7 +136,9 @@ def get_queryset(self):
         )
 
 
-class DeviceConnectionDetailView(BaseDeviceConnection, RetrieveUpdateDestroyAPIView):
+class DeviceConnectionDetailView(
+    BaseDeviceConnection, AutoRevisionMixin, RetrieveUpdateDestroyAPIView
+):
     def get_object(self):
         queryset = self.filter_queryset(self.get_queryset())
         filter_kwargs = {

openwisp_controller/connection/tests/test_api.py

@@ -458,7 +458,7 @@ def test_post_deviceconnection_list(self):
             'enabled': True,
             'failure_reason': '',
         }
-        with self.assertNumQueries(13):
+        with self.assertNumQueries(23):
             response = self.client.post(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 201)
 
@@ -503,7 +503,7 @@ def test_put_devceconnection_detail(self):
             'enabled': False,
             'failure_reason': '',
         }
-        with self.assertNumQueries(14):
+        with self.assertNumQueries(23):
             response = self.client.put(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
@@ -517,7 +517,7 @@ def test_patch_deviceconnectoin_detail(self):
         path = reverse('connection_api:deviceconnection_detail', args=(d1, dc.pk))
         self.assertEqual(dc.update_strategy, app_settings.UPDATE_STRATEGIES[0][0])
         data = {'update_strategy': app_settings.UPDATE_STRATEGIES[1][0]}
-        with self.assertNumQueries(13):
+        with self.assertNumQueries(22):
             response = self.client.patch(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(

openwisp_controller/geo/api/views.py

@@ -14,7 +14,11 @@
 from openwisp_users.api.filters import OrganizationManagedFilter
 from openwisp_users.api.mixins import FilterByOrganizationManaged, FilterByParentManaged
 
-from ...mixins import ProtectedAPIMixin, RelatedDeviceProtectedAPIMixin
+from ...mixins import (
+    AutoRevisionMixin,
+    ProtectedAPIMixin,
+    RelatedDeviceProtectedAPIMixin,
+)
 from .filters import DeviceListFilter
 from .serializers import (
     DeviceCoordinatesSerializer,
@@ -57,7 +61,9 @@ class ListViewPagination(pagination.PageNumberPagination):
     max_page_size = 100
 
 
-class DeviceCoordinatesView(ProtectedAPIMixin, generics.RetrieveUpdateAPIView):
+class DeviceCoordinatesView(
+    ProtectedAPIMixin, AutoRevisionMixin, generics.RetrieveUpdateAPIView
+):
     serializer_class = DeviceCoordinatesSerializer
     permission_classes = (DevicePermission,)
     queryset = Device.objects.select_related(
@@ -105,6 +111,7 @@ def create_location(self, device):
 
 class DeviceLocationView(
     RelatedDeviceProtectedAPIMixin,
+    AutoRevisionMixin,
     generics.RetrieveUpdateDestroyAPIView,
 ):
     serializer_class = DeviceLocationSerializer
@@ -204,7 +211,9 @@ def get_queryset(self):
         return qs
 
 
-class FloorPlanListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
+class FloorPlanListCreateView(
+    ProtectedAPIMixin, AutoRevisionMixin, generics.ListCreateAPIView
+):
     serializer_class = FloorPlanSerializer
     queryset = FloorPlan.objects.select_related().order_by('-created')
     pagination_class = ListViewPagination
@@ -214,13 +223,16 @@ class FloorPlanListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
 
 class FloorPlanDetailView(
     ProtectedAPIMixin,
+    AutoRevisionMixin,
     generics.RetrieveUpdateDestroyAPIView,
 ):
     serializer_class = FloorPlanSerializer
     queryset = FloorPlan.objects.select_related()
 
 
-class LocationListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
+class LocationListCreateView(
+    ProtectedAPIMixin, AutoRevisionMixin, generics.ListCreateAPIView
+):
     serializer_class = LocationSerializer
     queryset = Location.objects.order_by('-created')
     pagination_class = ListViewPagination
@@ -230,6 +242,7 @@ class LocationListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
 
 class LocationDetailView(
     ProtectedAPIMixin,
+    AutoRevisionMixin,
     generics.RetrieveUpdateDestroyAPIView,
 ):
     serializer_class = LocationSerializer