[req-change] Eliminated extra query

Author: pandafy

openwisp_controller/connection/tests/test_api.py

@@ -503,7 +503,7 @@ def test_put_devceconnection_detail(self):
             'enabled': False,
             'failure_reason': '',
         }
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             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(15):
+        with self.assertNumQueries(14):
             response = self.client.patch(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
@@ -528,7 +528,7 @@ def test_delete_deviceconnection_detail(self):
         dc = self._create_device_connection()
         d1 = dc.device.id
         path = reverse('connection_api:deviceconnection_detail', args=(d1, dc.pk))
-        with self.assertNumQueries(11):
+        with self.assertNumQueries(10):
             response = self.client.delete(path)
         self.assertEqual(response.status_code, 204)
 

openwisp_controller/geo/api/views.py

@@ -114,6 +114,7 @@ class DeviceLocationView(
     lookup_field = 'content_object'
     lookup_url_kwarg = 'pk'
     organization_field = 'content_object__organization'
+    _device_field = 'content_object'
 
     def get_queryset(self):
         qs = super().get_queryset()

openwisp_controller/geo/tests/test_api.py

@@ -863,7 +863,7 @@ def test_update_devicelocation_change_location_outdoor_to_indoor(self):
         }
         self.assertEqual(device_location.location.type, 'outdoor')
         self.assertEqual(device_location.floorplan, None)
-        with self.assertNumQueries(22):
+        with self.assertNumQueries(21):
             response = self.client.put(
                 path, encode_multipart(BOUNDARY, data), content_type=MULTIPART_CONTENT
             )
@@ -882,7 +882,7 @@ def test_update_devicelocation_patch_indoor(self):
             'indoor': '0,0',
         }
         self.assertEqual(device_location.indoor, '-140.38620,40.369227')
-        with self.assertNumQueries(11):
+        with self.assertNumQueries(10):
             response = self.client.patch(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         device_location.refresh_from_db()
@@ -899,7 +899,7 @@ def test_update_devicelocation_floorplan_related_id(self):
         data = {
             'floorplan': str(floor2.id),
         }
-        with self.assertNumQueries(13):
+        with self.assertNumQueries(12):
             response = self.client.patch(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         device_location.refresh_from_db()
@@ -913,7 +913,7 @@ def test_update_devicelocation_location_related_id(self):
         data = {
             'location': str(location2.id),
         }
-        with self.assertNumQueries(10):
+        with self.assertNumQueries(9):
             response = self.client.patch(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         device_location.refresh_from_db()

openwisp_controller/mixins.py

@@ -4,18 +4,24 @@
 
 
 class RelatedDeviceModelPermission(DjangoModelPermissions):
-    def _has_permissions(self, request, view, perm):
+    _device_field = 'device'
+
+    def _has_permissions(self, request, view, perm, obj=None):
         if request.method in self.READ_ONLY_METHOD:
             return perm
-        return perm and not view.get_parent_queryset()[0].is_deactivated()
+        if obj:
+            device = getattr(obj, self._device_field)
+        else:
+            device = view.get_parent_queryset()[0]
+        return perm and not device.is_deactivated()
 
     def has_permission(self, request, view):
         perm = super().has_permission(request, view)
         return self._has_permissions(request, view, perm)
 
     def has_object_permission(self, request, view, obj):
         perm = super().has_object_permission(request, view, obj)
-        return self._has_permissions(request, view, perm)
+        return self._has_permissions(request, view, perm, obj)
 
 
 class RelatedDeviceProtectedAPIMixin(