Merge branch 'main' into feat/8-unit-tests

README.md

@@ -68,6 +68,18 @@ uvicorn src.main:app --reload
 
 ## Testing
 
+To test using `curl` commands, you can try creating a Service Area, and check if a latitude/longitude pair is contained in the registered Service Areas:
+
+```bash
+curl -X 'POST'   'http://127.0.0.1:8000/api/v1/serviceareas/'   -H 'Content-Type: application/json'   -d '{
+  "name": "Downtown Area 2",
+  "price": 25.50,
+  "geojson": "{\"type\": \"Polygon\", \"coordinates\": [[[30.0, 10.0], [40.0, 40.0], [20.0, 40.0], [10.0, 20.0], [30.0, 10.0]]]}"
+}'
+
+curl -X GET "http://localhost:8000/api/v1/serviceareas/check?lat=30&lng=20"
+```
+
 To run the unit tests:
 ```bash
 pytest

src/models.py

@@ -1,6 +1,6 @@
 from sqlalchemy import Column, Integer, String, Float, CheckConstraint
 from .database import Base
-from geoalchemy2 import Geometry
+from geoalchemy2 import Geometry, shape
 from sqlalchemy.orm import validates
 from shapely.geometry import shape
 
@@ -81,8 +81,8 @@ def validate_price(self, key, price):
     def validate_geojson(self, key, geojson):
         try:
             # Parse and validate the GeoJSON structure
-            geojson_dict = json.loads(geojson)
-            geometry = shape(geojson_dict["geometry"])
+            from geoalchemy2.shape import to_shape
+            geometry = to_shape(geojson)
 
             if geometry.geom_type != "Polygon":
                 raise ValueError("GeoJSON must represent a POLYGON")

src/routes.py

@@ -122,7 +122,7 @@ def delete_service_area(service_area_id: int, db: Session = Depends(get_db)):
     return service_area_to_dict(db_service_area)
 
 
-@router.get("/serviceareas/check/", response_model=List[ServiceAreaSchema])
+@router.get("/serviceareas/check", response_model=List[ServiceAreaSchema])
 def check_point_in_service_area(lat: float, lng: float, db: Session = Depends(get_db)):
     # Create a point geometry using the latitude and longitude
     point = f"SRID=4326;POINT({lng} {lat})"