diff --git a/geomagio/api/db/metadata_table.py b/geomagio/api/db/metadata_table.py index 05e5cfe43729770a84d305dcedc506858545d41c..f1286420e3b030014ff9acff0db77c49c8d88b49 100644 --- a/geomagio/api/db/metadata_table.py +++ b/geomagio/api/db/metadata_table.py @@ -131,7 +131,7 @@ async def get_metadata( if created_after: query = query.where(metadata.c.created_time > created_after) if created_before: - query = query = query.where(metadata.c.created_time < created_before) + query = query.where(metadata.c.created_time < created_before) if data_valid is not None: query = query.where(metadata.c.data_valid == data_valid) if metadata_valid is not None: diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py index 3592e48b98eb90e99d56f3b9a82edbd12b6ff56e..d69121045501a9f6a242fc9564d641d920cc10c8 100644 --- a/geomagio/api/secure/metadata.py +++ b/geomagio/api/secure/metadata.py @@ -36,8 +36,7 @@ async def create_metadata( user: User = Depends(require_user()), ): created_metadata = await metadata_table.create_metadata(metadata) - print(metadata.to_json()) - return Response(metadata.to_json(), status_code=201, media_type="application/json") + return Response(metadata.json(), status_code=201, media_type="application/json") @router.delete("/metadata/{id}") diff --git a/geomagio/metadata/Metadata.py b/geomagio/metadata/Metadata.py index eb8f5b8fd8aa764bd4a8f041badd772cd1f02b33..ce2ad5211ac07c5023c4821396a8abe1ed1fd4f5 100644 --- a/geomagio/metadata/Metadata.py +++ b/geomagio/metadata/Metadata.py @@ -1,5 +1,4 @@ from datetime import timezone -import json from typing import Dict from obspy import UTCDateTime @@ -88,6 +87,3 @@ class Metadata(BaseModel): @validator("created_time") def set_default_created_time(cls, created_time: UTCDateTime = None) -> UTCDateTime: return created_time or UTCDateTime() - - def to_json(self): - return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True, indent=4)