[fix] Resolve conflicts and increased queries based on recent changes to geo_api:device_location

Author: dee077

openwisp_controller/geo/tests/test_api.py

@@ -724,7 +724,7 @@ def test_create_devicelocation_using_related_ids(self):
         floorplan = self._create_floorplan()
         location = floorplan.location
         url = reverse("geo_api:device_location", args=[device.id])
-        with self.assertNumQueries(26):
+        with self.assertNumQueries(29):
             response = self.client.put(
                 url,
                 data={
@@ -762,7 +762,7 @@ def test_create_devicelocation_location_floorplan(self):
             "floorplan.image": self._get_simpleuploadedfile(),
             "indoor": ["12.342,23.541"],
         }
-        with self.assertNumQueries(40):
+        with self.assertNumQueries(43):
             response = self.client.put(
                 url, encode_multipart(BOUNDARY, data), content_type=MULTIPART_CONTENT
             )
@@ -829,7 +829,7 @@ def test_create_devicelocation_only_location(self):
                 "type": "indoor",
             }
         }
-        with self.assertNumQueries(29):
+        with self.assertNumQueries(32):
             response = self.client.put(url, data=data, content_type='application/json')
         self.assertEqual(response.status_code, 201)
         self.assertEqual(self.location_model.objects.count(), 1)
@@ -869,7 +869,7 @@ def test_create_devicelocation_existing_location_new_floorplan(self):
             "floorplan.image": self._get_simpleuploadedfile(),
             "indoor": ["12.342,23.541"],
         }
-        with self.assertNumQueries(34):
+        with self.assertNumQueries(37):
             response = self.client.put(
                 url, encode_multipart(BOUNDARY, data), content_type=MULTIPART_CONTENT
             )
@@ -892,7 +892,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(31):
+        with self.assertNumQueries(33):
             response = self.client.put(
                 path, encode_multipart(BOUNDARY, data), content_type=MULTIPART_CONTENT
             )
@@ -911,7 +911,7 @@ def test_update_devicelocation_patch_indoor(self):
             "indoor": "0,0",
         }
         self.assertEqual(device_location.indoor, "-140.38620,40.369227")
-        with self.assertNumQueries(18):
+        with self.assertNumQueries(20):
             response = self.client.patch(path, data, content_type="application/json")
         self.assertEqual(response.status_code, 200)
         device_location.refresh_from_db()
@@ -928,7 +928,7 @@ def test_update_devicelocation_floorplan_related_id(self):
         data = {
             "floorplan": str(floor2.id),
         }
-        with self.assertNumQueries(20):
+        with self.assertNumQueries(22):
             response = self.client.patch(path, data, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         device_location.refresh_from_db()
@@ -942,7 +942,7 @@ def test_update_devicelocation_location_related_id(self):
         data = {
             "location": str(location2.id),
         }
-        with self.assertNumQueries(19):
+        with self.assertNumQueries(21):
             response = self.client.patch(path, data, content_type="application/json")
         self.assertEqual(response.status_code, 200)
         device_location.refresh_from_db()