[Needs review] Feature: @rfcbot poll [teams] #219

Centril · 2018-06-20T10:05:14Z

This should fix #214 and fix #225 ... hopefully.

I've also refactored a bunch of stuff for readability (less rightward drift, etc.).

…e of teams.

Centril · 2018-06-21T04:41:37Z

Should probably also fix the individual dashboard to display polls which are awaiting a user's signoff?

src/main.rs

@@ -32,6 +32,7 @@ extern crate url;
 extern crate urlencoded;
 #[macro_use]
 extern crate maplit;
+extern crate itertools;


anp · 2018-06-21T17:52:19Z

README.md

+         "poll" | "polled" | "polling" | "polls" |
+         "query" | "queried" | "querying" | "queries" |
+         "inquire" | "inquired" | "inquiring" | "inquires" |
+         "quiz" | "quized" | "quizing" | "quizzes" |


quizzed and quizzing FWIW

anp · 2018-06-21T17:54:56Z

src/github/command.rs

+    ResolveConcern(&'a str),
+    FeedbackRequest(&'a str),
+    AskQuestion {
+        teams: BTreeSet<&'a str>,


Could this contain Team structs instead of strings?

Hmm... That would add some additional unnecessary allocation. And this is really the TeamLabel (would still require allocation), which isn't inside the Team struct.

src/github/command.rs

+    pub fn from_str_all(command: &'a str) -> impl Iterator<Item = RfcBotCommand<'a>> {
+        // Get the tokens for each command line (starts with a bot mention)
+        command.lines()
+               .filter(|&l| l.starts_with(RFC_BOT_MENTION))


src/github/command.rs

+    })
+}
+
+fn from_invocation_line<'a>(command: &'a str) -> DashResult<RfcBotCommand<'a>> {


src/github/command.rs

+    command[name_start..].trim()
+}
+
+fn strip_prefix<'h>(haystack: &'h str, prefix: &str) -> &'h str {


anp · 2018-06-21T18:02:04Z

src/github/command.rs

+
+fn match_team_candidate(team_candidate: &str) -> Option<&'static TeamLabel> {
+    #[cfg(not(test))]
+    let setup = &*teams::SETUP;


Could we move this conditional compilation into teams.rs?

And maybe make it a feature so we can still run tests against the config on disk?

I wasn't super happy about this mechanism, so that sounds great. :)

I went ahead and removed global state instead; much cleaner!

src/github/command.rs

