[fix] Fix url and update fields

Author: dee077

openwisp_controller/geo/api/serializers.py

@@ -351,11 +351,12 @@ def update(self, instance, validated_data):
 
 
 class IndoorCoordinatesSerializer(serializers.ModelSerializer):
-    name = serializers.CharField(source="content_object.name")
+    content_object_id = serializers.UUIDField(
+        source="content_object.id", read_only=True
+    )
+    floorplan_id = serializers.UUIDField(source="floorplan.id", read_only=True)
+    device_name = serializers.CharField(source="content_object.name")
     mac_address = serializers.CharField(source="content_object.mac_address")
-    is_deactivated = serializers.BooleanField(source="content_object.is_deactivated")
-    model = serializers.CharField(source="content_object.model")
-    os = serializers.CharField(source="content_object.os")
     floor_name = serializers.SerializerMethodField()
     floor = serializers.IntegerField(source="floorplan.floor")
     image = serializers.ImageField(source="floorplan.image", read_only=True)
@@ -364,11 +365,11 @@ class IndoorCoordinatesSerializer(serializers.ModelSerializer):
     class Meta:
         model = DeviceLocation
         fields = [
-            "name",
+            "id",
+            "content_object_id",
+            "floorplan_id",
+            "device_name",
             "mac_address",
-            "is_deactivated",
-            "model",
-            "os",
             "floor_name",
             "floor",
             "image",

openwisp_controller/geo/tests/test_api.py

@@ -1034,7 +1034,7 @@ def test_deactivated_device(self):
             response = self.client.delete(url)
             self.assertEqual(response.status_code, 403)
 
-    def test_floorplan_coordinates(self):
+    def test_indoor_coordinates_list_api(self):
         org = self._get_org()
         location = self._create_location(type="indoor", organization=org)
         f1 = self._create_floorplan(floor=1, location=location)
@@ -1060,11 +1060,11 @@ def test_floorplan_coordinates(self):
         path = reverse("geo_api:indoor_coordinates_list", args=[location.id])
         response = self.client.get(path)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.data), 2)
-        self.assertEqual(response.data[0]["name"], "device1")
+        self.assertEqual(len(response.data["results"]), 2)
+        self.assertEqual(response.data["results"][0]["device_name"], "device1")
 
         with self.subTest("Test filter by floor"):
             response = self.client.get(f"{path}?floor=2")
             self.assertEqual(response.status_code, 200)
-            self.assertEqual(len(response.data), 1)
-            self.assertEqual(response.data[0]["name"], "device2")
+            self.assertEqual(len(response.data["results"]), 1)
+            self.assertEqual(response.data["results"][0]["device_name"], "device2")

openwisp_controller/geo/utils.py

@@ -42,7 +42,7 @@ def get_geo_urls(geo_views):
             name="detail_location",
         ),
         path(
-            "api/v1/controller/location/<str:pk>/indoor_coordinates/",
+            "api/v1/controller/location/<str:pk>/indoor-coordinates/",
             geo_views.indoor_coordinates_list,
             name="indoor_coordinates_list",
         ),