Merge pull request #9 from OCHA-DAP/HAPI-244

Change resource filename to name
OCHA-DAP · Oct 19, 2023 · 0752229 · 0752229
2 parents 5ed56e2 + 1ff699a
commit 0752229
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.1]
+
+### Changed
+
+- Renamed resource column `filename` to `name`
+
 ## [0.3.0]
 
 ### Added

diff --git a/src/hapi_schema/db_operational_presence.py b/src/hapi_schema/db_operational_presence.py
@@ -65,7 +65,7 @@ class DBOperationalPresence(Base):
         DBDataset.provider_code.label("dataset_provider_code"),
         DBDataset.provider_name.label("dataset_provider_name"),
         DBResource.hdx_id.label("resource_hdx_id"),
-        DBResource.filename.label("resource_filename"),
+        DBResource.name.label("resource_name"),
         DBResource.update_date.label("resource_update_date"),
         DBLocation.code.label("location_code"),
         DBLocation.name.label("location_name"),

diff --git a/src/hapi_schema/db_population.py b/src/hapi_schema/db_population.py
@@ -67,7 +67,7 @@ class DBPopulation(Base):
         DBDataset.provider_code.label("dataset_provider_code"),
         DBDataset.provider_name.label("dataset_provider_name"),
         DBResource.hdx_id.label("resource_hdx_id"),
-        DBResource.filename.label("resource_filename"),
+        DBResource.name.label("resource_name"),
         DBResource.update_date.label("resource_update_date"),
         DBGender.description.label("gender_description"),
         DBLocation.code.label("location_code"),

diff --git a/src/hapi_schema/db_resource.py b/src/hapi_schema/db_resource.py
@@ -26,7 +26,7 @@ class DBResource(Base):
     hdx_id: Mapped[str] = mapped_column(
         String(36), unique=True, nullable=False
     )
-    filename: Mapped[str] = mapped_column(String(256), nullable=False)
+    name: Mapped[str] = mapped_column(String(256), nullable=False)
     format: Mapped[str] = mapped_column(String(32), nullable=False)
     update_date = mapped_column(DateTime, nullable=False, index=True)
     download_url: Mapped[str] = mapped_column(

diff --git a/tests/sample_data/data_resource.py b/tests/sample_data/data_resource.py
@@ -5,7 +5,7 @@
         id=1,
         dataset_ref=1,
         hdx_id="90deb235-1bf5-4bae-b231-3393222c2d01",
-        filename="resource-01.csv",
+        name="resource-01.csv",
         format="csv",
         update_date=datetime(2023, 6, 1),
         download_url="https://data.humdata.org/dataset/c3f001fa-b45b-464c-9460-1ca79fd39b40/resource/90deb235-1bf5-4bae-b231-3393222c2d01/download/resource-01.csv",
@@ -15,7 +15,7 @@
         id=2,
         dataset_ref=1,
         hdx_id="b9e438e0-b68a-49f9-b9a9-68c0f3e93604",
-        filename="resource-02.xlsx",
+        name="resource-02.xlsx",
         format="xlsx",
         update_date=datetime(2023, 7, 1),
         download_url="https://fdw.fews.net/api/tradeflowquantityvaluefacts/?dataset=1845&country=TZ&fields=simple&format=xlsx",
@@ -25,7 +25,7 @@
         id=3,
         dataset_ref=2,
         hdx_id="62ad6e55-5f5d-4494-854c-4110687e9e25",
-        filename="resource-03.csv",
+        name="resource-03.csv",
         format="csv",
         update_date=datetime(2023, 8, 1),
         download_url="https://data.humdata.org/dataset/7cf3cec8-dbbc-4c96-9762-1464cd0bff75/resource/62ad6e55-5f5d-4494-854c-4110687e9e25/download/resource-03.csv",