Increased coverage of export_csv

Author: jcpitre

functions-python/export_csv/.coveragerc

@@ -0,0 +1,11 @@
+[run]
+omit =
+    */test*/*
+    */database_gen/*
+    */dataset_service/*
+    */helpers/*
+    */shared/*
+
+[report]
+exclude_lines =
+    if __name__ == .__main__.:

functions-python/export_csv/src/main.py

@@ -312,16 +312,11 @@ def get_gtfs_rt_feed_csv_data(feed: Gtfsrealtimefeed):
     return data
 
 
-def main():
-    global csv_file_path
+if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Export DB feed contents to csv.")
     parser.add_argument(
         "--outpath", help="Path to the output csv file. Default is ./output.csv"
     )
     args = parser.parse_args()
     csv_file_path = args.outpath if args.outpath else csv_default_file_path
     export_csv()
-
-
-if __name__ == "__main__":
-    main()

functions-python/export_csv/tests/conftest.py

@@ -19,7 +19,11 @@
 
 from geoalchemy2 import WKTElement
 
-from shared.database_gen.sqlacodegen_models import Validationreport, Feature
+from shared.database_gen.sqlacodegen_models import (
+    Validationreport,
+    Feature,
+    Redirectingid,
+)
 from shared.database_gen.sqlacodegen_models import (
     Gtfsfeed,
     Gtfsrealtimefeed,
@@ -45,23 +49,51 @@ def populate_database():
     clean_testing_db()
     session = get_testing_session()
     fake = Faker()
+
+    feeds = []
+    # We create 3 feeds. The first one is active. The third one is inactive and redirected to the first one.
+    # The second one is active but not redirected.
+    # First fill the generic paramaters
     for i in range(3):
         feed = Gtfsfeed(
-            id=fake.uuid4(),
             data_type="gtfs",
             feed_name=f"gtfs-{i} Some fake name",
             note=f"gtfs-{i} Some fake note",
             producer_url=f"https://gtfs-{i}_some_fake_producer_url",
-            authentication_type="0" if (i in [0, 1, 2]) else "1",
             authentication_info_url=None,
             api_key_parameter_name=None,
             license_url=f"https://gtfs-{i}_some_fake_license_url",
             stable_id=f"gtfs-{i}",
-            status="active",
-            # status="active" if (i in [0, 1]) else "inactive",
             feed_contact_email=f"gtfs-{i}[email protected]",
             provider=f"gtfs-{i} Some fake company",
         )
+        feeds.append(feed)
+
+    # Then fill the specific parameters for each feed
+    target_feed = feeds[0]
+    target_feed.id = "e3155a30-81d8-40bb-9e10-013a60436d86"  # Just an invented uuid
+    target_feed.authentication_type = "0"
+    target_feed.status = "active"
+
+    source_feed = feeds[2]
+    source_feed.id = "6e7c5f17-537a-439a-bf99-9c37f1f01030"
+    source_feed.authentication_type = "0"
+    source_feed.status = "inactive"
+    source_feed.redirectingids = [
+        Redirectingid(
+            source_id=source_feed.id,
+            target_id=target_feed.id,
+            redirect_comment="Some redirect comment",
+            target=target_feed,
+        )
+    ]
+
+    feed = feeds[1]
+    feed.id = fake.uuid4()
+    feed.authentication_type = "0"
+    feed.status = "active"
+
+    for feed in feeds:
         session.add(feed)
 
     for i in range(2):
@@ -104,8 +136,9 @@ def populate_database():
         .all()
     )
 
+    # the first 2 datasets are for the first feed
     for i in range(1, 4):
-        feed_index = 0 if i in [1, 2] else i - 1
+        feed_index = 0 if i in [1, 2] else 1
         wkt_polygon = "POLYGON((-18 -9, -18 9, 18 9, 18 -9, -18 -9))"
         wkt_element = WKTElement(wkt_polygon, srid=4326)
         gtfs_dataset = Gtfsdataset(
@@ -132,11 +165,11 @@ def populate_database():
         session.add(validation_report)
         gtfs_dataset.validation_reports.append(validation_report)
 
-        if i in [1, 2]:
-            gtfs_dataset.locations = locations
-            active_gtfs_feeds[i].locations = locations
+        gtfs_dataset.locations = locations
 
         active_gtfs_feeds[feed_index].gtfsdatasets.append(gtfs_dataset)
+    active_gtfs_feeds[0].locations = locations
+    active_gtfs_feeds[1].locations = locations
 
     # active_gtfs_feeds[0].gtfsdatasets.append() = gtfs_datasets
 

functions-python/export_csv/tests/test_export_csv_main.py

@@ -22,9 +22,9 @@
 # the data is correct.
 expected_csv = """
 id,data_type,entity_type,location.country_code,location.subdivision_name,location.municipality,provider,name,note,feed_contact_email,static_reference,urls.direct_download,urls.authentication_type,urls.authentication_info,urls.api_key_parameter_name,urls.latest,urls.license,location.bounding_box.minimum_latitude,location.bounding_box.maximum_latitude,location.bounding_box.minimum_longitude,location.bounding_box.maximum_longitude,location.bounding_box.extracted_on,status,features,redirect.id,redirect.comment
-gtfs-0,gtfs,,,,,gtfs-0 Some fake company,gtfs-0 Some fake name,gtfs-0 Some fake note,[email protected],,https://gtfs-0_some_fake_producer_url,0,,,https://dataset-1_some_fake_hosted_url,https://gtfs-0_some_fake_license_url,-9.0,9.0,-18.0,18.0,2025-01-12 00:00:00+00:00,active,Route Colors|Shapes,,
-gtfs-1,gtfs,,CA,Quebec,Montreal,gtfs-1 Some fake company,gtfs-1 Some fake name,gtfs-1 Some fake note,[email protected],,https://gtfs-1_some_fake_producer_url,0,,,,https://gtfs-1_some_fake_license_url,,,,,,active,,,
-gtfs-2,gtfs,,CA,Quebec,Montreal,gtfs-2 Some fake company,gtfs-2 Some fake name,gtfs-2 Some fake note,[email protected],,https://gtfs-2_some_fake_producer_url,0,,,https://dataset-3_some_fake_hosted_url,https://gtfs-2_some_fake_license_url,-9.0,9.0,-18.0,18.0,2025-01-12 00:00:00+00:00,active,Route Colors|Shapes,,
+gtfs-0,gtfs,,CA,Quebec,Montreal,gtfs-0 Some fake company,gtfs-0 Some fake name,gtfs-0 Some fake note,[email protected],,https://gtfs-0_some_fake_producer_url,0,,,https://dataset-1_some_fake_hosted_url,https://gtfs-0_some_fake_license_url,-9.0,9.0,-18.0,18.0,2025-01-12 00:00:00+00:00,active,Route Colors|Shapes,,
+gtfs-1,gtfs,,CA,Quebec,Montreal,gtfs-1 Some fake company,gtfs-1 Some fake name,gtfs-1 Some fake note,[email protected],,https://gtfs-1_some_fake_producer_url,0,,,https://dataset-3_some_fake_hosted_url,https://gtfs-1_some_fake_license_url,-9.0,9.0,-18.0,18.0,2025-01-12 00:00:00+00:00,active,Route Colors|Shapes,,
+gtfs-2,gtfs,,,,,gtfs-2 Some fake company,gtfs-2 Some fake name,gtfs-2 Some fake note,[email protected],,https://gtfs-2_some_fake_producer_url,0,,,,https://gtfs-2_some_fake_license_url,,,,,,inactive,,gtfs-0,Some redirect comment
 gtfs-deprecated-0,gtfs,,,,,gtfs-deprecated-0 Some fake company,gtfs-deprecated-0 Some fake name,gtfs-deprecated-0 Some fake note,[email protected],,https://gtfs-deprecated-0_some_fake_producer_url,0,,,,https://gtfs-0_some_fake_license_url,,,,,,deprecated,,,
 gtfs-deprecated-1,gtfs,,,,,gtfs-deprecated-1 Some fake company,gtfs-deprecated-1 Some fake name,gtfs-deprecated-1 Some fake note,[email protected],,https://gtfs-deprecated-1_some_fake_producer_url,1,,,,https://gtfs-1_some_fake_license_url,,,,,,deprecated,,,
 gtfs-rt-0,gtfs_rt,tu|vp,,,,gtfs-rt-0 Some fake company,gtfs-rt-0 Some fake name,gtfs-rt-0 Some fake note,[email protected],,https://gtfs-rt-0_some_fake_producer_url,0,https://gtfs-rt-0_some_fake_authentication_info_url,gtfs-rt-0_fake_api_key_parameter_name,,https://gtfs-rt-0_some_fake_license_url,,,,,,,,,