feat: integrate `fetch` into `push`

as part of a project to use `fetch` and the stored cache everywhere

4 files changed, 44 insertions, 97 deletions

diff --git a/src/main.rs b/src/main.rs
index 1790c21..81eaf2f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -62,7 +62,7 @@ async fn main() -> Result<()> {
         Commands::Fetch(args) => sub_commands::fetch::launch(&cli, args).await,
         Commands::Login(args) => sub_commands::login::launch(&cli, args).await,
         Commands::Init(args) => sub_commands::init::launch(&cli, args).await,
-        Commands::Send(args) => sub_commands::send::launch(&cli, args).await,
+        Commands::Send(args) => sub_commands::send::launch(&cli, args, false).await,
         Commands::List => sub_commands::list::launch().await,
         Commands::Pull => sub_commands::pull::launch().await,
         Commands::Push(args) => sub_commands::push::launch(&cli, args).await,
diff --git a/src/sub_commands/push.rs b/src/sub_commands/push.rs
index 9e3e041..111a14a 100644
--- a/src/sub_commands/push.rs
+++ b/src/sub_commands/push.rs
@@ -1,25 +1,22 @@
 use anyhow::{bail, Context, Result};
-use nostr_sdk::hashes::sha1::Hash as Sha1Hash;
 
 #[cfg(not(test))]
 use crate::client::Client;
 #[cfg(test)]
 use crate::client::MockConnect;
 use crate::{
-    client::Connect,
+    client::{fetching_with_report, get_repo_ref_from_cache, Connect},
     git::{str_to_sha1, Repo, RepoActions},
     login,
-    repo_ref::{self, RepoRef},
+    repo_ref::get_repo_coordinates,
     sub_commands::{
         self,
         list::{
-            find_commits_for_proposal_root_events, find_proposal_and_status_events,
-            get_commit_id_from_patch, get_most_recent_patch_with_ancestors, tag_value,
-        },
-        send::{
-            event_is_revision_root, event_to_cover_letter, generate_patch_event, send_events,
-            PATCH_KIND,
+            get_all_proposal_patch_events_from_cache, get_commit_id_from_patch,
+            get_most_recent_patch_with_ancestors, get_proposals_and_revisions_from_cache,
+            tag_value,
         },
+        send::{event_to_cover_letter, generate_patch_event, send_events},
     },
     Cli,
 };
@@ -37,6 +34,7 @@ pub struct SubCommandArgs {
 #[allow(clippy::too_many_lines)]
 pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
     let git_repo = Repo::discover().context("cannot find a git repository")?;
+    let git_repo_path = git_repo.get_path()?;
 
     let (main_or_master_branch_name, _) = git_repo
         .get_main_or_master_branch()
@@ -58,20 +56,24 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
     #[cfg(test)]
     let mut client = <MockConnect as std::default::Default>::default();
 
-    let repo_ref = repo_ref::fetch(
-        &git_repo,
-        root_commit.to_string(),
-        &client,
-        client.get_fallback_relays().clone(),
-        true,
-    )
-    .await?;
+    let repo_coordinates = get_repo_coordinates(&git_repo, &client).await?;
 
-    let (proposal_root_event, commit_events) = fetch_proposal_root_and_most_recent_patch_chain(
-        &client,
+    fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
+
+    let repo_ref = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await?;
+
+    let proposal_root_event =
+        get_proposals_and_revisions_from_cache(git_repo_path, repo_ref.coordinates())
+            .await?
+            .iter()
+            .find(|e| event_to_cover_letter(e).is_ok_and(|cl| cl.branch_name.eq(&branch_name)))
+            .context("cannot find proposal that matches the current branch name")?
+            .clone();
+
+    let commit_events = get_all_proposal_patch_events_from_cache(
+        git_repo_path,
         &repo_ref,
-        &root_commit,
-        &branch_name,
+        &proposal_root_event.id(),
     )
     .await?;
 
@@ -116,6 +118,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
                 description: None,
                 no_cover_letter: args.no_cover_letter,
             },
+            true,
         )
         .await?;
         println!("force pushed proposal revision");
@@ -199,56 +202,3 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     Ok(())
 }
