store summary comments by comment URL—allow for editing of title

Cargo.lock

@@ -860,6 +860,15 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
+[[package]]
+name = "itertools"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -1966,6 +1975,7 @@ dependencies = [
  "glob",
  "hex",
  "hyper",
+ "itertools",
  "lazy_static",
  "native-tls",
  "octocrab",

Cargo.toml

@@ -37,6 +37,7 @@ octocrab = "0.9.1"
 comrak = "0.8.2"
 route-recognizer = "0.3.0"
 cynic = { version = "0.14" }
+itertools = "0.10.2"
 
 [dependencies.serde]
 version = "1"

src/handlers/note.rs

@@ -35,11 +35,12 @@
 //!
 
 use crate::{config::NoteConfig, github::Event, handlers::Context, interactions::EditIssueBody};
-use anyhow::Context as _;
+use itertools::Itertools;
 use parser::command::note::NoteCommand;
+use std::{cmp::Ordering, collections::HashMap};
 use tracing as log;
 
-#[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize, Clone)]
 struct NoteDataEntry {
     title: String,
     comment_url: String,
@@ -56,33 +57,59 @@ impl NoteDataEntry {
         )
     }
 }
+impl Ord for NoteDataEntry {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.comment_url.cmp(&other.comment_url)
+    }
+}
+impl PartialOrd for NoteDataEntry {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
 
 #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize, Default)]
 struct NoteData {
-    entries: Vec<NoteDataEntry>,
+    entries_by_url: HashMap<String, NoteDataEntry>,
 }
 
 impl NoteData {
-    pub fn remove(&mut self, title: &str) -> anyhow::Result<()> {
-        let idx = self
-            .entries
-            .iter()
-            .position(|x| x.title == title)
-            .context("Summary with title does not exist")?;
-        log::debug!(
-            "Removing summary {:?} from index {}",
-            self.entries[idx],
-            idx
-        );
-        self.entries.remove(idx);
-        Ok(())
+    pub fn get_url_from_title(&self, title: &str) -> Option<String> {
+        let tmp = self.entries_by_url.clone();
+        tmp.iter().sorted().find_map(|(key, val)| {
+            if val.title == title {
+                Some(key.to_owned())
+            } else {
+                None
+            }
+        })
+    }
+
+    pub fn remove_by_title(&mut self, title: &str) -> Option<NoteDataEntry> {
+        let url_to_remove = self.get_url_from_title(title);
+
+        if let Some(url_to_remove) = url_to_remove {
+            let message = format!("UNABLE TO REMOVE ENTRY WITH URL: {:?}", &url_to_remove);
+            if let Some(entry) = self.entries_by_url.remove(&url_to_remove) {
+                log::debug!("SUCCESSFULLY REMOVED ENTRY: {:#?}", &entry);
+                Some(entry)
+            } else {
+                log::debug!("{:?}", &message);
+                None
+            }
+        } else {
+            log::debug!("UNABLE TO REMOVE ENTRY WITH TITLE: {:?}", title);
+            None
+        }
     }
+
     pub fn to_markdown(&self) -> String {
-        if self.entries.is_empty() {
+        if self.entries_by_url.is_empty() {
             return String::new();
         }
+
         let mut text = String::from("\n### Summary Notes\n");
-        for entry in &self.entries {
+        for (_, entry) in self.entries_by_url.iter().sorted() {
             text.push_str(&entry.to_markdown());
         }
         text.push_str("\n\nGenerated by triagebot, see [help](https://github.com/rust-lang/triagebot/wiki/Note) for how to add more");
@@ -106,17 +133,29 @@ pub(super) async fn handle_command(
 
     match &cmd {
         NoteCommand::Summary { title } => {
-            let new_entry = NoteDataEntry {
-                title: title.to_owned(),
-                comment_url,
-                author,
-            };
-
-            log::debug!("New Note Entry: {:#?}", new_entry);
-            current.entries.push(new_entry);
+            let title = title.to_owned();
+            if let Some(existing_entry) = current.entries_by_url.get_mut(&comment_url) {
+                existing_entry.title = title;
+                log::debug!("Updated existing entry: {:#?}", existing_entry);
+            } else {
+                let new_entry = NoteDataEntry {
+                    title: title.clone(),
+                    comment_url: comment_url.clone(),
+                    author,
+                };
+                log::debug!("New Note Entry: {:#?}", new_entry);
+                current
+                    .entries_by_url
+                    .insert(comment_url, new_entry.clone());
+                log::debug!("Entries by URL: {:#?}", current.entries_by_url);
+            }
         }
         NoteCommand::Remove { title } => {
-            current.remove(title)?;
+            if let Some(entry) = current.remove_by_title(title) {
+                log::debug!("SUCCESSFULLY REMOVED ENTRY: {:#?}", entry);
+            } else {
+                log::debug!("UNABLE TO REMOVE ENTRY");
+            }
         }
     }