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

Include every user in their own list of contacts

Browse source
This commit is contained in:
Max Brunsfeld 2022-05-10 14:05:07 -07:00
parent dc465839e1
commit 334f246df3
2 changed files with 141 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/collab/src/db.rs
View file

@ -201,7 +201,7 @@ impl Db for PostgresDb {
.bind(user_id) .bind(user_id)
.fetch(&self.pool); .fetch(&self.pool);
let mut current = Vec::new(); let mut current = vec![user_id];
let mut outgoing_requests = Vec::new(); let mut outgoing_requests = Vec::new();
let mut incoming_requests = Vec::new(); let mut incoming_requests = Vec::new();
while let Some(row) = rows.next().await { while let Some(row) = rows.next().await {
@ -232,6 +232,10 @@ impl Db for PostgresDb {
} }
} }
current.sort_unstable();
outgoing_requests.sort_unstable();
incoming_requests.sort_unstable();
Ok(Contacts { Ok(Contacts {
current, current,
outgoing_requests, outgoing_requests,
@ -704,7 +708,7 @@ pub struct Contacts {
pub outgoing_requests: Vec<UserId>, pub outgoing_requests: Vec<UserId>,
} }
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
pub struct IncomingContactRequest { pub struct IncomingContactRequest {
pub requester_id: UserId, pub requester_id: UserId,
pub should_notify: bool, pub should_notify: bool,
@ -944,7 +948,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_1).await.unwrap(), db.get_contacts(user_1).await.unwrap(),
Contacts { Contacts {
current: vec![], current: vec![user_1],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -955,7 +959,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_1).await.unwrap(), db.get_contacts(user_1).await.unwrap(),
Contacts { Contacts {
current: vec![], current: vec![user_1],
outgoing_requests: vec![user_2], outgoing_requests: vec![user_2],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -963,7 +967,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_2).await.unwrap(), db.get_contacts(user_2).await.unwrap(),
Contacts { Contacts {
current: vec![], current: vec![user_2],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![IncomingContactRequest { incoming_requests: vec![IncomingContactRequest {
requester_id: user_1, requester_id: user_1,
@ -981,7 +985,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_2).await.unwrap(), db.get_contacts(user_2).await.unwrap(),
Contacts { Contacts {
current: vec![], current: vec![user_2],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![IncomingContactRequest { incoming_requests: vec![IncomingContactRequest {
requester_id: user_1, requester_id: user_1,
@ -1002,7 +1006,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_1).await.unwrap(), db.get_contacts(user_1).await.unwrap(),
Contacts { Contacts {
current: vec![user_2], current: vec![user_1, user_2],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -1010,7 +1014,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_2).await.unwrap(), db.get_contacts(user_2).await.unwrap(),
Contacts { Contacts {
current: vec![user_1], current: vec![user_1, user_2],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -1027,7 +1031,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_1).await.unwrap(), db.get_contacts(user_1).await.unwrap(),
Contacts { Contacts {
current: vec![user_2, user_3], current: vec![user_1, user_2, user_3],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -1035,7 +1039,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_3).await.unwrap(), db.get_contacts(user_3).await.unwrap(),
Contacts { Contacts {
current: vec![user_1], current: vec![user_1, user_3],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -1049,7 +1053,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_2).await.unwrap(), db.get_contacts(user_2).await.unwrap(),
Contacts { Contacts {
current: vec![user_1], current: vec![user_1, user_2],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -1057,7 +1061,7 @@ pub mod tests {
assert_eq!( assert_eq!(
db.get_contacts(user_3).await.unwrap(), db.get_contacts(user_3).await.unwrap(),
Contacts { Contacts {
current: vec![user_1], current: vec![user_1, user_3],
outgoing_requests: vec![], outgoing_requests: vec![],
incoming_requests: vec![], incoming_requests: vec![],
}, },
@ -1217,7 +1221,7 @@ pub mod tests {
async fn get_contacts(&self, id: UserId) -> Result<Contacts> { async fn get_contacts(&self, id: UserId) -> Result<Contacts> {
self.background.simulate_random_delay().await; self.background.simulate_random_delay().await;
let mut current = Vec::new(); let mut current = vec![id];
let mut outgoing_requests = Vec::new(); let mut outgoing_requests = Vec::new();
let mut incoming_requests = Vec::new(); let mut incoming_requests = Vec::new();
@ -1240,6 +1244,10 @@ pub mod tests {
} }
} }
current.sort_unstable();
outgoing_requests.sort_unstable();
incoming_requests.sort_unstable();
Ok(Contacts { Ok(Contacts {
current, current,
outgoing_requests, outgoing_requests,

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

@ -376,11 +376,14 @@ impl Server {
request: TypedEnvelope<proto::RegisterProject>, request: TypedEnvelope<proto::RegisterProject>,
response: Response<proto::RegisterProject>, response: Response<proto::RegisterProject>,
) -> Result<()> { ) -> Result<()> {
let project_id = { let user_id;
let project_id;
{
let mut state = self.store_mut().await; let mut state = self.store_mut().await;
let user_id = state.user_id_for_connection(request.sender_id)?; user_id = state.user_id_for_connection(request.sender_id)?;
state.register_project(request.sender_id, user_id) project_id = state.register_project(request.sender_id, user_id);
}; };
self.update_user_contacts(user_id).await?;
response.send(proto::RegisterProjectResponse { project_id })?; response.send(proto::RegisterProjectResponse { project_id })?;
Ok(()) Ok(())
} }
@ -5007,25 +5010,20 @@ mod tests {
(&client_c, cx_c), (&client_c, cx_c),
]) ])
.await; .await;
deterministic.run_until_parked(); deterministic.run_until_parked();
client_a.user_store.read_with(cx_a, |store, _| { for (client, cx) in [(&client_a, &cx_a), (&client_b, &cx_b), (&client_c, &cx_c)] {
client.user_store.read_with(*cx, |store, _| {
assert_eq!( assert_eq!(
contacts(store), contacts(store),
[("user_b", true, vec![]), ("user_c", true, vec![])] [
) ("user_a", true, vec![]),
}); ("user_b", true, vec![]),
client_b.user_store.read_with(cx_b, |store, _| { ("user_c", true, vec![])
assert_eq!( ]
contacts(store),
[("user_a", true, vec![]), ("user_c", true, vec![])]
)
});
client_c.user_store.read_with(cx_c, |store, _| {
assert_eq!(
contacts(store),
[("user_a", true, vec![]), ("user_b", true, vec![])]
) )
}); });
}
// Share a worktree as client A. // Share a worktree as client A.
fs.create_dir(Path::new("/a")).await.unwrap(); fs.create_dir(Path::new("/a")).await.unwrap();
@ -5050,30 +5048,18 @@ mod tests {
.await; .await;
deterministic.run_until_parked(); deterministic.run_until_parked();
client_a.user_store.read_with(cx_a, |store, _| { for (client, cx) in [(&client_a, &cx_a), (&client_b, &cx_b), (&client_c, &cx_c)] {
assert_eq!( client.user_store.read_with(*cx, |store, _| {
contacts(store),
[("user_b", true, vec![]), ("user_c", true, vec![])]
)
});
client_b.user_store.read_with(cx_b, |store, _| {
assert_eq!( assert_eq!(
contacts(store), contacts(store),
[ [
("user_a", true, vec![("a", false, vec![])]), ("user_a", true, vec![("a", false, vec![])]),
("user_b", true, vec![]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ]
) )
}); });
client_c.user_store.read_with(cx_c, |store, _| { }
assert_eq!(
contacts(store),
[
("user_a", true, vec![("a", false, vec![])]),
("user_b", true, vec![])
]
)
});
let project_id = project_a let project_id = project_a
.update(cx_a, |project, _| project.next_remote_id()) .update(cx_a, |project, _| project.next_remote_id())
@ -5082,31 +5068,20 @@ mod tests {
.update(cx_a, |project, cx| project.share(cx)) .update(cx_a, |project, cx| project.share(cx))
.await .await
.unwrap(); .unwrap();
deterministic.run_until_parked(); deterministic.run_until_parked();
client_a.user_store.read_with(cx_a, |store, _| { for (client, cx) in [(&client_a, &cx_a), (&client_b, &cx_b), (&client_c, &cx_c)] {
assert_eq!( client.user_store.read_with(*cx, |store, _| {
contacts(store),
[("user_b", true, vec![]), ("user_c", true, vec![])]
)
});
client_b.user_store.read_with(cx_b, |store, _| {
assert_eq!( assert_eq!(
contacts(store), contacts(store),
[ [
("user_a", true, vec![("a", true, vec![])]), ("user_a", true, vec![("a", true, vec![])]),
("user_b", true, vec![]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ]
) )
}); });
client_c.user_store.read_with(cx_c, |store, _| { }
assert_eq!(
contacts(store),
[
("user_a", true, vec![("a", true, vec![])]),
("user_b", true, vec![])
]
)
});
let _project_b = Project::remote( let _project_b = Project::remote(
project_id, project_id,
@ -5118,31 +5093,20 @@ mod tests {
) )
.await .await
.unwrap(); .unwrap();
deterministic.run_until_parked(); deterministic.run_until_parked();
client_a.user_store.read_with(cx_a, |store, _| { for (client, cx) in [(&client_a, &cx_a), (&client_b, &cx_b), (&client_c, &cx_c)] {
assert_eq!( client.user_store.read_with(*cx, |store, _| {
contacts(store),
[("user_b", true, vec![]), ("user_c", true, vec![])]
)
});
client_b.user_store.read_with(cx_b, |store, _| {
assert_eq!( assert_eq!(
contacts(store), contacts(store),
[ [
("user_a", true, vec![("a", true, vec!["user_b"])]), ("user_a", true, vec![("a", true, vec!["user_b"])]),
("user_b", true, vec![]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ]
) )
}); });
client_c.user_store.read_with(cx_c, |store, _| { }
assert_eq!(
contacts(store),
[
("user_a", true, vec![("a", true, vec!["user_b"])]),
("user_b", true, vec![])
]
)
});
project_a project_a
.condition(&cx_a, |project, _| { .condition(&cx_a, |project, _| {
@ -5152,41 +5116,34 @@ mod tests {
cx_a.update(move |_| drop(project_a)); cx_a.update(move |_| drop(project_a));
deterministic.run_until_parked(); deterministic.run_until_parked();
client_a.user_store.read_with(cx_a, |store, _| { for (client, cx) in [(&client_a, &cx_a), (&client_b, &cx_b), (&client_c, &cx_c)] {
client.user_store.read_with(*cx, |store, _| {
assert_eq!( assert_eq!(
contacts(store), contacts(store),
[("user_b", true, vec![]), ("user_c", true, vec![])] [
) ("user_a", true, vec![]),
}); ("user_b", true, vec![]),
client_b.user_store.read_with(cx_b, |store, _| { ("user_c", true, vec![])
assert_eq!( ]
contacts(store),
[("user_a", true, vec![]), ("user_c", true, vec![])]
)
});
client_c.user_store.read_with(cx_c, |store, _| {
assert_eq!(
contacts(store),
[("user_a", true, vec![]), ("user_b", true, vec![])]
) )
}); });
}
server.disconnect_client(client_c.current_user_id(cx_c)); server.disconnect_client(client_c.current_user_id(cx_c));
server.forbid_connections(); server.forbid_connections();
deterministic.advance_clock(rpc::RECEIVE_TIMEOUT); deterministic.advance_clock(rpc::RECEIVE_TIMEOUT);
for (client, cx) in [(&client_a, &cx_a), (&client_b, &cx_b)] {
client_a.user_store.read_with(cx_a, |store, _| { client.user_store.read_with(*cx, |store, _| {
assert_eq!( assert_eq!(
contacts(store), contacts(store),
[("user_b", true, vec![]), ("user_c", false, vec![])] [
) ("user_a", true, vec![]),
}); ("user_b", true, vec![]),
client_b.user_store.read_with(cx_b, |store, _| { ("user_c", false, vec![])
assert_eq!( ]
contacts(store),
[("user_a", true, vec![]), ("user_c", false, vec![])]
) )
}); });
}
client_c client_c
.user_store .user_store
.read_with(cx_c, |store, _| assert_eq!(contacts(store), [])); .read_with(cx_c, |store, _| assert_eq!(contacts(store), []));
@ -5196,25 +5153,20 @@ mod tests {
.authenticate_and_connect(false, &cx_c.to_async()) .authenticate_and_connect(false, &cx_c.to_async())
.await .await
.unwrap(); .unwrap();
deterministic.run_until_parked(); deterministic.run_until_parked();
client_a.user_store.read_with(cx_a, |store, _| { for (client, cx) in [(&client_a, &cx_a), (&client_b, &cx_b), (&client_c, &cx_c)] {
client.user_store.read_with(*cx, |store, _| {
assert_eq!( assert_eq!(
contacts(store), contacts(store),
[("user_b", true, vec![]), ("user_c", true, vec![])] [
) ("user_a", true, vec![]),
}); ("user_b", true, vec![]),
client_b.user_store.read_with(cx_b, |store, _| { ("user_c", true, vec![])
assert_eq!( ]
contacts(store),
[("user_a", true, vec![]), ("user_c", true, vec![])]
)
});
client_c.user_store.read_with(cx_c, |store, _| {
assert_eq!(
contacts(store),
[("user_a", true, vec![]), ("user_b", true, vec![])]
) )
}); });
}
fn contacts(user_store: &UserStore) -> Vec<(&str, bool, Vec<(&str, bool, Vec<&str>)>)> { fn contacts(user_store: &UserStore) -> Vec<(&str, bool, Vec<(&str, bool, Vec<&str>)>)> {
user_store user_store
@ -5341,18 +5293,18 @@ mod tests {
// User B sees user A as their contact now in all client, and the incoming request from them is removed. // User B sees user A as their contact now in all client, and the incoming request from them is removed.
let contacts_b = client_b.summarize_contacts(&cx_b); let contacts_b = client_b.summarize_contacts(&cx_b);
assert_eq!(contacts_b.current, &["user_a"]); assert_eq!(contacts_b.current, &["user_a", "user_b"]);
assert_eq!(contacts_b.incoming_requests, &["user_c"]); assert_eq!(contacts_b.incoming_requests, &["user_c"]);
let contacts_b2 = client_b2.summarize_contacts(&cx_b2); let contacts_b2 = client_b2.summarize_contacts(&cx_b2);
assert_eq!(contacts_b2.current, &["user_a"]); assert_eq!(contacts_b2.current, &["user_a", "user_b"]);
assert_eq!(contacts_b2.incoming_requests, &["user_c"]); assert_eq!(contacts_b2.incoming_requests, &["user_c"]);
// User A sees user B as their contact now in all clients, and the outgoing request to them is removed. // User A sees user B as their contact now in all clients, and the outgoing request to them is removed.
let contacts_a = client_a.summarize_contacts(&cx_a); let contacts_a = client_a.summarize_contacts(&cx_a);
assert_eq!(contacts_a.current, &["user_b"]); assert_eq!(contacts_a.current, &["user_a", "user_b"]);
assert!(contacts_a.outgoing_requests.is_empty()); assert!(contacts_a.outgoing_requests.is_empty());
let contacts_a2 = client_a2.summarize_contacts(&cx_a2); let contacts_a2 = client_a2.summarize_contacts(&cx_a2);
assert_eq!(contacts_a2.current, &["user_b"]); assert_eq!(contacts_a2.current, &["user_a", "user_b"]);
assert!(contacts_a2.outgoing_requests.is_empty()); assert!(contacts_a2.outgoing_requests.is_empty());
// Contacts are present upon connecting (tested here via disconnect/reconnect) // Contacts are present upon connecting (tested here via disconnect/reconnect)
@ -5360,13 +5312,19 @@ mod tests {
disconnect_and_reconnect(&client_b, cx_b).await; disconnect_and_reconnect(&client_b, cx_b).await;
disconnect_and_reconnect(&client_c, cx_c).await; disconnect_and_reconnect(&client_c, cx_c).await;
executor.run_until_parked(); executor.run_until_parked();
assert_eq!(client_a.summarize_contacts(&cx_a).current, &["user_b"]); assert_eq!(
assert_eq!(client_b.summarize_contacts(&cx_b).current, &["user_a"]); client_a.summarize_contacts(&cx_a).current,
&["user_a", "user_b"]
);
assert_eq!(
client_b.summarize_contacts(&cx_b).current,
&["user_a", "user_b"]
);
assert_eq!( assert_eq!(
client_b.summarize_contacts(&cx_b).incoming_requests, client_b.summarize_contacts(&cx_b).incoming_requests,
&["user_c"] &["user_c"]
); );
assert!(client_c.summarize_contacts(&cx_c).current.is_empty()); assert_eq!(client_c.summarize_contacts(&cx_c).current, &["user_c"]);
assert_eq!( assert_eq!(
client_c.summarize_contacts(&cx_c).outgoing_requests, client_c.summarize_contacts(&cx_c).outgoing_requests,
&["user_b"] &["user_b"]
@ -5385,18 +5343,18 @@ mod tests {
// User B doesn't see user C as their contact, and the incoming request from them is removed. // User B doesn't see user C as their contact, and the incoming request from them is removed.
let contacts_b = client_b.summarize_contacts(&cx_b); let contacts_b = client_b.summarize_contacts(&cx_b);
assert_eq!(contacts_b.current, &["user_a"]); assert_eq!(contacts_b.current, &["user_a", "user_b"]);
assert!(contacts_b.incoming_requests.is_empty()); assert!(contacts_b.incoming_requests.is_empty());
let contacts_b2 = client_b2.summarize_contacts(&cx_b2); let contacts_b2 = client_b2.summarize_contacts(&cx_b2);
assert_eq!(contacts_b2.current, &["user_a"]); assert_eq!(contacts_b2.current, &["user_a", "user_b"]);
assert!(contacts_b2.incoming_requests.is_empty()); assert!(contacts_b2.incoming_requests.is_empty());
// User C doesn't see user B as their contact, and the outgoing request to them is removed. // User C doesn't see user B as their contact, and the outgoing request to them is removed.
let contacts_c = client_c.summarize_contacts(&cx_c); let contacts_c = client_c.summarize_contacts(&cx_c);
assert!(contacts_c.current.is_empty()); assert_eq!(contacts_c.current, &["user_c"]);
assert!(contacts_c.outgoing_requests.is_empty()); assert!(contacts_c.outgoing_requests.is_empty());
let contacts_c2 = client_c2.summarize_contacts(&cx_c2); let contacts_c2 = client_c2.summarize_contacts(&cx_c2);
assert!(contacts_c2.current.is_empty()); assert_eq!(contacts_c2.current, &["user_c"]);
assert!(contacts_c2.outgoing_requests.is_empty()); assert!(contacts_c2.outgoing_requests.is_empty());
// Incoming/outgoing requests are not present upon connecting (tested here via disconnect/reconnect) // Incoming/outgoing requests are not present upon connecting (tested here via disconnect/reconnect)
@ -5404,13 +5362,19 @@ mod tests {
disconnect_and_reconnect(&client_b, cx_b).await; disconnect_and_reconnect(&client_b, cx_b).await;
disconnect_and_reconnect(&client_c, cx_c).await; disconnect_and_reconnect(&client_c, cx_c).await;
executor.run_until_parked(); executor.run_until_parked();
assert_eq!(client_a.summarize_contacts(&cx_a).current, &["user_b"]); assert_eq!(
assert_eq!(client_b.summarize_contacts(&cx_b).current, &["user_a"]); client_a.summarize_contacts(&cx_a).current,
&["user_a", "user_b"]
);
assert_eq!(
client_b.summarize_contacts(&cx_b).current,
&["user_a", "user_b"]
);
assert!(client_b assert!(client_b
.summarize_contacts(&cx_b) .summarize_contacts(&cx_b)
.incoming_requests .incoming_requests
.is_empty()); .is_empty());
assert!(client_c.summarize_contacts(&cx_c).current.is_empty()); assert_eq!(client_c.summarize_contacts(&cx_c).current, &["user_c"]);
assert!(client_c assert!(client_c
.summarize_contacts(&cx_c) .summarize_contacts(&cx_c)
.outgoing_requests .outgoing_requests