Merge pull request #78 from OCHA-DAP/admin_level_wfp

Revert wfp admin level change

changelog.md

@@ -11,7 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Changed endpoint names for conflict event, food price, food security, population, poverty rate, and refugees tables
 - Include origin and asylum in data availability for refugees and returnees
-- Added admin level to WFP Market table
 
 ## 0.9.6
 

src/hapi_schema/db_views_as_tables.py

@@ -618,7 +618,6 @@ class DBWfpMarketVAT(Base):
     admin2_name: Mapped[str] = mapped_column(String(512), index=True)
     admin2_is_unspecified: Mapped[bool] = mapped_column(Boolean)
     admin1_ref: Mapped[int] = mapped_column(Integer)
-    admin_level: Mapped[int] = mapped_column(Integer, index=True)
 
 
 class DBAvailabilityVAT(Base):

src/hapi_schema/db_wfp_market.py

@@ -9,7 +9,6 @@
 from hapi_schema.utils.base import Base
 from hapi_schema.utils.constraints import latlon_constraint
 from hapi_schema.utils.view_params import ViewParams
-from hapi_schema.views import get_admin2_case
 
 
 class DBWFPMarket(Base):
@@ -51,7 +50,6 @@ class DBWFPMarket(Base):
         DBAdmin2.name.label("admin2_name"),
         DBAdmin2.is_unspecified.label("admin2_is_unspecified"),
         DBAdmin2.admin1_ref.label("admin1_ref"),
-        get_admin2_case(DBWFPMarket),
     ).select_from(
         # Join market to admin2 to admin1 to loc
         DBWFPMarket.__table__.join(

tests/test_views_as_tables.py

@@ -519,7 +519,6 @@ def test_wfp_market_vat(
         "admin1_name",
         "admin2_code",
         "admin2_name",
-        "admin_level",
     ]
     run_columns_test(
         "wfp_market_vat", "wfp_market_view", view_params_wfp_market