Continued:

[fba.git] / fba / models / blocks.py

diff --git a/fba/models/blocks.py b/fba/models/blocks.py
index d7e71218cc59ccfee9154b7aabe9850c8447ca87..6b8edefbc127c2780e16aff82b1e50472cb526ea 100644 (file)
--- a/fba/models/blocks.py
+++ b/fba/models/blocks.py
@@ -174,16 +174,20 @@ def add_instance(blocker: str, blocked: str, reason: str, block_level: str):
 
     logger.debug("EXIT!")
 
-def is_valid_level(block_level: str) -> bool:
-    logger.debug("block_level='%s' - CALLED!", block_level)
-    if not isinstance(block_level, str):
-        raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not of type 'str'")
-    elif block_level == "":
-        raise ValueError("Parameter 'block_level' is empty")
+def valid(value: str, column: str) -> bool:
+    logger.debug("value='%s' - CALLED!", value)
+    if not isinstance(value, str):
+        raise ValueError(f"Parameter value[]='{type(value)}' is not of type 'str'")
+    elif value == "":
+        raise ValueError("Parameter 'value' is empty")
+    elif not isinstance(column, str):
+        raise columnError(f"Parameter column[]='{type(column)}' is not of type 'str'")
+    elif column == "":
+        raise columnError("Parameter 'column' is empty")
 
     # Query database
     database.cursor.execute(
-        "SELECT block_level FROM blocks WHERE block_level = ? LIMIT 1", [block_level]
+        f"SELECT {column} FROM blocks WHERE {column} = ? LIMIT 1", [value]
     )
 
     valid = database.cursor.fetchone() is not None