add update gtfs-rt fixes and unit test coverage

Author: davidgamez

functions-python/operations_api/src/feeds_operations/impl/feeds_operations_impl.py

@@ -16,7 +16,7 @@
 
 import logging
 import os
-from typing import Annotated, Type
+from typing import Annotated
 
 from deepdiff import DeepDiff
 from fastapi import HTTPException
@@ -50,7 +50,7 @@ class OperationsApiImpl(BaseOperationsApi):
     def detect_changes(
         feed: Gtfsfeed,
         update_request_feed: UpdateRequestGtfsFeed | UpdateRequestGtfsRtFeed,
-        impl_class: Type[UpdateRequestGtfsFeedImpl] | Type[UpdateRequestGtfsRtFeedImpl],
+        impl_class: UpdateRequestGtfsFeedImpl | UpdateRequestGtfsRtFeedImpl,
     ) -> DeepDiff:
         """
         Detect changes between the feed and the update request.
@@ -74,7 +74,7 @@ def detect_changes(
             logging.info("Detect update changes: no changes detected")
         return diff
 
-    @validate_request(Type[UpdateRequestGtfsFeed], "update_request_gtfs_feed")
+    @validate_request(UpdateRequestGtfsFeed, "update_request_gtfs_feed")
     async def update_gtfs_feed(
         self,
         update_request_gtfs_feed: Annotated[
@@ -92,7 +92,7 @@ async def update_gtfs_feed(
         ...
         return await self._update_feed(update_request_gtfs_feed, DataType.GTFS)
 
-    @validate_request(Type[UpdateRequestGtfsRtFeed], "update_request_gtfs_rt_feed")
+    @validate_request(UpdateRequestGtfsRtFeed, "update_request_gtfs_rt_feed")
     async def update_gtfs_rt_feed(
         self,
         update_request_gtfs_rt_feed: Annotated[
@@ -121,7 +121,7 @@ async def _update_feed(
         try:
             session = start_db_session(os.getenv("FEEDS_DATABASE_URL"))
             feed: Gtfsfeed = query_feed_by_stable_id(
-                session, update_request_feed.id, data_type.name
+                session, update_request_feed.id, data_type.value
             )
             if feed is None:
                 raise HTTPException(

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

@@ -1,8 +1,10 @@
+from pydantic import BaseModel
+
 from feeds_operations_gen.models.entity_type import EntityType
 from database_gen.sqlacodegen_models import Entitytype as EntityTypeOrm
 
 
-class EntityTypeImpl(EntityType):
+class EntityTypeImpl(BaseModel):
     """Implementation of the EntityType model.
     This class converts a SQLAlchemy row DB object with the gtfs feed fields to a Pydantic model.
     """
@@ -21,11 +23,11 @@ def from_orm(cls, obj: EntityTypeOrm | None) -> EntityType | None:
         """
         if obj is None:
             return None
-        return EntityType(obj.name)
+        return EntityType(obj.name.lower())
 
     @classmethod
     def to_orm(cls, entity_type: EntityType) -> EntityTypeOrm:
         """
         Convert a Pydantic model to a SQLAlchemy row object.
         """
-        return EntityTypeOrm(name=entity_type.name)
+        return EntityTypeOrm(name=entity_type.name.upper())

functions-python/operations_api/tests/conftest.py

@@ -13,9 +13,26 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from database_gen.sqlacodegen_models import Gtfsfeed
+from database_gen.sqlacodegen_models import Gtfsfeed, Gtfsrealtimefeed, Entitytype
 from test_utils.database_utils import clean_testing_db, get_testing_session
 
+feed_mdb_41 = Gtfsrealtimefeed(
+    id="mdb-41",
+    data_type="gtfs_rt",
+    feed_name="London Transit Commission(RT",
+    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-41",
+    status="active",
+    feed_contact_email="feed_contact_email",
+    provider="provider",
+    entitytypes=[Entitytype(name="vp")],
+)
+
 feed_mdb_40 = Gtfsfeed(
     id="mdb-40",
     data_type="gtfs",
@@ -30,22 +47,20 @@
     status="active",
     feed_contact_email="feed_contact_email",
     provider="provider",
+    # gtfs_rt_feeds=[feed_mdb_41],
 )
 
 
 def populate_database():
     """
     Populates the database with fake data with the following distribution:
     - 1 GTFS feeds
-        - 5 active
-        - 5 inactive
-    - 5 GTFS Realtime feeds
-    - 9 GTFS datasets
-        - 3 active in active feeds
-        - 6 active in inactive feeds
+    - 1 GTFS Realtime feeds
     """
     session = get_testing_session()
 
+    session.add(feed_mdb_41)
+    # session.flush()
     session.add(feed_mdb_40)
     session.commit()
 

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

@@ -0,0 +1,20 @@
+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
+
+
+def test_from_orm():
+    entity_type = Entitytype(name="VP")
+    result = EntityTypeImpl.from_orm(entity_type)
+    assert result.name == "VP"
+
+
+def test_from_orm_none():
+    result = EntityTypeImpl.from_orm(None)
+    assert result is None
+
+
+def test_to_orm():
+    entity_type = EntityType("vp")
+    result = EntityTypeImpl.to_orm(entity_type)
+    assert result.name == "VP"

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

@@ -0,0 +1,133 @@
+from unittest.mock import MagicMock
+from database_gen.sqlacodegen_models import (
+    Gtfsfeed,
+    Redirectingid,
+    Externalid,
+    Gtfsrealtimefeed,
+)
+from feeds_operations.impl.models.update_request_gtfs_rt_feed_impl import (
+    UpdateRequestGtfsRtFeedImpl,
+)
+from feeds_operations_gen.models.authentication_type import AuthenticationType
+from feeds_operations_gen.models.entity_type import EntityType
+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_rt_feed import (
+    UpdateRequestGtfsRtFeed,
+)
+from operations_api.src.feeds_operations.impl.models.redirect_impl import RedirectImpl
+from operations_api.src.feeds_operations.impl.models.external_id_impl import (
+    ExternalIdImpl,
+)
+
+
+def test_from_orm():
+    redirecting_id = Redirectingid(target=MagicMock(stable_id="target_stable_id"))
+    external_id = Externalid(associated_id="external_id")
+    gtfs_feed = Gtfsrealtimefeed(
+        stable_id="stable_id",
+        status="active",
+        provider="provider",
+        feed_name="feed_name",
+        note="note",
+        feed_contact_email="[email protected]",
+        producer_url="http://producer.url",
+        authentication_type=1,
+        authentication_info_url="http://auth.info.url",
+        api_key_parameter_name="api_key",
+        license_url="http://license.url",
+        redirectingids=[redirecting_id],
+        externalids=[external_id],
+    )
+
+    result = UpdateRequestGtfsRtFeedImpl.from_orm(gtfs_feed)
+    assert result.id == "stable_id"
+    assert result.status == "active"
+    assert result.provider == "provider"
+    assert result.feed_name == "feed_name"
+    assert result.note == "note"
+    assert result.feed_contact_email == "[email protected]"
+    assert result.source_info.producer_url == "http://producer.url"
+    assert result.source_info.authentication_type == 1
+    assert result.source_info.authentication_info_url == "http://auth.info.url"
+    assert result.source_info.api_key_parameter_name == "api_key"
+    assert result.source_info.license_url == "http://license.url"
+    assert len(result.redirects) == 1
+    assert result.redirects[0].target_id == "target_stable_id"
+    assert len(result.external_ids) == 1
+    assert result.external_ids[0].external_id == "external_id"
+
+
+def test_from_orm_none():
+    result = UpdateRequestGtfsRtFeedImpl.from_orm(None)
+    assert result is None
+
+
+def test_to_orm():
+    update_request = UpdateRequestGtfsRtFeed(
+        id="stable_id",
+        status=FeedStatus.ACTIVE,
+        provider="provider",
+        feed_name="feed_name",
+        note="note",
+        feed_contact_email="[email protected]",
+        source_info=SourceInfo(
+            producer_url="http://producer.url",
+            authentication_type=AuthenticationType.NUMBER_1,
+            authentication_info_url="http://auth.info.url",
+            api_key_parameter_name="api_key",
+            license_url="http://license.url",
+        ),
+        redirects=[RedirectImpl(target_id="target_stable_id", comment="Test comment")],
+        external_ids=[ExternalIdImpl(external_id="external_id")],
+        entity_types=[EntityType.VP],
+        feed_references=["feed_reference"],
+    )
+    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
+
+    result = UpdateRequestGtfsRtFeedImpl.to_orm(update_request, entity, session)
+    assert result.status == "active"
+    assert result.provider == "provider"
+    assert result.feed_name == "feed_name"
+    assert result.note == "note"
+    assert result.feed_contact_email == "[email protected]"
+    assert result.producer_url == "http://producer.url"
+    assert result.authentication_type == "1"
+    assert result.authentication_info_url == "http://auth.info.url"
+    assert result.api_key_parameter_name == "api_key"
+    assert result.license_url == "http://license.url"
+    assert len(result.redirectingids) == 1
+    assert result.redirectingids[0].target_id == target_feed.id
+    assert len(result.externalids) == 1
+    assert result.externalids[0].associated_id == "external_id"
+
+
+def test_to_orm_invalid_source_info():
+    update_request = UpdateRequestGtfsRtFeed(
+        id="stable_id",
+        status=FeedStatus.ACTIVE,
+        provider="provider",
+        feed_name="feed_name",
+        note="note",
+        feed_contact_email="[email protected]",
+        source_info=None,
+        redirects=[RedirectImpl(target_id="target_stable_id", comment="Test comment")],
+        external_ids=[ExternalIdImpl(external_id="external_id")],
+        entity_types=[EntityType.VP],
+        feed_references=["feed_reference"],
+    )
+    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
+
+    result = UpdateRequestGtfsRtFeedImpl.to_orm(update_request, entity, session)
+
+    assert result.producer_url is None
+    assert result.authentication_type is None
+    assert result.authentication_info_url is None
+    assert result.api_key_parameter_name is None
+    assert result.license_url is None

