Merge pull request #250 from spastorino/fix-list-issues-in-milestone

Fix list issues in milestone

Author: lqd

crates/rust-project-goals-cli-llm/src/updates.rs

@@ -2,7 +2,6 @@ use anyhow::Context;
 use chrono::{Datelike, NaiveDate};
 use rust_project_goals::util::comma;
 use rust_project_goals_json::GithubIssueState;
-use std::collections::BTreeMap;
 use std::io::Write;
 use std::path::Path;
 use std::process::{Command, Stdio};
@@ -12,7 +11,7 @@ use crate::templates::{self, Updates, UpdatesGoal};
 use rust_project_goals::gh::issues::ExistingGithubIssue;
 use rust_project_goals::gh::{
     issue_id::{IssueId, Repository},
-    issues::{checkboxes, list_issue_titles_in_milestone, ExistingGithubComment},
+    issues::{checkboxes, list_issues_in_milestone, ExistingGithubComment},
 };
 
 const QUICK_UPDATES: &[&str] = &[
@@ -51,7 +50,7 @@ pub async fn updates(
 
     let llm = LargeLanguageModel::new(model_id, region).await?;
 
-    let issues = list_issue_titles_in_milestone(repository, milestone)?;
+    let issues = list_issues_in_milestone(repository, milestone)?;
 
     let filter = Filter {
         start_date: match start_date {
@@ -111,21 +110,23 @@ pub async fn updates(
 
 async fn prepare_flagship_goals(
     repository: &Repository,
-    issues: &BTreeMap<String, ExistingGithubIssue>,
+    issues: &[ExistingGithubIssue],
     filter: &Filter<'_>,
     llm: &LargeLanguageModel,
     quick: bool,
     updates: &mut Updates,
 ) -> anyhow::Result<()> {
     // First process the flagship goals, for which we capture the full text of comments.
-    for (title, issue) in issues {
+    for issue in issues {
         if !issue.has_flagship_label() {
             continue;
         }
 
+        let title = &issue.title;
+
         progress_bar::print_progress_bar_info(
             &format!("Issue #{number}", number = issue.number),
-            &title,
+            title,
             progress_bar::Color::Green,
             progress_bar::Style::Bold,
         );
@@ -182,22 +183,24 @@ async fn prepare_flagship_goals(
 
 async fn prepare_other_goals(
     repository: &Repository,
-    issues: &BTreeMap<String, ExistingGithubIssue>,
+    issues: &[ExistingGithubIssue],
     filter: &Filter<'_>,
     llm: &LargeLanguageModel,
     quick: bool,
     updates: &mut Updates,
 ) -> anyhow::Result<()> {
     // Next process the remaining goals, for which we generate a summary using an LLVM.
     let mut quick_comments = comments_forever();
-    for (title, issue) in issues {
+    for issue in issues {
         if issue.has_flagship_label() {
             continue;
         }
 
+        let title = &issue.title;
+
         progress_bar::print_progress_bar_info(
             &format!("Issue #{number}", number = issue.number),
-            &title,
+            title,
             progress_bar::Color::Green,
             progress_bar::Style::Bold,
         );

crates/rust-project-goals-cli/src/generate_json.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use rust_project_goals::gh::{
     issue_id::Repository,
-    issues::{checkboxes, list_issue_titles_in_milestone, ExistingGithubComment},
+    issues::{checkboxes, list_issues_in_milestone, ExistingGithubComment},
 };
 use rust_project_goals_json::{TrackingIssue, TrackingIssueUpdate, TrackingIssues};
 
@@ -11,16 +11,16 @@ pub(super) fn generate_json(
     milestone: &str,
     json_path: &Option<PathBuf>,
 ) -> anyhow::Result<()> {
-    let issues = list_issue_titles_in_milestone(repository, milestone)?;
+    let issues = list_issues_in_milestone(repository, milestone)?;
 
     let issues = TrackingIssues {
         issues: issues
             .into_iter()
-            .map(|(title, issue)| {
+            .map(|issue| {
                 let progress = checkboxes(&issue);
                 TrackingIssue {
                     number: issue.number,
-                    title,
+                    title: issue.title.clone(),
                     flagship: issue.has_flagship_label(),
                     progress,
                     assignees: issue.assignees.into_iter().collect(),

crates/rust-project-goals-cli/src/rfc.rs

@@ -13,8 +13,7 @@ use rust_project_goals::{
     gh::{
         issue_id::{IssueId, Repository},
         issues::{
-            create_issue, list_issue_titles_in_milestone, lock_issue, sync_assignees,
-            FLAGSHIP_LABEL,
+            create_issue, list_issues_in_milestone, lock_issue, sync_assignees, FLAGSHIP_LABEL,
         },
         labels::GhLabel,
     },
@@ -249,10 +248,13 @@ fn initialize_issues<'doc>(
         .collect::<anyhow::Result<_>>()?;
 
     // Compare desired issues against existing issues
-    let existing_issues = list_issue_titles_in_milestone(repository, timeframe)?;
+    let existing_issues = list_issues_in_milestone(repository, timeframe)?;
     let mut actions = BTreeSet::new();
     for desired_issue in desired_issues {
-        match existing_issues.get(&desired_issue.title) {
+        match existing_issues.iter().find(|issue| {
+            let issue_id = IssueId::new(repository.clone(), issue.number);
+            Some(&issue_id) == desired_issue.tracking_issue || issue.title == desired_issue.title
+        }) {
             Some(existing_issue) => {
                 if existing_issue.assignees != desired_issue.assignees {
                     actions.insert(GithubAction::SyncAssignees {
@@ -364,7 +366,6 @@ fn issue_text(timeframe: &str, document: &GoalDocument) -> anyhow::Result<String
 fn task_items(goal_plan: &GoalPlan) -> anyhow::Result<Vec<String>> {
     use std::fmt::Write;
 
-
     let mut tasks = vec![];
 
     if let Some(title) = &goal_plan.subgoal {

crates/rust-project-goals/src/gh/issues.rs

@@ -1,8 +1,4 @@
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    process::Command,
-    str::FromStr,
-};
+use std::{collections::BTreeSet, process::Command, str::FromStr};
 
 use anyhow::Context;
 use chrono::NaiveDate;
@@ -16,6 +12,7 @@ use super::{issue_id::Repository, labels::GhLabel};
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ExistingGithubIssue {
     pub number: u64,
+    pub title: String,
     /// Just github username, no `@`
     pub assignees: BTreeSet<String>,
     pub comments: Vec<ExistingGithubComment>,
@@ -121,10 +118,10 @@ pub fn fetch_issue(repository: &Repository, issue: u64) -> anyhow::Result<Existi
     Ok(ExistingGithubIssue::from(e_i))
 }
 
-pub fn list_issue_titles_in_milestone(
+pub fn list_issues_in_milestone(
     repository: &Repository,
     timeframe: &str,
-) -> anyhow::Result<BTreeMap<String, ExistingGithubIssue>> {
+) -> anyhow::Result<Vec<ExistingGithubIssue>> {
     let output = Command::new("gh")
         .arg("-R")
         .arg(&repository.to_string())
@@ -143,7 +140,7 @@ pub fn list_issue_titles_in_milestone(
 
     Ok(existing_issues
         .into_iter()
-        .map(|e_i| (e_i.title.clone(), ExistingGithubIssue::from(e_i)))
+        .map(|e_i| ExistingGithubIssue::from(e_i))
         .collect())
 }
 
@@ -296,6 +293,7 @@ impl From<ExistingGithubIssueJson> for ExistingGithubIssue {
     fn from(e_i: ExistingGithubIssueJson) -> Self {
         ExistingGithubIssue {
             number: e_i.number,
+            title: e_i.title,
             assignees: e_i.assignees.into_iter().map(|a| a.login).collect(),
             comments: e_i
                 .comments