File tree 1 file changed +6
-11
lines changed
1 file changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -75,28 +75,23 @@ pub fn individual_nags(username: &str) -> DashResult<(GitHubUser, Vec<Individual
75
75
. first :: < GitHubUser > ( conn) ?;
76
76
77
77
let review_requests = fcp_review_request:: table
78
+ . inner_join ( fcp_proposal:: table)
79
+ . filter ( fcp_proposal:: fcp_start. is_null ( ) )
78
80
. filter ( fcp_review_request:: fk_reviewer. eq ( user. id ) )
79
81
. filter ( fcp_review_request:: reviewed. eq ( false ) )
80
- . load :: < FcpReviewRequest > ( conn) ?;
82
+ . load :: < ( FcpReviewRequest , FcpProposal ) > ( conn) ?;
81
83
82
84
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 {
89
86
let issue = issue:: table
90
87
. filter ( issue:: id. eq ( proposal. fk_issue ) )
91
88
. first :: < Issue > ( conn) ?;
92
89
93
- let fcp = IndividualFcp {
90
+ fcps . push ( IndividualFcp {
94
91
issue : issue,
95
92
proposal : proposal,
96
93
review_request : rr,
97
- } ;
98
-
99
- fcps. push ( fcp) ;
94
+ } ) ;
100
95
}
101
96
102
97
Ok ( ( user, fcps) )
You can’t perform that action at this time.
0 commit comments