Merge pull request #423 from LACMTA/dev

refactor: [data] hard coded metro_api schema

data-loading-service/app/config.py

@@ -47,7 +47,7 @@ def set_db_schema():
 
 class Config:
     BASE_URL = os.environ.get('BASE_URL')
-    TARGET_DB_SCHEMA = set_db_schema()
+    TARGET_DB_SCHEMA = 'metro_api'
     API_DB_URI = os.environ.get('API_DB_URI')
     SECRET_KEY = os.environ.get('HASH_KEY')
     ALGORITHM = os.environ.get('HASHING_ALGORITHM')

fastapi/app/main.py

@@ -274,10 +274,13 @@ async def validation_exception_handler(request, err):
 def to_geojson(data):
     features = []
     for item in data:
+        # Check if trip_id is None before trying to access it
+        if item.trip_id is None:
+            continue  # skip this item
         # Create a Point from the 'geometry' coordinates
-        geometry = Point(item['geometry']['coordinates'])
+        geometry = Point((item.geometry.longitude, item.geometry.latitude))
         # Exclude the 'geometry' key from the properties
-        properties = {key: item[key] for key in item if key != 'geometry'}
+        properties = {key: getattr(item, key) for key in dir(item) if not key.startswith('_') and key != 'geometry'}
         feature = Feature(geometry=geometry, properties=properties)
         features.append(feature)
     feature_collection = FeatureCollection(features)