Exclude soft deleted locations from mapbox API, refs #285

CAVaccineInventory · Apr 15, 2021 · 3101d5e · 3101d5e
1 parent c340bd2
commit 3101d5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/vaccinate/api/test_mapbox_export.py b/vaccinate/api/test_mapbox_export.py
@@ -5,6 +5,9 @@
 
 @pytest.mark.django_db
 def test_mapbox_export(client, ten_locations):
+    soft_deleted = ten_locations[3]
+    soft_deleted.soft_deleted = True
+    soft_deleted.save()
     response = client.get("/api/export-mapbox/Locations.geojson")
     joined = b"".join(response.streaming_content)
     assert json.loads(joined) == {
@@ -24,5 +27,6 @@ def test_mapbox_export(client, ten_locations):
                 "geometry": {"type": "Point", "coordinates": [40.0, 30.0]},
             }
             for location in ten_locations
+            if not location.soft_deleted
         ],
     }
diff --git a/vaccinate/api/views.py b/vaccinate/api/views.py
@@ -783,6 +783,8 @@ def export_mapbox_geojson(request):
     location_ids = request.GET.getlist("id")
     if location_ids:
         locations = locations.filter(public_id__in=location_ids)
+    else:
+        locations = locations.exclude(soft_deleted=True)
     limit = None
     if request.GET.get("limit", "").isdigit():
         limit = int(request.GET["limit"])