Skip to content

Commit f7901b2

Browse files
committed
added license info in get_feed
1 parent 2780b4c commit f7901b2

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

api/src/feeds/impl/feeds_api_impl.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
Gtfsrealtimefeed,
4444
Location,
4545
Entitytype,
46+
License as LicenseOrm,
4647
)
4748
from shared.feed_filters.feed_filter import FeedFilter
4849
from shared.feed_filters.gtfs_dataset_filter import GtfsDatasetFilter
@@ -72,7 +73,7 @@ def get_feed(self, id: str, db_session: Session) -> Feed:
7273
is_email_restricted = is_user_email_restricted()
7374
self.logger.debug(f"User email is restricted: {is_email_restricted}")
7475

75-
feed = (
76+
feed_orm = (
7677
FeedFilter(stable_id=id, provider__ilike=None, producer_url__ilike=None, status=None)
7778
.filter(Database().get_query_model(db_session, FeedOrm))
7879
.filter(
@@ -83,8 +84,13 @@ def get_feed(self, id: str, db_session: Session) -> Feed:
8384
)
8485
.first()
8586
)
86-
if feed:
87-
return FeedImpl.from_orm(feed)
87+
if feed_orm:
88+
feed = FeedImpl.from_orm(feed_orm)
89+
if feed.license_url:
90+
license_record = db_session.query(LicenseOrm).filter(LicenseOrm.url == feed.license_url).one_or_none()
91+
if license_record:
92+
feed.license_description = license_record.description
93+
return feed
8894
else:
8995
raise_http_error(404, feed_not_found.format(id))
9096

0 commit comments

Comments
 (0)