Add FRZ

backend/app/crud/crud_drone_request.py

@@ -5,6 +5,7 @@ from typing import List, Optional
 from sqlalchemy import desc, func
 from sqlalchemy.orm import Session
 
+from app.core.frz import point_inside_swansea_frz
 from app.crud.crud_journal import journal as crud_journal
 from app.models.drone_request import DroneRequest, DroneRequestStatus
 from app.models.journal import EntityType
@@ -52,10 +53,13 @@ class CRUDDroneRequest:
         reference_number = self._generate_reference(db)
         payload = obj_in.dict()
         notes = payload.pop("notes", None)
+        payload.pop("prototype_overlay", None)
+        payload.pop("location_inside_frz", None)
 
         db_obj = DroneRequest(
             **payload,
             applicant_notes=notes,
+            location_inside_frz=point_inside_swansea_frz(payload["location_latitude"], payload["location_longitude"]),
             reference_number=reference_number,
             public_token=secrets.token_urlsafe(64),
             status=DroneRequestStatus.NEW,
@@ -88,6 +92,13 @@ class CRUDDroneRequest:
         update_data = obj_in.dict(exclude_unset=True)
         if "notes" in update_data:
             update_data["applicant_notes"] = update_data.pop("notes")
+        update_data.pop("prototype_overlay", None)
+        update_data.pop("location_inside_frz", None)
+
+        if "location_latitude" in update_data or "location_longitude" in update_data:
+            lat = update_data.get("location_latitude", db_obj.location_latitude)
+            lng = update_data.get("location_longitude", db_obj.location_longitude)
+            update_data["location_inside_frz"] = point_inside_swansea_frz(lat, lng)
         changes = []
 
         for field, value in update_data.items():