Wrong id probably being returned

Author: stephen-riggs

src/murfey/workflows/spa/flush_spa_preprocess.py

@@ -110,7 +110,7 @@ def register_foil_hole(
     gs_name: int,
     foil_hole_params: FoilHoleParameters,
     murfey_db: Session,
-) -> bool:
+) -> Optional[int]:
     try:
         gs = murfey_db.exec(
             select(GridSquare)
@@ -123,7 +123,7 @@ def register_foil_hole(
         logger.warning(
             f"Foil hole {sanitise(str(foil_hole_params.name))} could not be registered as grid square {sanitise(str(gs_name))} was not found"
         )
-        return False
+        return None
     secured_foil_hole_image_path = secure_filename(foil_hole_params.image)
     if foil_hole_params.image and Path(secured_foil_hole_image_path).is_file():
         jpeg_size = Image.open(secured_foil_hole_image_path).size
@@ -193,7 +193,7 @@ def register_foil_hole(
     murfey_db.add(foil_hole)
     murfey_db.commit()
     murfey_db.close()
-    return True
+    return foil_hole.id
 
 
 def _grid_square_metadata_file(f: Path, grid_square: int) -> Optional[Path]:
@@ -288,10 +288,7 @@ def _flush_position_analysis(
             name=foil_hole,
         )
     # Insert or update this foil hole in the database
-    registered_hole = register_foil_hole(
-        session_id, gs.id, foil_hole_parameters, murfey_db
-    )
-    return foil_hole if registered_hole else None
+    return register_foil_hole(session_id, gs.id, foil_hole_parameters, murfey_db)
 
 
 def flush_spa_preprocess(message: dict, murfey_db: Session, demo: bool = False) -> bool: