Skip to content

Commit d8dda47

Browse files
committed
refactor operations api to reuse models from public api
1 parent 3457d0f commit d8dda47

38 files changed

Lines changed: 1083 additions & 779 deletions

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,7 @@ tf.plan
8080
functions-python/**/*.csv
8181

8282
# Local emulators
83-
.cloudstorage
83+
.cloudstorage
84+
85+
# Project files
86+
*.code-workspace

api/src/shared/db_models/gtfs_dataset_impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from shared.db_models.bounding_box_impl import BoundingBoxImpl
66
from shared.db_models.validation_report_impl import ValidationReportImpl
77
from feeds_gen.models.gtfs_dataset import GtfsDataset
8-
from utils.model_utils import compare_java_versions
8+
from shared.db_models.model_utils import compare_java_versions
99

1010

1111
class GtfsDatasetImpl(GtfsDataset):

api/src/shared/db_models/gtfs_rt_feed_impl.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def from_orm(cls, feed: GtfsRTFeedOrm | None) -> GtfsRTFeed | None:
1818
gtfs_rt_feed: GtfsRTFeed = super().from_orm(feed)
1919
if not gtfs_rt_feed:
2020
return None
21-
gtfs_rt_feed.locations = [LocationImpl.from_orm(item) for item in feed.locations]
22-
gtfs_rt_feed.entity_types = [item.name for item in feed.entitytypes]
23-
gtfs_rt_feed.feed_references = [item.stable_id for item in feed.gtfs_feeds]
21+
gtfs_rt_feed.locations = [LocationImpl.from_orm(item) for item in feed.locations] if feed.locations else []
22+
gtfs_rt_feed.entity_types = [item.name for item in feed.entitytypes] if feed.entitytypes else []
23+
gtfs_rt_feed.feed_references = [item.stable_id for item in feed.gtfs_feeds] if feed.gtfs_feeds else []
2424
return gtfs_rt_feed

api/src/shared/db_models/latest_dataset_impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from shared.db_models.bounding_box_impl import BoundingBoxImpl
55
from feeds_gen.models.latest_dataset import LatestDataset
66
from feeds_gen.models.latest_dataset_validation_report import LatestDatasetValidationReport
7-
from utils.model_utils import compare_java_versions
7+
from shared.db_models.model_utils import compare_java_versions
88

99

1010
class LatestDatasetImpl(LatestDataset):

api/src/utils/model_utils.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

api/tests/utils/test_compare_java_versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import unittest
2-
from utils.model_utils import compare_java_versions
2+
from shared.db_models.model_utils import compare_java_versions
33

44

55
class TestCompareJavaVersions(unittest.TestCase):

0 commit comments

Comments
 (0)