Merge pull request #205 from hotosm/rename/iso3_fields

Enhance : Request param in iso3
hotosm · Jan 20, 2024 · 6c220c6 · 6c220c6
2 parents 587a8dc + fb54656
commit 6c220c6
Show file tree

Hide file tree

Showing 9 changed files with 332 additions and 331 deletions.
diff --git a/API/data/hdx.sql b/API/data/hdx.sql
diff --git a/API/data/tables.sql b/API/data/tables.sql
@@ -1,7 +1,7 @@
 CREATE TABLE if not exists public.countries (
 	cid int4 NOT NULL,
 	"name" varchar NULL,
-	iso_3 varchar(3) NULL,
+	iso3 varchar(3) NULL,
 	geometry public.geometry(multipolygon, 4326),
 	CONSTRAINT countries_pk PRIMARY KEY (cid)
 );
@@ -16,7 +16,7 @@ CREATE table if not exists public.users (
 
 CREATE TABLE if not exists public.hdx (
     id SERIAL PRIMARY KEY,
-    iso_3 VARCHAR(3) NULL,
+    iso3 VARCHAR(3) NULL,
     cid INT NULL,
     hdx_upload BOOLEAN DEFAULT true,
     dataset JSONB,

diff --git a/API/hdx.py b/API/hdx.py
@@ -59,7 +59,7 @@ async def read_hdx_list(
     filters = {}
     for key, values in request.query_params.items():
         if key not in ["skip", "limit"]:
-            if key in ["iso_3", "queue", "meta", "hdx_upload", "cid"]:
+            if key in ["iso3", "id", "queue", "meta", "hdx_upload", "cid"]:
                 filters[f"{key} = %s"] = values
                 continue
             filters[f"dataset->>'{key}' = %s"] = values

diff --git a/backend/countries/countries.csv b/backend/countries/countries.csv
@@ -1,4 +1,4 @@
-cid,description,iso_3,dataset_name,locations
+cid,description,iso3,dataset_name,locations
 168,Afghanistan,AFG,hotosm_afg,{afg}
 170,Albania,ALB,hotosm_alb,{alb}
 100,Algeria,DZA,hotosm_dza,{dza}

diff --git a/backend/countries/countries.geojson b/backend/countries/countries.geojson
diff --git a/backend/sql/countries.sql b/backend/sql/countries.sql