+    let setup = &*teams::test::TEST_SETUP;
+
+    setup.teams().find(|&(label, team)| {
+        strip_prefix(&label.0, "T-") == strip_prefix(team_candidate, "T-") ||


src/github/command.rs

+
+            let mut question = parse_command_text(command, subcommand);
+            let mut teams = BTreeSet::new();
+            while let Some(team_candidate) = question.split_whitespace().next() {


src/github/command.rs

+
+            let mut question = parse_command_text(command, subcommand);
+            let mut teams = BTreeSet::new();
+            while let Some(team_candidate) = question.split_whitespace().next() {


anp

Awesome! Looking this over and it looks mostly good to me. Unfortunately because the large refactoring (command.rs) is in the same commit as the new poll functionality it's a bit difficult to review. Once my various nits are addressed, lets just get it on prod when you'll be around to fix things?

anp · 2018-06-21T18:45:56Z

src/github/nag.rs

@@ -185,7 +130,147 @@ fn update_proposal_review_status(proposal_id: i32) -> DashResult<()> {
    Ok(())
 }

+fn update_poll_review_status(poll_id: i32) -> DashResult<()> {
+    let conn = &*DB_POOL.get()?;
+    // this is an updated comment from the bot itself


anp · 2018-06-21T18:46:54Z

src/github/nag.rs

@@ -185,7 +130,147 @@ fn update_proposal_review_status(proposal_id: i32) -> DashResult<()> {
    Ok(())
 }

+fn update_poll_review_status(poll_id: i32) -> DashResult<()> {


Bare numbers in fn args make me a little nervous. Can we separate out the "find the Poll struct from the raw input" and the "update the data model" functionality?

src/github/nag.rs

+    let conn = &*DB_POOL.get()?;
+    // this is an updated comment from the bot itself
+
+    // parse out each "reviewed" status for each user, then update them


anp · 2018-06-21T18:53:21Z

src/github/nag.rs

+
+        {
+            use domain::schema::poll_review_request::dsl::*;
+            let mut review_request: PollReviewRequest = poll_review_request


Calling it a PollReviewRequest seems odd to me in this context -- isn't it more like a PollResponseRequest or PollRequest?

Changed to PollResponseRequest.

src/github/nag.rs

+    Ok(())
+}
+
+fn parse_ticky_boxes<'a>(what: &'a str, id: i32, comment: &'a IssueComment)


src/github/nag.rs

+        throw!(why)
+    });
+
+    for mut survey in pending {


* update toolchain and lockfile. * add never_type gate.

anp

This is looking really sweet!

anp · 2018-08-11T17:29:12Z

src/github/nag.rs

@@ -185,7 +130,147 @@ fn update_proposal_review_status(proposal_id: i32) -> DashResult<()> {
    Ok(())
 }

+fn update_poll_response_status(poll_id: i32) -> DashResult<()> {


This function seems pretty well scoped to the Poll type -- what do you think about making it a method and leaving the exact query used to retrieve the Poll flexible?

I'd like to punt on larger refactorings now and ship it :)

anp · 2018-08-11T17:29:30Z

src/github/nag.rs

+    let conn = &*DB_POOL.get()?;
+    // this is an updated comment from the bot itself
+
+    // parse out each "responded" status for each user, then update them


Is this comment still in the right place?

anp · 2018-08-11T17:33:29Z

src/github/nag.rs

+    }
+
+    let comment: IssueComment = issuecomment::table
+        .find(survey.fk_bot_tracking_comment)


Reading this code now, I'm wondering whether things like this shouldn't also be impl'd as small methods on the Poll type to more clearly separate the logic of a poll from its db semantics.

i.e.

let comment: IssueComment = self.tracking_comment()?;

Ideally yes - that would be optimal, but I think this is a larger refactoring that would affect much more code than this PR, so I'd like to punt for now :)

anp · 2018-08-11T17:35:16Z

src/github/nag.rs

+    for username in parse_ticky_boxes("poll", survey.id, &comment) {
+        let user: GitHubUser = githubuser::table
+            .filter(githubuser::login.eq(username))
+            .first(conn)?;


IIUC this will currently fail the entire poll if someone typo's one of the provided usernames. Do we have an error reporting mechanism for that?

anp · 2018-08-11T17:38:51Z

src/github/nag.rs

 fn evaluate_nags() -> DashResult<()> {
+    evaluate_pendings()?;


Looking at this now, should we attempt to make progress on all three and combine the errors if more than one fails?

anp · 2018-08-11T17:40:50Z

src/github/nag.rs

                   -> DashResult<()> {
+        use self::RfcBotCommand::*;
+        match self {
+            AskQuestion { teams, question } =>


Can we use a single internal name for questions/polls etc?

anp

:D

Centril · 2018-08-16T03:31:50Z

Centril added 6 commits June 20, 2018 11:57

add itertools as dependency.

155e428

add database model for Poll stuff.

1814249

really add itertools as dependency in main.rs.

dd221a4

teams: expose test data, change team names a bit, expose ping and nam…

1e9814b

…e of teams.

refactor a bunch of logic and implement polling (hopefully...).

c5d769c

update command grammar in README.md.

60ae53f

Centril added the enhancement label Jun 20, 2018

Centril requested a review from anp June 20, 2018 10:05

fix syntax error in up.sql migration.

cd230f8

Centril changed the title ~~Feature: @rfcbot poll [teams]~~ [WIP] Feature: @rfcbot poll [teams] Jun 20, 2018

Centril added 2 commits June 20, 2018 12:17

fix copy error in up.sql migration.

5b69176

fix typo in up.sql migration.

fffdbd6

Centril changed the title ~~[WIP] Feature: @rfcbot poll [teams]~~ [Needs review] Feature: @rfcbot poll [teams] Jun 21, 2018

close poll when everyone has answered it.

97a4b26

anp reviewed Jun 21, 2018

View reviewed changes

Centril commented Jun 21, 2018

View reviewed changes

src/github/command.rs Outdated

let mut question = parse_command_text(command, subcommand);

let mut teams = BTreeSet::new();

while let Some(team_candidate) = question.split_whitespace().next() {

This comment was marked as resolved.

Sign in to view

anp reviewed Jun 21, 2018

View reviewed changes

Centril and others added 10 commits August 11, 2018 09:34

fix rust-lang#212 by filtering in unstarted fcps. (rust-lang#223)

0de4780

Update toolchain and lockfile (rust-lang#232)

59dc131

* update toolchain and lockfile. * add never_type gate.

Add Centril to the lang team (rust-lang#230)

ea67451

fix typos (quized -> quizzed).

ef63384

Merge remote-tracking branch 'upstream/master' into feature/poll-team-2

90de0d2

fix 225, and deal with leading whitespace.

7990d27

colocate from_invocation_line and from_str_all.

437d7a2

get rid of global state from command parser.

4810f33

review -> response for polls.

9a7a94a

fix comments.

6fabf31

anp reviewed Aug 11, 2018

View reviewed changes

make progress on all 3 in evaluate_nags.

b5916fb

Centril added 3 commits August 15, 2018 15:06

RfcBotCommand::{AskQuestion -> StartPoll}.

4b5ecc2

gracefully handle poll comment typos.

5a1d5dd

fix bug.

8e87361

anp approved these changes Aug 16, 2018

View reviewed changes

Centril merged commit ce8e298 into rust-lang:master Aug 16, 2018

Centril deleted the feature/poll-team-2 branch August 16, 2018 03:32

[Needs review] Feature: @rfcbot poll [teams] #219

[Needs review] Feature: @rfcbot poll [teams] #219

Conversation

Centril commented Jun 20, 2018 • edited Loading

Centril commented Jun 21, 2018

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

anp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

anp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anp left a comment

Choose a reason for hiding this comment

Centril commented Aug 16, 2018

Centril commented Jun 20, 2018 •

edited

Loading