fix: is_official filter and add SQL indexes (#1051)

Author: davidgamez

api/src/feeds/impl/feeds_api_impl.py

@@ -131,13 +131,14 @@ def get_gtfs_feed(self, id: str, db_session: Session) -> GtfsFeed:
         else:
             raise_http_error(404, gtfs_feed_not_found.format(id))
 
-    @staticmethod
     def _get_gtfs_feed(
-        stable_id: str, db_session: Session, include_options_for_joinedload: bool = True
+        self, stable_id: str, db_session: Session, include_options_for_joinedload: bool = True
     ) -> Optional[Gtfsfeed]:
-        results = get_gtfs_feeds_query(
+        query = get_gtfs_feeds_query(
             db_session=db_session, stable_id=stable_id, include_options_for_joinedload=include_options_for_joinedload
-        ).all()
+        )
+        self.logger.debug("Query: %s", str(query.statement.compile(compile_kwargs={"literal_binds": True})))
+        results = query.all()
         if len(results) == 0:
             return None
         return results[0]

api/src/shared/common/db_utils.py

@@ -37,7 +37,7 @@ def get_gtfs_feeds_query(
     dataset_latitudes: str | None = None,
     dataset_longitudes: str | None = None,
     bounding_filter_method: str | None = None,
-    is_official: bool = False,
+    is_official: bool | None = None,
     published_only: bool = True,
     include_options_for_joinedload: bool = True,
 ) -> Query[any]:
@@ -46,35 +46,42 @@ def get_gtfs_feeds_query(
         stable_id=stable_id,
         provider__ilike=provider,
         producer_url__ilike=producer_url,
-        location=LocationFilter(
-            country_code=country_code,
-            subdivision_name__ilike=subdivision_name,
-            municipality__ilike=municipality,
-        ),
+        location=None,
     )
 
-    subquery = gtfs_feed_filter.filter(select(Gtfsfeed.id).join(Location, Gtfsfeed.locations))
+    subquery = gtfs_feed_filter.filter(select(Gtfsfeed.id))
     subquery = apply_bounding_filtering(
         subquery, dataset_latitudes, dataset_longitudes, bounding_filter_method
     ).subquery()
-
     feed_query = (
         db_session.query(Gtfsfeed)
         .outerjoin(Gtfsfeed.gtfsdatasets)
         .filter(Gtfsfeed.id.in_(subquery))
-        .filter((Gtfsdataset.latest) | (Gtfsdataset.id == None))  # noqa: E711
+        .filter(or_(Gtfsdataset.latest, Gtfsdataset.id == None))  # noqa: E711
     )
+
+    if country_code or subdivision_name or municipality:
+        location_filter = LocationFilter(
+            country_code=country_code,
+            subdivision_name__ilike=subdivision_name,
+            municipality__ilike=municipality,
+        )
+        location_subquery = location_filter.filter(select(Location.id))
+        feed_query = feed_query.filter(Gtfsfeed.locations.any(Location.id.in_(location_subquery)))
+
     if published_only:
         feed_query = feed_query.filter(Gtfsfeed.operational_status == "published")
 
+    feed_query = add_official_filter(feed_query, is_official)
+
     if include_options_for_joinedload:
         feed_query = feed_query.options(
             contains_eager(Gtfsfeed.gtfsdatasets)
             .joinedload(Gtfsdataset.validation_reports)
             .joinedload(Validationreport.notices),
             *get_joinedload_options(),
         ).order_by(Gtfsfeed.provider, Gtfsfeed.stable_id)
-    feed_query = add_official_filter(feed_query, is_official)
+
     feed_query = feed_query.limit(limit).offset(offset)
     return feed_query
 

liquibase/changelog.xml

@@ -42,4 +42,5 @@
     <include file="changes/feat_927_2.sql" relativeToChangelogFile="true"/>
     <include file="changes/feat_966.sql" relativeToChangelogFile="true"/>
     <include file="changes/feat_946.sql" relativeToChangelogFile="true"/>
+    <include file="changes/add_idxs.sql" relativeToChangelogFile="true"/>
 </databaseChangeLog>

liquibase/changes/add_idxs.sql

@@ -0,0 +1,22 @@
+-- Feed
+CREATE INDEX idx_feed_id ON Feed(id);
+CREATE INDEX idx_feed_status ON Feed(status);
+CREATE INDEX idx_feed_provider_stable_id ON Feed(provider, stable_id);
+
+-- GTFSDataset 
+CREATE INDEX idx_gtfsdataset_feed_id ON GTFSDataset(feed_id);
+CREATE INDEX idx_gtfsdataset_latest ON GTFSDataset(latest);
+
+-- LocationFeed
+CREATE INDEX idx_locationfeed_feed_id ON LocationFeed(feed_id);
+CREATE INDEX idx_locationfeed_location_id ON LocationFeed(location_id);
+
+-- ValidationReport
+CREATE INDEX idx_validationreport_validator_version ON ValidationReport(validator_version);
+
+-- ValidationReportGTFSDataset
+CREATE INDEX idx_vrgtfsdataset_dataset_id ON ValidationReportGTFSDataset(dataset_id);
+CREATE INDEX idx_vrgtfsdataset_report_id ON ValidationReportGTFSDataset(validation_report_id);
+
+
+