revised logic

Author: qcdyx

api/src/shared/db_models/gtfs_rt_feed_impl.py

@@ -27,20 +27,27 @@ def from_orm(cls, feed: Gtfsrealtimefeed | None, db_session: Session) -> GtfsRTF
         gtfs_rt_feed.locations = [LocationImpl.from_orm(item) for item in feed.locations] if feed.locations else []
         gtfs_rt_feed.entity_types = [item.name for item in feed.entitytypes] if feed.entitytypes else []
 
-        # gtfs_rt_feed.feed_references = [item.stable_id for item in feed.gtfs_feeds] if feed.gtfs_feeds else []
-        gtfs_rt_location_ids = {location.id for location in feed.locations}
+        # Base query: same provider_id, but not the same feed
         query = (
             db_session.query(GtfsFeedOrm)
-            .filter(GtfsFeedOrm.provider == feed.provider, GtfsFeedOrm.stable_id != feed.stable_id)
+            .filter(
+                GtfsFeedOrm.provider_id == feed.provider_id,
+                GtfsFeedOrm.stable_id != feed.stable_id,
+            )
             .options(joinedload(GtfsFeedOrm.locations))
         )
 
+        # If the GtfsRT feed has locations, require overlap
+        rt_location_ids = {loc.id for loc in feed.locations} if feed.locations else set()
         feed_references = []
         for gtfs_feed in query.all():
-            gtfs_location_ids = {location.id for location in gtfs_feed.locations}
-            # Check if there is any overlap in locations.
-            if not gtfs_location_ids.isdisjoint(gtfs_rt_location_ids):
-                feed_references.append(gtfs_feed.stable_id)
+            if rt_location_ids:
+                gtfs_location_ids = {loc.id for loc in gtfs_feed.locations}
+                if gtfs_location_ids.isdisjoint(rt_location_ids):
+                    continue
+
+            feed_references.append(gtfs_feed.stable_id)
+
         gtfs_rt_feed.feed_references = feed_references
 
         return gtfs_rt_feed