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

Finish integration tests for channel moving

Browse source 
Refactor channel store to combine the channels_by_id and channel_paths into a 'ChannelIndex'
This commit is contained in:
Mikayla 2023-09-08 15:58:08 -07:00
parent 9e68d4a8ea
commit 3a62d2988a
No known key found for this signature in database
5 changed files with 214 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/rpc.rs
View file

@ -2400,7 +2400,7 @@ async fn move_channel(
let channel_id = ChannelId::from_proto(request.channel_id);
let from_parent = request.from_parent.map(ChannelId::from_proto);
let to = request.to.map(ChannelId::from_proto);
let channels = db
let channels_to_send = db
.move_channel(
session.user_id,
channel_id,
@ -2432,7 +2432,7 @@ async fn move_channel(
let members = db.get_channel_members(to).await?;
let connection_pool = session.connection_pool().await;
let update = proto::UpdateChannels {
channels: channels.into_iter().map(|channel| proto::Channel {
channels: channels_to_send.into_iter().map(|channel| proto::Channel {
id: channel.id.to_proto(),
name: channel.name,
parent_id: channel.parent_id.map(ChannelId::to_proto),