Merge pull request #2677 from camptocamp/backport/2675-to-master

[Backport master] Prevent error on postgresql_id attribute
camptocamp · Dec 20, 2024 · e222762 · e222762
2 parents 16c28f7 + 99b0ba4
commit e222762
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/tilecloud_chain/store/postgresql.py b/tilecloud_chain/store/postgresql.py
@@ -590,10 +590,23 @@ def delete_one(self, tile: Tile) -> Tile:
         with self.SessionMaker() as session:
             if tile.error:
                 if isinstance(tile.error, Exception):
-                    _LOGGER.warning("Error while processing the tile %s", tile, exc_info=tile.error)
+                    _LOGGER.warning(
+                        "Error while processing the tile %s %s",
+                        tile.tilecoord,
+                        tile.formated_metadata,
+                        exc_info=tile.error,
+                    )
+
+                if not hasattr(tile, "postgresql_id"):
+                    _LOGGER.error(
+                        "The tile %s %s does not have the postgresql_id attribute",
+                        tile.tilecoord,
+                        tile.formated_metadata,
+                    )
+                    return tile
                 sqlalchemy_tile = (
                     session.query(Queue)
-                    .where(and_(Queue.status == _STATUS_PENDING, Queue.id == tile.postgresql_id))  # type: ignore[attr-defined]
+                    .where(and_(Queue.status == _STATUS_PENDING, Queue.id == tile.postgresql_id))
                     .with_for_update(of=Queue)
                     .first()
                 )
@@ -602,8 +615,16 @@ def delete_one(self, tile: Tile) -> Tile:
                     sqlalchemy_tile.error = str(tile.error)  # type: ignore[assignment]
                     session.commit()
             else:
+                if not hasattr(tile, "postgresql_id"):
+                    _LOGGER.error(
+                        "The tile %s %s does not have the postgresql_id attribute",
+                        tile.tilecoord,
+                        tile.formated_metadata,
+                    )
+                    return tile
+
                 session.query(Queue).where(
-                    and_(Queue.status == _STATUS_PENDING, Queue.id == tile.postgresql_id)  # type: ignore[attr-defined]
+                    and_(Queue.status == _STATUS_PENDING, Queue.id == tile.postgresql_id)
                 ).delete()
                 session.commit()
         return tile