From 16fc70b6badf3ac88b92665d6d64cf3c02cecbfb Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Wed, 14 Jul 2021 15:34:24 -0600
Subject: [PATCH] remove metadata_valid from api
---
geomagio/api/db/MetadataDatabaseFactory.py | 3 ---
geomagio/api/db/metadata_table.py | 3 ---
geomagio/api/secure/metadata.py | 2 --
geomagio/api/ws/metadata.py | 2 --
4 files changed, 10 deletions(-)
diff --git a/geomagio/api/db/MetadataDatabaseFactory.py b/geomagio/api/db/MetadataDatabaseFactory.py
index 83cdde6cf..8782ea4bb 100644
--- a/geomagio/api/db/MetadataDatabaseFactory.py
+++ b/geomagio/api/db/MetadataDatabaseFactory.py
@@ -43,7 +43,6 @@ class MetadataDatabaseFactory(object):
channel,
location,
data_valid,
- metadata_valid,
status,
) = params.datetime_dict().values()
if id:
@@ -78,8 +77,6 @@ class MetadataDatabaseFactory(object):
query = query.where(table.c.created_time < created_before)
if data_valid is not None:
query = query.where(table.c.data_valid == data_valid)
- if metadata_valid is not None:
- query = query.where(table.c.metadata_valid == metadata_valid)
if status is not None:
query = query.where(table.c.status.in_(status))
rows = await self.database.fetch_all(query)
diff --git a/geomagio/api/db/metadata_table.py b/geomagio/api/db/metadata_table.py
index e55e66878..6b5716db5 100644
--- a/geomagio/api/db/metadata_table.py
+++ b/geomagio/api/db/metadata_table.py
@@ -38,8 +38,6 @@ metadata = Table(
Column("priority", Integer, default=1),
# whether data is valid (primarily for flags)
Column("data_valid", Boolean, default=True, index=True),
- # whether metadata is valid (based on review)
- Column("metadata_valid", Boolean, default=True, index=True),
# deletion status indicator
Column("status", String(length=255), nullable=True),
# metadata json blob
@@ -62,7 +60,6 @@ metadata = Table(
"starttime",
"endtime",
# valid
- "metadata_valid",
"data_valid",
"status",
),
diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py
index ac8113acf..e5acb0849 100644
--- a/geomagio/api/secure/metadata.py
+++ b/geomagio/api/secure/metadata.py
@@ -40,7 +40,6 @@ def get_metadata_query(
channel: str = None,
location: str = None,
data_valid: bool = None,
- metadata_valid: bool = True,
status: List[str] = Query(None),
) -> MetadataQuery:
return MetadataQuery(
@@ -54,7 +53,6 @@ def get_metadata_query(
channel=channel,
location=location,
data_valid=data_valid,
- metadata_valid=metadata_valid,
status=status,
)
diff --git a/geomagio/api/ws/metadata.py b/geomagio/api/ws/metadata.py
index fb5627a05..1775569a4 100644
--- a/geomagio/api/ws/metadata.py
+++ b/geomagio/api/ws/metadata.py
@@ -24,7 +24,6 @@ async def get_metadata(
channel: str = None,
location: str = None,
data_valid: bool = None,
- metadata_valid: bool = True,
status: List[str] = Query(None),
):
query = MetadataQuery(
@@ -36,7 +35,6 @@ async def get_metadata(
channel=channel,
location=location,
data_valid=data_valid,
- metadata_valid=metadata_valid,
status=status,
)
metas = await MetadataDatabaseFactory(database=database).get_metadata(
--
GitLab