Skip to content

Commit ba92900

Browse files
authored
fix: populate gbfs script setting producer_url as autodiscovery_url (#1223)
1 parent 5648325 commit ba92900

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

api/src/scripts/gbfs_utils/fetching.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def fetch_data(auto_discovery_url, logger, urls=[], fields=[]):
2323
break
2424
elif not feeds:
2525
feeds = lang_feeds
26-
logger.info(f"Feeds found from auto-discovery URL {auto_discovery_url}: {feeds}")
26+
logger.debug(f"Feeds found from auto-discovery URL {auto_discovery_url}: {feeds}")
2727
if feeds:
2828
for url in urls:
2929
fetched_data[url] = get_field_url(feeds, url)

api/src/scripts/populate_db_gbfs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def populate_db(self, session, fetch_url=True):
9191
gbfs_feed.operator = row["Name"]
9292
gbfs_feed.provider = row["Name"]
9393
gbfs_feed.operator_url = row["URL"]
94-
gbfs_feed.producer_url = row["URL"]
94+
gbfs_feed.producer_url = row["Auto-Discovery URL"]
9595
gbfs_feed.auto_discovery_url = row["Auto-Discovery URL"]
9696
gbfs_feed.updated_at = datetime.now(pytz.utc)
9797

liquibase/changelog.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,5 @@
6161
<include file="changes/feat_1082.sql" relativeToChangelogFile="true"/>
6262
<include file="changes/feat_1181.sql" relativeToChangelogFile="true"/>
6363
<include file="changes/feat_1182.sql" relativeToChangelogFile="true"/>
64+
<include file="changes/feat_1200.sql" relativeToChangelogFile="true"/>
6465
</databaseChangeLog>

liquibase/changes/feat_1200.sql

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-- This SQL updates the producer's url to autodiscovery_url for all GBFS feeds
2+
3+
-- Populate producer_url in the feed entity with the autodiscovery_url from the gbfsfeed table
4+
UPDATE feed
5+
SET producer_url = (
6+
SELECT
7+
auto_discovery_url
8+
FROM
9+
gbfsfeed
10+
WHERE
11+
feed.id = gbfsfeed.id
12+
)
13+
WHERE producer_url IS NULL and data_type = 'gbfs';
14+
15+
16+
-- Update search
17+
REFRESH MATERIALIZED VIEW CONCURRENTLY feedsearch;

0 commit comments

Comments
 (0)