Skip to content

Commit 0de4780

Browse files
committed
fix rust-lang#212 by filtering in unstarted fcps. (rust-lang#223)
1 parent 97a4b26 commit 0de4780

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/nag.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,23 @@ pub fn individual_nags(username: &str) -> DashResult<(GitHubUser, Vec<Individual
7575
.first::<GitHubUser>(conn)?;
7676

7777
let review_requests = fcp_review_request::table
78+
.inner_join(fcp_proposal::table)
79+
.filter(fcp_proposal::fcp_start.is_null())
7880
.filter(fcp_review_request::fk_reviewer.eq(user.id))
7981
.filter(fcp_review_request::reviewed.eq(false))
80-
.load::<FcpReviewRequest>(conn)?;
82+
.load::<(FcpReviewRequest, FcpProposal)>(conn)?;
8183

8284
let mut fcps = Vec::new();
83-
84-
for rr in review_requests {
85-
let proposal = fcp_proposal::table
86-
.filter(fcp_proposal::id.eq(rr.fk_proposal))
87-
.first::<FcpProposal>(conn)?;
88-
85+
for (rr, proposal) in review_requests {
8986
let issue = issue::table
9087
.filter(issue::id.eq(proposal.fk_issue))
9188
.first::<Issue>(conn)?;
9289

93-
let fcp = IndividualFcp {
90+
fcps.push(IndividualFcp {
9491
issue: issue,
9592
proposal: proposal,
9693
review_request: rr,
97-
};
98-
99-
fcps.push(fcp);
94+
});
10095
}
10196

10297
Ok((user, fcps))

0 commit comments

Comments
 (0)