From 830a25b9fe48fad6ef2ee4c6b6bac2a319aa7c30 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Wed, 17 Mar 2021 15:01:35 -0600
Subject: [PATCH 1/4] Return metadata from PUT
---
geomagio/api/secure/metadata.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py
index 7126a1ac..6435d826 100644
--- a/geomagio/api/secure/metadata.py
+++ b/geomagio/api/secure/metadata.py
@@ -91,5 +91,6 @@ async def update_metadata(
id: int,
metadata: Metadata = Body(...),
user: User = Depends(require_user([os.getenv("REVIEWER_GROUP", "reviewer")])),
-):
+) -> Metadata:
await metadata_table.update_metadata(metadata)
+ return metadata
--
GitLab
From 8412b567e5a8cc8edd3aaa025474f797c57f3ea9 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Thu, 18 Mar 2021 10:17:10 -0600
Subject: [PATCH 2/4] Read updated record by id
---
geomagio/api/secure/metadata.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py
index 6435d826..97fe43c3 100644
--- a/geomagio/api/secure/metadata.py
+++ b/geomagio/api/secure/metadata.py
@@ -86,11 +86,11 @@ async def get_metadata_by_id(id: int):
return meta[0]
-@router.put("/metadata/{id}")
+@router.put("/metadata/{id}", response_model=Metadata)
async def update_metadata(
id: int,
metadata: Metadata = Body(...),
user: User = Depends(require_user([os.getenv("REVIEWER_GROUP", "reviewer")])),
-) -> Metadata:
+):
await metadata_table.update_metadata(metadata)
- return metadata
+ return get_metadata_by_id(metadata.id)
--
GitLab
From 8a79203ea197c2ff406552efe92bd17557fe6848 Mon Sep 17 00:00:00 2001
From: Jeremy M Fee <jmfee@usgs.gov>
Date: Thu, 18 Mar 2021 16:49:19 +0000
Subject: [PATCH 3/4] Use await when calling get_metadata_by_id
---
geomagio/api/secure/metadata.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py
index 97fe43c3..ddb5ba94 100644
--- a/geomagio/api/secure/metadata.py
+++ b/geomagio/api/secure/metadata.py
@@ -93,4 +93,6 @@ async def update_metadata(
user: User = Depends(require_user([os.getenv("REVIEWER_GROUP", "reviewer")])),
):
await metadata_table.update_metadata(metadata)
- return get_metadata_by_id(metadata.id)
+ # should be same, but read from database
+ return await get_metadata_by_id(metadata.id)
+
--
GitLab
From 9bb0072aef7ab0ac3ccba8e5b2e6937f3fa9c331 Mon Sep 17 00:00:00 2001
From: Jeremy M Fee <jmfee@usgs.gov>
Date: Thu, 18 Mar 2021 16:54:04 +0000
Subject: [PATCH 4/4] Remove extra newline
---
geomagio/api/secure/metadata.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py
index ddb5ba94..710128d1 100644
--- a/geomagio/api/secure/metadata.py
+++ b/geomagio/api/secure/metadata.py
@@ -95,4 +95,3 @@ async def update_metadata(
await metadata_table.update_metadata(metadata)
# should be same, but read from database
return await get_metadata_by_id(metadata.id)
-
--
GitLab