Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new get_channel_descendants for delete

Browse source
This commit is contained in:
Conrad Irwin 2023-10-13 13:17:19 -06:00
parent a8e352a473
commit 9c6f5de551
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/collab/src/db/queries/channels.rs
View file

@ -125,17 +125,19 @@ impl Database {
.await?; .await?;
// Don't remove descendant channels that have additional parents. // Don't remove descendant channels that have additional parents.
let mut channels_to_remove = self.get_channel_descendants([channel_id], &*tx).await?; let mut channels_to_remove: HashSet<ChannelId> = HashSet::default();
channels_to_remove.insert(channel_id);
let graph = self.get_channel_descendants_2([channel_id], &*tx).await?;
for edge in graph.iter() {
channels_to_remove.insert(ChannelId::from_proto(edge.channel_id));
}
{ {
let mut channels_to_keep = channel_path::Entity::find() let mut channels_to_keep = channel_path::Entity::find()
.filter( .filter(
channel_path::Column::ChannelId channel_path::Column::ChannelId
.is_in( .is_in(channels_to_remove.clone())
channels_to_remove
.keys()
.copied()
.filter(|&id| id != channel_id),
)
.and( .and(
channel_path::Column::IdPath channel_path::Column::IdPath
.not_like(&format!("%/{}/%", channel_id)), .not_like(&format!("%/{}/%", channel_id)),
@ -160,7 +162,7 @@ impl Database {
.await?; .await?;
channel::Entity::delete_many() channel::Entity::delete_many()
.filter(channel::Column::Id.is_in(channels_to_remove.keys().copied())) .filter(channel::Column::Id.is_in(channels_to_remove.clone()))
.exec(&*tx) .exec(&*tx)
.await?; .await?;
@ -177,7 +179,7 @@ impl Database {
); );
tx.execute(channel_paths_stmt).await?; tx.execute(channel_paths_stmt).await?;
Ok((channels_to_remove.into_keys().collect(), members_to_notify)) Ok((channels_to_remove.into_iter().collect(), members_to_notify))
}) })
.await .await
} }