…tions/impl/test_feeds_operations_impl.py …/impl/test_feeds_operations_impl_gtfs.pyfunctions-python/operations_api/tests/feeds_operations/impl/test_feeds_operations_impl.py renamed to functions-python/operations_api/tests/feeds_operations/impl/test_feeds_operations_impl_gtfs.py functions-python/operations_api/tests/feeds_operations/impl/test_feeds_operations_impl.py renamed to functions-python/operations_api/tests/feeds_operations/impl/test_feeds_operations_impl_gtfs.py

@@ -0,0 +1,66 @@
+import os
+from unittest import mock
+from unittest.mock import patch
+
+import pytest
+from starlette.responses import Response
+
+from database_gen.sqlacodegen_models import Gtfsrealtimefeed
+from feeds_operations.impl.feeds_operations_impl import OperationsApiImpl
+from feeds_operations_gen.models.authentication_type import AuthenticationType
+from feeds_operations_gen.models.entity_type import EntityType
+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_rt_feed import (
+    UpdateRequestGtfsRtFeed,
+)
+from operations_api.tests.conftest import feed_mdb_41
+from test_utils.database_utils import get_testing_session, default_db_url
+
+
+@pytest.fixture
+def update_request_gtfs_rt_feed():
+    return UpdateRequestGtfsRtFeed(
+        id=feed_mdb_41.stable_id,
+        status=FeedStatus(feed_mdb_41.status.lower()),
+        external_ids=[],
+        provider=feed_mdb_41.provider,
+        feed_name=feed_mdb_41.feed_name,
+        note=feed_mdb_41.note,
+        feed_contact_email=feed_mdb_41.feed_contact_email,
+        source_info=SourceInfo(
+            producer_url=feed_mdb_41.producer_url,
+            authentication_type=AuthenticationType(
+                int(feed_mdb_41.authentication_type)
+            ),
+            authentication_info_url=feed_mdb_41.authentication_info_url,
+            api_key_parameter_name=feed_mdb_41.api_key_parameter_name,
+            license_url=feed_mdb_41.license_url,
+        ),
+        redirects=[],
+        operational_status_action="no_change",
+        entity_types=[EntityType.VP],
+    )
+
+
+@patch("helpers.logger.Logger")
+@mock.patch.dict(
+    os.environ,
+    {
+        "FEEDS_DATABASE_URL": default_db_url,
+    },
+)
+@pytest.mark.asyncio
+async def test_update_gtfs_feed_field_change(_, update_request_gtfs_rt_feed):
+    update_request_gtfs_rt_feed.feed_name = "New feed name"
+    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 db_feed.feed_name == "New feed name"