Merge pull request #74 from OCHA-DAP/remove-hdx-trailing-slashes

remove trailing slashes from HDX urls
OCHA-DAP · Apr 9, 2024 · c854b74 · c854b74
2 parents fa132ee + be33fce
commit c854b74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hdx_hapi/config/config.py b/hdx_hapi/config/config.py
@@ -38,8 +38,8 @@ def get_config() -> Config:
             SQL_ALCHEMY_PSYCOPG2_DB_URI=sql_alchemy_psycopg2_db_uri,
 
             HDX_DOMAIN=os.getenv('HDX_DOMAIN', 'https://data.humdata.org'),
-            HDX_DATASET_URL=os.getenv('HDX_DATASET_URL', '{domain}/dataset/{dataset_id}/'),
-            HDX_RESOURCE_URL=os.getenv('HDX_DATASET_URL', '{domain}/dataset/{dataset_id}/resource/{resource_id}/'),
+            HDX_DATASET_URL=os.getenv('HDX_DATASET_URL', '{domain}/dataset/{dataset_id}'),
+            HDX_RESOURCE_URL=os.getenv('HDX_DATASET_URL', '{domain}/dataset/{dataset_id}/resource/{resource_id}'),
             HDX_DATASET_API_URL=os.getenv('HDX_DATASET_API_URL', '{domain}/api/action/package_show?id={dataset_id}'),
             HDX_RESOURCE_API_URL=os.getenv('HDX_RESOURCE_API_URL',
                                            '{domain}/api/action/resource_show?id={resource_id}'),

diff --git a/tests/test_helpers/test_url_helpers.py b/tests/test_helpers/test_url_helpers.py
@@ -14,7 +14,7 @@ def test_helper_get_dataset_url():
     log.info('started test_helper_get_dataset_url')
 
     dataset_id = 'test-dataset'
-    expected_link = HttpUrl(url='https://data.humdata.org/dataset/%s/' % (dataset_id))
+    expected_link = HttpUrl(url='https://data.humdata.org/dataset/%s' % (dataset_id))
 
     dataset_url = get_dataset_url(dataset_id=dataset_id)