From 2758f38216609df698096e178c066daa857eecab Mon Sep 17 00:00:00 2001 From: Sujan Adhikari Date: Fri, 10 Jan 2025 12:52:27 +0545 Subject: [PATCH] fix: change geom to geojson in db model --- src/backend/app/db/models.py | 6 +++--- src/backend/app/projects/project_schemas.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/app/db/models.py b/src/backend/app/db/models.py index 168177e84..e3c21f3b1 100644 --- a/src/backend/app/db/models.py +++ b/src/backend/app/db/models.py @@ -1748,7 +1748,7 @@ def slugify(name: Optional[str]) -> Optional[str]: class DbGeometryLog(BaseModel): """Table geometry log.""" - geom: dict + geojson: dict status: GeomStatus project_id: Optional[int] = None task_id: Optional[int] = None @@ -1766,8 +1766,8 @@ async def create( for key in model_dump.keys(): columns.append(key) - if key == "geom": - value_placeholders.append(f"ST_GeomFromGeoJSON(%({key})s)") + if key == "geojson": + value_placeholders.append(f"%({key})s::jsonb") # Must be string json for db input model_dump[key] = json.dumps(model_dump[key]) else: diff --git a/src/backend/app/projects/project_schemas.py b/src/backend/app/projects/project_schemas.py index f29eebf65..4e27ba2fb 100644 --- a/src/backend/app/projects/project_schemas.py +++ b/src/backend/app/projects/project_schemas.py @@ -47,11 +47,11 @@ class GeometryLogIn(BaseModel): """Geometry log insert.""" status: GeomStatus - geom: dict + geojson: dict project_id: Optional[int] = None task_id: Optional[int] = None - @field_validator("geom", mode="before") + @field_validator("geojson", mode="before") @classmethod def parse_input_geometry( cls,