Return 404 when cam not found

Author: anze3db

api/urls.py

@@ -1,7 +1,7 @@
 import httpx
 from django.conf import settings
 from django.db.models import Prefetch
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, render
 from ninja import Field, NinjaAPI, Schema
 
 from cams.models import Cam, Category
@@ -64,7 +64,10 @@ async def health(request):
 
 @api.get("/cams/{cam_id}")
 async def cams_detail(request, cam_id: int):
-    cam = await Cam.objects.aget(id=cam_id)
+    try:
+        cam = await Cam.objects.aget(id=cam_id)
+    except Cam.DoesNotExist:
+        return api.create_response(request, {"message": "Cam not found"}, status=404)
     async with httpx.AsyncClient() as client:
         fetcher = SurflineFetcher(cam.spot_id, client)
         tides, sunlight, wind, waves = await fetcher.fetch_all()

surfcamsapi/urls.py

@@ -36,9 +36,12 @@ async def get_full_detail(request, cam_id: str):
         cam = await Cam.objects.aget(slug=cam_id)
     except Cam.DoesNotExist:
         if cam_id.isdigit():
-            cam = await Cam.objects.aget(id=cam_id)
+            try:
+                cam = await Cam.objects.aget(id=cam_id)
+            except Cam.DoesNotExist:
+                return HttpResponse("Cam not found", status=404)
         else:
-            raise
+            return HttpResponse("Cam not found", status=404)
     related_cams = await cam.related_cams()
 
     return render(

surfline/urls.py

@@ -9,7 +9,10 @@
 
 
 async def get_surfline_data(request, cam_id: int):
-    cam = await Cam.objects.aget(id=cam_id)
+    try:
+        cam = await Cam.objects.aget(id=cam_id)
+    except Cam.DoesNotExist:
+        return render(request, "surfline-error.html", {"message": "Cam not found"})
     async with httpx.AsyncClient() as client:
         fetcher = SurflineFetcher(cam.spot_id, client)
         try: