Skip to content

Commit d443e7f

Browse files
committed
fix nits
Signed-off-by: xizheyin <[email protected]>
1 parent fcfc57e commit d443e7f

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

src/handlers/assign.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ const PREVIOUS_REVIEWERS_KEY: &str = "previous-reviewers";
106106
/// State stored in the database
107107
#[derive(Debug, Clone, PartialEq, Default, serde::Deserialize, serde::Serialize)]
108108
struct Reviewers {
109+
// names are stored in lowercase
109110
names: HashSet<String>,
110111
}
111112

@@ -308,7 +309,8 @@ async fn set_assignee(
308309
}
309310

310311
// Record the reviewer in the database
311-
state.data.names.insert(username.to_string());
312+
313+
state.data.names.insert(username.to_lowercase());
312314
state.save().await?;
313315
Ok(())
314316
}
@@ -988,7 +990,7 @@ async fn candidate_reviewers_from_names<'a>(
988990
.iter()
989991
.any(|assignee| name_lower == assignee.login.to_lowercase());
990992

991-
let is_previously_assigned = previous_reviewer_names.contains(&reviewer_candidate.name);
993+
let is_previously_assigned = previous_reviewer_names.contains(&name_lower);
992994

993995
// Record the reason why the candidate was filtered out
994996
let reason = {

src/handlers/assign/tests/tests_candidates.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ impl AssignCtx {
7272
self
7373
}
7474

75-
async fn set_previous_reviewers(mut self, users: &[&User]) -> Self {
75+
async fn set_previous_reviewers(mut self, users: HashSet<&User>) -> Self {
7676
let mut db = self.test_ctx.db_client_mut();
77-
for user in users {
78-
let mut state: IssueData<'_, Reviewers> =
79-
IssueData::load(&mut db, &self.issue, PREVIOUS_REVIEWERS_KEY)
80-
.await
81-
.unwrap();
82-
state.data.names.insert(user.login.to_string());
83-
state.save().await.unwrap();
84-
}
77+
let mut state: IssueData<'_, Reviewers> =
78+
IssueData::load(&mut db, &self.issue, PREVIOUS_REVIEWERS_KEY)
79+
.await
80+
.unwrap();
81+
82+
// Create a new set with all user names (overwrite existing data)
83+
state.data.names = users.iter().map(|user| user.login.to_lowercase()).collect();
84+
state.save().await.unwrap();
8585
self
8686
}
8787

@@ -550,7 +550,7 @@ async fn previous_reviewers_ignore_in_team_success() {
550550
let user = user("martin", 1);
551551
basic_test(ctx, config, issue().call())
552552
.teams(&teams)
553-
.set_previous_reviewers(&[&user])
553+
.set_previous_reviewers(HashSet::from([&user]))
554554
.await
555555
.check(&["compiler"], Ok(&["jyn514"]))
556556
.await
@@ -567,7 +567,7 @@ async fn previous_reviewers_ignore_in_team_failed() {
567567
let user2 = user("jyn514", 2);
568568
basic_test(ctx, config, issue().call())
569569
.teams(&teams)
570-
.set_previous_reviewers(&[&user1, &user2])
570+
.set_previous_reviewers(HashSet::from([&user1, &user2]))
571571
.await
572572
.check(
573573
&["compiler"],
@@ -589,7 +589,7 @@ async fn previous_reviewers_direct_assignee() {
589589
let user2 = user("jyn514", 2);
590590
basic_test(ctx, config, issue().call())
591591
.teams(&teams)
592-
.set_previous_reviewers(&[&user1, &user2])
592+
.set_previous_reviewers(HashSet::from([&user1, &user2]))
593593
.await
594594
.check(&["jyn514"], Ok(&["jyn514"]))
595595
.await

0 commit comments

Comments
 (0)