Do not return nodes with private sensors only (#121)

Author: kilemensi

sensorsafrica/api/v2/views.py

@@ -143,10 +143,12 @@ def list(self, request):
         nodes = []
         # Loop through the last active nodes
         for last_active in LastActiveNodes.objects.iterator():
-            # Get the current node
+            # Get the current node only if it has public sensors
             node = Node.objects.filter(
-                Q(id=last_active.node.id), ~Q(sensors=None)
-            ).get()
+                Q(id=last_active.node.id), Q(sensors__public=True)
+            ).first()
+            if node is None:
+                continue
 
             # The last acive date
             last_data_received_at = last_active.last_data_received_at
@@ -161,7 +163,7 @@ def list(self, request):
                     SensorDataValue.objects.filter(
                         Q(sensordata__sensor__node=last_active.node.id),
                         # Open endpoints should return data from public sensors
-                        # only.
+                        # only in case a node has both public & private sensors
                         Q(sensordata__sensor__public=True),
                         Q(sensordata__location=last_active.location.id),
                         Q(sensordata__timestamp__gte=last_5_mins),
@@ -214,6 +216,7 @@ def list(self, request):
                     "stats": stats,
                 }
             )
+
         return Response(nodes)
 
     def create(self, request):