Fix GTFS-RT update endpoint when static reference is changed

Author: davidgamez

functions-python/helpers/database.py

@@ -19,14 +19,40 @@
 from typing import Final
 
 from sqlalchemy import create_engine, text, event
-from sqlalchemy.orm import sessionmaker, mapper
+from sqlalchemy.orm import sessionmaker, mapper, class_mapper
 import logging
 
+from database_gen.sqlacodegen_models import Feed, Gtfsfeed, Gtfsrealtimefeed, Gbfsfeed
+
 DB_REUSE_SESSION: Final[str] = "DB_REUSE_SESSION"
 lock = threading.Lock()
 global_session = None
 
 
+def configure_polymorphic_mappers():
+    """
+    Configure the polymorphic mappers allowing polymorphic values on relationships.
+    """
+    feed_mapper = class_mapper(Feed)
+    # Configure the polymorphic mapper using date_type as discriminator for the Feed class
+    feed_mapper.polymorphic_on = Feed.data_type
+    feed_mapper.polymorphic_identity = Feed.__tablename__.lower()
+
+    gtfsfeed_mapper = class_mapper(Gtfsfeed)
+    gtfsfeed_mapper.inherits = feed_mapper
+    gtfsfeed_mapper.polymorphic_identity = Gtfsfeed.__tablename__.lower()
+
+    gtfsrealtimefeed_mapper = class_mapper(Gtfsrealtimefeed)
+    gtfsrealtimefeed_mapper.inherits = feed_mapper
+    gtfsrealtimefeed_mapper.polymorphic_identity = (
+        Gtfsrealtimefeed.__tablename__.lower()
+    )
+
+    gbfsfeed_mapper = class_mapper(Gbfsfeed)
+    gbfsfeed_mapper.inherits = feed_mapper
+    gbfsfeed_mapper.polymorphic_identity = Gbfsfeed.__tablename__.lower()
+
+
 def set_cascade(mapper, class_):
     """
     Set cascade for relationships in Gtfsfeed.
@@ -43,7 +69,16 @@ def set_cascade(mapper, class_):
                 rel.cascade = "all, delete-orphan"
 
 
-event.listen(mapper, "mapper_configured", set_cascade)
+def mapper_configure_listener(mapper, class_):
+    """
+    Mapper configure listener
+    """
+    set_cascade(mapper, class_)
+    configure_polymorphic_mappers()
+
+
+# Add the mapper_configure_listener to the mapper_configured event
+event.listen(mapper, "mapper_configured", mapper_configure_listener)
 
 
 def get_db_engine(database_url: str = None, echo: bool = True):

functions-python/operations_api/src/feeds_operations/impl/models/entity_type_impl.py

@@ -26,8 +26,17 @@ def from_orm(cls, obj: EntityTypeOrm | None) -> EntityType | None:
         return EntityType(obj.name.lower())
 
     @classmethod
-    def to_orm(cls, entity_type: EntityType) -> EntityTypeOrm:
+    def to_orm(cls, entity_type: EntityType, session) -> EntityTypeOrm:
         """
         Convert a Pydantic model to a SQLAlchemy row object.
         """
-        return EntityTypeOrm(name=entity_type.name.upper())
+        result = (
+            session.query(EntityTypeOrm)
+            .filter(EntityTypeOrm.name == entity_type.name)
+            .first()
+        )
+        return (
+            result
+            if result is not None
+            else EntityTypeOrm(name=entity_type.name.upper())
+        )

functions-python/operations_api/src/feeds_operations/impl/models/update_request_gtfs_rt_feed_impl.py

@@ -148,7 +148,10 @@ def to_orm(
         entity.entitytypes = (
             []
             if update_request.entity_types is None
-            else [EntityTypeImpl.to_orm(item) for item in update_request.entity_types]
+            else [
+                EntityTypeImpl.to_orm(item, session)
+                for item in update_request.entity_types
+            ]
         )
         entity.gtfs_feeds = (
             []

functions-python/operations_api/tests/__init__.py

@@ -1,7 +0,0 @@
-import sys
-
-sys.path.append("..")
-
-import os
-
-print(os.getcwd())

functions-python/operations_api/tests/conftest.py

@@ -47,7 +47,24 @@
     status="active",
     feed_contact_email="feed_contact_email",
     provider="provider",
-    # gtfs_rt_feeds=[feed_mdb_41],
+    gtfs_rt_feeds=[feed_mdb_41],
+)
+
+feed_mdb_400 = Gtfsfeed(
+    id="mdb-400",
+    data_type="gtfs",
+    feed_name="London Transit Commission",
+    note="note",
+    producer_url="producer_url",
+    authentication_type="1",
+    authentication_info_url="authentication_info_url",
+    api_key_parameter_name="api_key_parameter_name",
+    license_url="license_url",
+    stable_id="mdb-400",
+    status="active",
+    feed_contact_email="feed_contact_email",
+    provider="provider",
+    gtfs_rt_feeds=[],
 )
 
 
@@ -62,6 +79,7 @@ def populate_database():
     session.add(feed_mdb_41)
     # session.flush()
     session.add(feed_mdb_40)
+    session.add(feed_mdb_400)
     session.commit()
 
 

functions-python/operations_api/tests/feeds_operations/impl/models/test_entity_type_impl.py

@@ -1,3 +1,5 @@
+from unittest.mock import Mock
+
 from database_gen.sqlacodegen_models import Entitytype
 from feeds_operations.impl.models.entity_type_impl import EntityTypeImpl
 from feeds_operations_gen.models.entity_type import EntityType
@@ -16,5 +18,10 @@ def test_from_orm_none():
 
 def test_to_orm():
     entity_type = EntityType("vp")
-    result = EntityTypeImpl.to_orm(entity_type)
-    assert result.name == "VP"
+    session = Mock()
+    mock_query = Mock()
+    resulting_entity = Mock()
+    mock_query.filter.return_value.first.return_value = resulting_entity
+    session.query.return_value = mock_query
+    result = EntityTypeImpl.to_orm(entity_type, session)
+    assert result == resulting_entity

functions-python/operations_api/tests/feeds_operations/impl/models/test_update_request_gtfs_rt_feed_impl.py

@@ -4,6 +4,7 @@
     Redirectingid,
     Externalid,
     Gtfsrealtimefeed,
+    Entitytype,
 )
 from feeds_operations.impl.models.update_request_gtfs_rt_feed_impl import (
     UpdateRequestGtfsRtFeedImpl,
@@ -85,10 +86,16 @@ def test_to_orm():
     )
     entity = Gtfsrealtimefeed(id="1", stable_id="stable_id", data_type="gtfs")
     target_feed = Gtfsfeed(id=2, stable_id="target_stable_id")
+    resulting_entity = Entitytype(name="VP")
+
     session = MagicMock()
-    session.query.return_value.filter.return_value.first.return_value = target_feed
+    session.query.return_value.filter.return_value.first.side_effect = [
+        target_feed,
+        resulting_entity,
+    ]
 
     result = UpdateRequestGtfsRtFeedImpl.to_orm(update_request, entity, session)
+    assert result is not None
     assert result.status == "active"
     assert result.provider == "provider"
     assert result.feed_name == "feed_name"
@@ -121,8 +128,12 @@ def test_to_orm_invalid_source_info():
     )
     entity = Gtfsrealtimefeed(id="1", stable_id="stable_id", data_type="gtfs")
     target_feed = Gtfsfeed(id=2, stable_id="target_stable_id")
+
     session = MagicMock()
-    session.query.return_value.filter.return_value.first.return_value = target_feed
+    session.query.return_value.filter.return_value.first.side_effect = [
+        target_feed,
+        None,
+    ]
 
     result = UpdateRequestGtfsRtFeedImpl.to_orm(update_request, entity, session)
 

functions-python/operations_api/tests/feeds_operations/impl/test_feeds_operations_impl_gtfs.py

@@ -9,6 +9,7 @@
 from database_gen.sqlacodegen_models import Gtfsfeed
 from feeds_operations.impl.feeds_operations_impl import OperationsApiImpl
 from feeds_operations_gen.models.authentication_type import AuthenticationType
+from feeds_operations_gen.models.external_id import ExternalId
 from feeds_operations_gen.models.feed_status import FeedStatus
 from feeds_operations_gen.models.source_info import SourceInfo
 from feeds_operations_gen.models.update_request_gtfs_feed import UpdateRequestGtfsFeed
@@ -64,6 +65,12 @@ async def test_update_gtfs_feed_no_changes(_, update_request_gtfs_feed):
 @pytest.mark.asyncio
 async def test_update_gtfs_feed_field_change(_, update_request_gtfs_feed):
     update_request_gtfs_feed.feed_name = "New feed name"
+    update_request_gtfs_feed.external_ids = [
+        ExternalId(
+            external_id="new_external_id",
+            source="new_source",
+        )
+    ]
     with get_testing_session() as session:
         api = OperationsApiImpl()
         response: Response = await api.update_gtfs_feed(update_request_gtfs_feed)

functions-python/operations_api/tests/feeds_operations/impl/test_feeds_operations_impl_gtfs_rt.py

@@ -64,3 +64,30 @@ async def test_update_gtfs_feed_field_change(_, update_request_gtfs_rt_feed):
             .one()
         )
         assert db_feed.feed_name == "New feed name"
+
+
+@patch("helpers.logger.Logger")
+@mock.patch.dict(
+    os.environ,
+    {
+        "FEEDS_DATABASE_URL": default_db_url,
+    },
+)
+@pytest.mark.asyncio
+async def test_update_gtfs_feed_static_change(_, update_request_gtfs_rt_feed):
+    update_request_gtfs_rt_feed.feed_references = ["mdb-400"]
+    with get_testing_session() as session:
+        api = OperationsApiImpl()
+        response: Response = await api.update_gtfs_rt_feed(update_request_gtfs_rt_feed)
+        assert response.status_code == 200
+
+        db_feed = (
+            session.query(Gtfsrealtimefeed)
+            .filter(Gtfsrealtimefeed.stable_id == feed_mdb_41.stable_id)
+            .one()
+        )
+        assert len(db_feed.gtfs_feeds) == 1
+        feed = next(
+            (feed for feed in db_feed.gtfs_feeds if feed.stable_id == "mdb-400"), None
+        )
+        assert feed is not None, "Feed with stable ID 'mdb-400' not found"