Added soft deletes to all deletion functions and added deleted_at filters as required
This commit is contained in:
@@ -283,9 +283,9 @@ def reconcile_deleted_memberships() -> dict:
|
||||
if not device or not network:
|
||||
logger.warning(
|
||||
f"[Reconciliation] Membership {membership.id}: missing "
|
||||
f"{'device' if not device else 'network'} — hard-deleting record only."
|
||||
f"{'device' if not device else 'network'} — soft-deleting record only."
|
||||
)
|
||||
db.session.delete(membership)
|
||||
membership.delete(soft=True)
|
||||
db.session.commit()
|
||||
results["deleted"] += 1
|
||||
continue
|
||||
@@ -304,20 +304,20 @@ def reconcile_deleted_memberships() -> dict:
|
||||
except Exception as zt_exc:
|
||||
logger.warning(
|
||||
f"[Reconciliation] ZT delete failed for node {node_id} "
|
||||
f"on {network_label}: {zt_exc} — proceeding with DB hard-delete."
|
||||
f"on {network_label}: {zt_exc} — proceeding with DB soft-delete."
|
||||
)
|
||||
|
||||
db.session.delete(membership)
|
||||
membership.delete(soft=True)
|
||||
db.session.commit()
|
||||
results["deleted"] += 1
|
||||
logger.debug(
|
||||
f"[Reconciliation] Hard-deleted membership {membership.id} "
|
||||
f"[Reconciliation] Soft-deleted membership {membership.id} "
|
||||
f"(node={node_id}, network={network_label})."
|
||||
)
|
||||
|
||||
except Exception as exc:
|
||||
logger.error(
|
||||
f"[Reconciliation] Failed to hard-delete membership {membership.id}: {exc}",
|
||||
f"[Reconciliation] Failed to soft-delete membership {membership.id}: {exc}",
|
||||
exc_info=True,
|
||||
)
|
||||
results["errors"] += 1
|
||||
|
||||
Reference in New Issue
Block a user