refactor: Improve error handling and messaging in miniatures and force services; update test cases for clarity

Author: cantis

app/blueprints/miniatures.py

@@ -141,7 +141,8 @@ def add():
                     "notes": form.get("notes"),
                 }
                 flash(
-                    f"Unique ID {unique_id} already exists in Series {series}. Suggested next ID: {next_unique}",
+                    f"""Unique ID {unique_id} already exists in Series {series}.
+                      Suggested next ID: {next_unique}""",
                     "danger",
                 )
                 available_factions = get_distinct_factions()

app/services/force_service.py

@@ -338,8 +338,8 @@ def import_force_from_json(file_path: str) -> dict[str, Any]:
 
     try:
         data = json.loads(filepath.read_text(encoding="utf-8"))
-    except FileNotFoundError:
-        raise ValueError(f"File not found: {file_path}")
+    except FileNotFoundError as err:
+        raise ValueError(f"File not found: {file_path}") from err
 
     force_name = data.get("force_name", "Imported Force")
 

tests/conftest.py

@@ -405,11 +405,13 @@ def validate_expunged_object(obj, *attributes):
     """
     from sqlalchemy.orm.exc import DetachedInstanceError
 
-    try:
-        for attr in attributes:
+    for attr in attributes:
+        try:
             _ = getattr(obj, attr)
-    except DetachedInstanceError as e:
-        raise AssertionError(f"Object {obj} not properly expunged - cannot access {attr}: {e}")
+        except DetachedInstanceError as e:
+            raise AssertionError(
+                f"Object {obj} not properly expunged - cannot access {attr}: {e}"
+            ) from e
 
 
 def assert_single_active_force(forces):

tests/test_lance_template_service_integration.py

@@ -245,7 +245,7 @@ def test_import_creates_from_export(client):
         temp_path = f.name
 
     try:
-        result = import_templates_from_json(temp_path)
+        import_templates_from_json(temp_path)
 
         templates = get_all_templates()
         assert len(templates) == 3
@@ -297,7 +297,7 @@ def test_import_merge_updates_existing(client):
         temp_path = f.name
 
     try:
-        result = import_templates_from_json(temp_path)
+        import_templates_from_json(temp_path)
 
         templates = get_all_templates()
         assert len(templates) == 2  # No new templates created

tests/test_lance_template_service_unit.py

@@ -166,7 +166,7 @@ def test_import_skips_invalid_entries(client):
         temp_path = f.name
 
     try:
-        result = import_templates_from_json(temp_path)
+        import_templates_from_json(temp_path)
 
         # Only 2 valid templates should be imported
         templates = get_all_templates()