-
-pub async fn fetch_proposal_root_and_most_recent_patch_chain(
-    #[cfg(test)] client: &crate::client::MockConnect,
-    #[cfg(not(test))] client: &Client,
-    repo_ref: &RepoRef,
-    root_commit: &Sha1Hash,
-    branch_name: &String,
-) -> Result<(nostr::Event, Vec<nostr::Event>)> {
-    println!("finding proposal root event...");
-
-    let proposal_events_and_revisions: Vec<nostr::Event> =
-        find_proposal_and_status_events(client, repo_ref, &root_commit.to_string())
-            .await
-            .context("cannot get proposal events for repo")?;
-
-    let proposal_events: Vec<&nostr::Event> = proposal_events_and_revisions
-        .iter()
-        .filter(|e| !event_is_revision_root(e) && e.kind().as_u16().eq(&PATCH_KIND))
-        .collect::<Vec<&nostr::Event>>();
-
-    let proposal_root_event: &nostr::Event = proposal_events
-        .iter()
-        .find(|e| {
-            event_to_cover_letter(e).is_ok_and(|cl| cl.branch_name.eq(branch_name))
-            // TODO remove the dependancy on same branch name and replace with
-            // references stored in .git/ngit
-        })
-        .context("cannot find a proposal root event associated with the checked out branch name")?
-        .to_owned();
-
-    println!("found proposal root event. finding commits...");
-
-    let commits_events: Vec<nostr::Event> = find_commits_for_proposal_root_events(
-        client,
-        &[
-            vec![proposal_root_event],
-            proposal_events_and_revisions
-                .iter()
-                .filter(|e| {
-                    e.tags.iter().any(|t| {
-                        t.as_vec().len().gt(&1)
-                            && t.as_vec()[1].eq(&proposal_root_event.id.to_string())
-                    })
-                })
-                .collect::<Vec<&nostr::Event>>(),
-        ]
-        .concat(),
-        repo_ref,
-    )
-    .await?;
-
-    Ok((proposal_root_event.clone(), commits_events))
-}
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs
index d093cb6..f94eed3 100644
--- a/src/sub_commands/send.rs
+++ b/src/sub_commands/send.rs
@@ -53,7 +53,7 @@ pub struct SubCommandArgs {
 }
 
 #[allow(clippy::too_many_lines)]
-pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
+pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Result<()> {
     let git_repo = Repo::discover().context("cannot find a git repository")?;
     let git_repo_path = git_repo.get_path()?;
 
@@ -68,7 +68,9 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     let repo_coordinates = get_repo_coordinates(&git_repo, &client).await?;
 
-    fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
+    if !no_fetch {
+        fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
+    }
 
     let (root_proposal_id, mention_tags) =
         get_root_proposal_id_and_mentions_from_in_reply_to(git_repo.get_path()?, &args.in_reply_to)
diff --git a/tests/push.rs b/tests/push.rs
index 65c92e9..1f09d28 100644
--- a/tests/push.rs
+++ b/tests/push.rs
@@ -143,13 +143,11 @@ mod when_proposal_isnt_associated_with_branch_name {
                 test_repo.checkout("random-name")?;
 
                 let mut p = CliTester::new_from_dir(&test_repo.dir, ["push"]);
-                p.expect("finding proposal root event...\r\n")?;
-                p.expect(
-                    "Error: cannot find a proposal root event associated with the checked out branch name\r\n",
+                p.expect("fetching updates...\r\n")?;
+                p.expect_eventually("\r\n")?; // some updates listed here
+                p.expect_end_with(
+                    "Error: cannot find proposal that matches the current branch name\r\n",
                 )?;
-
-                p.expect_end()?;
-
                 for p in [51, 52, 53, 55, 56] {
                     relay::shutdown_relay(8000 + p)?;
                 }
@@ -206,10 +204,9 @@ mod when_branch_is_checked_out {
                     create_and_populate_branch(&test_repo, FEATURE_BRANCH_NAME_1, "a", false)?;
 
                     let mut p = CliTester::new_from_dir(&test_repo.dir, ["push"]);
-                    p.expect("finding proposal root event...\r\n")?;
-                    p.expect("found proposal root event. finding commits...\r\n")?;
-                    p.expect("Error: proposal already up-to-date with local branch\r\n")?;
-                    p.expect_end()?;
+                    p.expect("fetching updates...\r\n")?;
+                    p.expect_eventually("\r\n")?; // some updates listed here
+                    p.expect_end_with("Error: proposal already up-to-date with local branch\r\n")?;
 
                     for p in [51, 52, 53, 55, 56] {
                         relay::shutdown_relay(8000 + p)?;
@@ -265,8 +262,8 @@ mod when_branch_is_checked_out {
                     create_and_populate_branch(&test_repo, FEATURE_BRANCH_NAME_1, "a", true)?;
 
                     let mut p = CliTester::new_from_dir(&test_repo.dir, ["push"]);
-                    p.expect("finding proposal root event...\r\n")?;
-                    p.expect("found proposal root event. finding commits...\r\n")?;
+                    p.expect("fetching updates...\r\n")?;
+                    p.expect_eventually("\r\n")?; // some updates listed here
                     p.expect("Error: proposal is ahead of local branch\r\n")?;
                     p.expect_end()?;
 
@@ -341,12 +338,11 @@ mod when_branch_is_checked_out {
                                 "push",
                             ],
                         );
-                        p.expect("finding proposal root event...\r\n")?;
-                        p.expect("found proposal root event. finding commits...\r\n")?;
+                        p.expect("fetching updates...\r\n")?;
+                        p.expect_eventually("\r\n")?; // some updates listed here
                         p.expect(
                             "1 commits ahead. preparing to create creating patch events.\r\n",
                         )?;
-                        p.expect("searching for profile...\r\n")?;
                         p.expect("logged in as fred\r\n")?;
                         p.expect("pushing 1 commits\r\n")?;
 
@@ -497,8 +493,8 @@ mod when_branch_is_checked_out {
                     let mut p = CliTester::new_from_dir(&test_repo.dir, ["push"]);
                     // p.expect_end_eventually_and_print()?;
 
-                    p.expect("finding proposal root event...\r\n")?;
-                    p.expect("found proposal root event. finding commits...\r\n")?;
+                    p.expect("fetching updates...\r\n")?;
+                    p.expect_eventually("\r\n")?; // some updates listed here
                     p.expect("Error: local unpublished proposal has been rebased. consider force pushing\r\n")?;
                     p.expect_end()?;
 
@@ -568,8 +564,8 @@ mod when_branch_is_checked_out {
                                 "--no-cover-letter",
                             ],
                         );
-                        p.expect("finding proposal root event...\r\n")?;
-                        p.expect("found proposal root event. finding commits...\r\n")?;
+                        p.expect("fetching updates...\r\n")?;
+                        p.expect_eventually("\r\n")?; // some updates listed here
                         p.expect("preparing to force push proposal revision...\r\n")?;
                         // standard output from `ngit send`
                         p.expect("creating proposal revision for: ")?;
@@ -591,7 +587,6 @@ mod when_branch_is_checked_out {
                         p.expect("creating proposal from 2 commits:\r\n")?;
                         p.expect("355bdf1 add a4.md\r\n")?;
                         p.expect("dbd1115 add a3.md\r\n")?;
-                        p.expect("searching for profile...\r\n")?;
                         p.expect("logged in as fred\r\n")?;
                         p.expect("posting 2 patches without a covering letter...\r\n")?;