Exclude self-loops from map link JSON (#793)

nycmeshnet · Dec 24, 2024 · 7f6961a · 7f6961a
1 parent 615e619
commit 7f6961a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/meshapi/tests/test_map_endpoints.py b/src/meshapi/tests/test_map_endpoints.py
@@ -1122,12 +1122,6 @@ def test_link_data(self):
                     "to": 123,
                     "status": "planned",
                 },
-                {
-                    "from": 1934,
-                    "installDate": 1706245200000,
-                    "status": "60GHz",
-                    "to": 1934,
-                },
                 {
                     "from": 56789,
                     "to": 123,

diff --git a/src/meshapi/views/map.py b/src/meshapi/views/map.py
@@ -195,6 +195,7 @@ class MapDataLinkList(generics.ListAPIView):
         Link.objects.exclude(status__in=[Link.LinkStatus.INACTIVE])
         .exclude(to_device__node__status=Node.NodeStatus.INACTIVE)
         .exclude(from_device__node__status=Node.NodeStatus.INACTIVE)
+        .exclude(from_device__node__network_number=F("to_device__node__network_number"))
         .prefetch_related("to_device__node")
         .prefetch_related("from_device__node")
         .filter(