From 39ad36115d368d79d4723b3a6b1cefe4874813a3 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Wed, 1 Nov 2023 00:00:00 +0000
Subject: feat(prs-create) add pr tag branch-name and title

tag pr event with title, description and the name of the current
checkedout branch
---
 src/git.rs                     | 31 +++++++++++++++++
 src/sub_commands/prs/create.rs | 20 +++++++----
 tests/prs_create.rs            | 77 ++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/src/git.rs b/src/git.rs
index 337444a..f9121f2 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -30,6 +30,7 @@ impl Repo {
 pub trait RepoActions {
     fn get_local_branch_names(&self) -> Result<Vec<String>>;
     fn get_main_or_master_branch(&self) -> Result<(&str, Sha1Hash)>;
+    fn get_checked_out_branch_name(&self) -> Result<String>;
     fn get_tip_of_local_branch(&self, branch_name: &str) -> Result<Sha1Hash>;
     fn get_root_commit(&self, branch_name: &str) -> Result<Sha1Hash>;
     fn get_head_commit(&self) -> Result<Sha1Hash>;
@@ -83,6 +84,15 @@ impl RepoActions for Repo {
         Ok(branch_names)
     }
 
+    fn get_checked_out_branch_name(&self) -> Result<String> {
+        Ok(self
+            .git_repo
+            .head()?
+            .shorthand()
+            .context("an object without a shorthand is checked out")?
+            .to_string())
+    }
+
     fn get_tip_of_local_branch(&self, branch_name: &str) -> Result<Sha1Hash> {
         let branch = self
             .git_repo
@@ -378,6 +388,27 @@ mod tests {
         }
     }
 
+    mod get_checked_out_branch_name {
+        use super::*;
+
+        #[test]
+        fn returns_checked_out_branch_name() -> Result<()> {
+            let test_repo = GitTestRepo::default();
+            let _ = test_repo.populate()?;
+            // create feature branch
+            test_repo.create_branch("example-feature")?;
+            test_repo.checkout("example-feature")?;
+
+            let git_repo = Repo::from_path(&test_repo.dir)?;
+
+            assert_eq!(
+                git_repo.get_checked_out_branch_name()?,
+                "example-feature".to_string()
+            );
+            Ok(())
+        }
+    }
+
     mod get_commits_ahead_behind {
         use super::*;
         mod returns_main {
diff --git a/src/sub_commands/prs/create.rs b/src/sub_commands/prs/create.rs
index 655978e..ce30c12 100644
--- a/src/sub_commands/prs/create.rs
+++ b/src/sub_commands/prs/create.rs
@@ -313,15 +313,23 @@ fn generate_pr_and_patch_events(
         .get_root_commit(to_branch)
         .context("failed to get root commit of the repository")?;
 
+    let mut pr_tags = vec![
+        Tag::Reference(format!("r-{root_commit}")),
+        Tag::Name(title.to_string()),
+        Tag::Description(description.to_string()),
+    ];
+
+    if let Ok(branch_name) = git_repo.get_checked_out_branch_name() {
+        pr_tags.push(Tag::Generic(
+            TagKind::Custom("branch-name".to_string()),
+            vec![branch_name],
+        ));
+    }
+
     let pr_event = EventBuilder::new(
         nostr::event::Kind::Custom(PR_KIND),
         format!("{title}\r\n\r\n{description}"),
-        &[Tag::Reference(format!("r-{root_commit}"))],
-        // TODO: suggested branch name
-        // Tag::Generic(
-        //     TagKind::Custom("suggested-branch-name".to_string()),
-        //     vec![],
-        // ),
+        &pr_tags,
         // TODO: add Repo event as root
         // TODO: people tag maintainers
         // TODO: add relay tags
diff --git a/tests/prs_create.rs b/tests/prs_create.rs
index 72a85c8..dc6eec0 100644
--- a/tests/prs_create.rs
+++ b/tests/prs_create.rs
@@ -175,9 +175,9 @@ mod sends_pr_and_2_patches_to_3_relays {
                 "prs",
                 "create",
                 "--title",
-                "example",
+                "exampletitle",
                 "--description",
-                "example",
+                "exampledescription",
             ],
         )
     }
@@ -426,6 +426,79 @@ mod sends_pr_and_2_patches_to_3_relays {
             }
             Ok(())
         }
+
+        #[test]
+        #[serial]
+        fn pr_tags_title_as_name() -> Result<()> {
+            let (_, _, r53, r55, r56) = futures::executor::block_on(prep_run_create_pr())?;
+            for relay in [&r53, &r55, &r56] {
+                let pr_event: &nostr::Event = relay
+                    .events
+                    .iter()
+                    .find(|e| e.kind.as_u64().eq(&PR_KIND))
+                    .unwrap();
+
+                assert_eq!(
+                    pr_event
+                        .tags
+                        .iter()
+                        .find(|t| t.as_vec()[0].eq("name"))
+                        .unwrap()
+                        .as_vec()[1],
+                    "exampletitle"
+                );
+            }
+            Ok(())
+        }
+
+        #[test]
+        #[serial]
+        fn pr_tags_description() -> Result<()> {
+            let (_, _, r53, r55, r56) = futures::executor::block_on(prep_run_create_pr())?;
+            for relay in [&r53, &r55, &r56] {
+                let pr_event: &nostr::Event = relay
+                    .events
+                    .iter()
+                    .find(|e| e.kind.as_u64().eq(&PR_KIND))
+                    .unwrap();
+
+                assert_eq!(
+                    pr_event
+                        .tags
+                        .iter()
+                        .find(|t| t.as_vec()[0].eq("description"))
+                        .unwrap()
+                        .as_vec()[1],
+                    "exampledescription"
+                );
+            }
+            Ok(())
+        }
+
+        #[test]
+        #[serial]
+        fn pr_tags_branch_name() -> Result<()> {
+            let (_, _, r53, r55, r56) = futures::executor::block_on(prep_run_create_pr())?;
+            for relay in [&r53, &r55, &r56] {
+                let pr_event: &nostr::Event = relay
+                    .events
+                    .iter()
+                    .find(|e| e.kind.as_u64().eq(&PR_KIND))
+                    .unwrap();
+
+                // branch-name tag
+                assert_eq!(
+                    pr_event
+                        .tags
+                        .iter()
+                        .find(|t| t.as_vec()[0].eq("branch-name"))
+                        .unwrap()
+                        .as_vec()[1],
+                    "feature"
+                );
+            }
+            Ok(())
+        }
     }
 
     mod patch_tags {
-- 
cgit v1.2.3