Merge pull request #19 from ryan-roche/dev

Fix getAllBuildings endpoint, moved to /buildings

Author: ryan-roche

app/main.py

@@ -94,7 +94,7 @@ class RouteResponseModel(BaseModel):
 app = FastAPI(
     title="GopherMaps API",
     summary="REST API for the GopherMaps Project",
-    version="1.2",
+    version="1.2.1",
     contact={
         "name": "Ryan Roche",
         "url": "https://socialcoding.net"
@@ -266,19 +266,16 @@ async def get_areas() -> list[AreaModel]:
     return areas
 
 
-@app.get("/buildings/{area}", tags=["Buildings"], operation_id="getBuildingsForArea")
-async def get_buildings_by_area(
-        area: AreaName = Path(..., description="The label name of the requested area")
-) -> List[BuildingEntryModel]:
+@app.get("/buildings", tags=["Buildings"], operation_id="getAllBuildings")
+async def get_all_buildings() -> list[BuildingEntryModel]:
     """
-    Get all the buildings in a given area
+    Retrieves information for ALL Buildings
     """
     with driver.session() as session:
         query = """
-        MATCH (n:BuildingKey {area: $areaName}) RETURN n
+        MATCH (n:BuildingKey) RETURN n
         """
-        parameters = {"areaName": area}
-        result = session.run(query, parameters)
+        result = session.run(query)
 
         results: List[Dict[str, Any]] = result.data()
 
@@ -287,18 +284,21 @@ async def get_buildings_by_area(
             BuildingEntryModel(**record['n']) for record in results
         ]
 
-        return building_entries
+    return building_entries
 
-@app.get("/buildings/all", tags=["Buildings"], operation_id="getAllBuildings")
-async def get_all_buildings() -> list[BuildingEntryModel]:
+@app.get("/buildings/{area}", tags=["Buildings"], operation_id="getBuildingsForArea")
+async def get_buildings_by_area(
+        area: AreaName = Path(..., description="The label name of the requested area")
+) -> List[BuildingEntryModel]:
     """
-    Retrieves information for ALL Buildings
+    Get all the buildings in a given area
     """
     with driver.session() as session:
         query = """
-        MATCH (n:BuildingKey) RETURN n
+        MATCH (n:BuildingKey {area: $areaName}) RETURN n
         """
-        result = session.run(query)
+        parameters = {"areaName": area}
+        result = session.run(query, parameters)
 
         results: List[Dict[str, Any]] = result.data()
 
@@ -307,7 +307,7 @@ async def get_all_buildings() -> list[BuildingEntryModel]:
             BuildingEntryModel(**record['n']) for record in results
         ]
 
-    return building_entries
+        return building_entries
 
 @app.get("/destinations/{building}", tags=["Routing"], operation_id="getDestinationsForBuilding")
 async def get_destinations_for_building(