diff --git a/src/command.rs b/src/command.rs index ceca507..d19a5d4 100644 --- a/src/command.rs +++ b/src/command.rs @@ -77,5 +77,9 @@ pub enum Command { /// Comment body (required) body: String, + + /// Owner + #[arg(short, long)] + owner: Option, }, } diff --git a/src/handlers.rs b/src/handlers.rs index 860e796..6455778 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -351,7 +351,7 @@ pub fn cmd_mv(ticket_id: &str, target_status: &str, force: bool, start: &Path) - Ok(()) } -pub fn cmd_comment(ticket_id: &str, body: &str, start: &Path) -> Result<()> { +pub fn cmd_comment(ticket_id: &str, body: &str, owner: &Option, start: &Path) -> Result<()> { if body.is_empty() { return Err(anyhow!("Comment body is required.")); } @@ -371,7 +371,10 @@ pub fn cmd_comment(ticket_id: &str, body: &str, start: &Path) -> Result<()> { let filename = format!("{}.md", timestamp); let filepath = comments_dir.join(&filename); - let author = get_git_user().unwrap_or_else(|| "unknown".to_string()); + let author = match owner { + Some(o) => o.clone(), + None => get_git_user().unwrap_or_else(|| "unknown".to_string()), + }; let comment_content = format!( "**Comment**\n\ diff --git a/src/main.rs b/src/main.rs index 2fb59c6..d737372 100644 --- a/src/main.rs +++ b/src/main.rs @@ -47,6 +47,6 @@ fn main() -> Result<()> { status, force, } => cmd_mv(&ticket, &status, force, &start), - Command::Comment { ticket, body } => cmd_comment(&ticket, &body, &start), + Command::Comment { ticket, body, owner } => cmd_comment(&ticket, &body, &owner, &start), } } diff --git a/tests/cmd_comment.rs b/tests/cmd_comment.rs index 70edf23..81562ef 100644 --- a/tests/cmd_comment.rs +++ b/tests/cmd_comment.rs @@ -164,3 +164,51 @@ fn comment_creates_comments_directory() { assert!(comments_dir.exists()); } + +#[test] +fn comment_uses_owner_flag_when_provided() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let uuid = create_ticket(&worklane, "backlog", "Owner Test"); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("comment") + .args([&uuid, "Test comment with owner"]) + .arg("-o") + .arg("TestUser") + .assert() + .success(); + + let comments_dir = worklane.join("comments").join(&uuid); + let files: Vec<_> = fs::read_dir(&comments_dir) + .unwrap() + .filter_map(|e| e.ok()) + .collect(); + let content = fs::read_to_string(files[0].path()).unwrap(); + assert!(content.contains("**Author**: TestUser")); +} + +#[test] +fn comment_falls_back_to_git_user_when_owner_omitted() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let uuid = create_ticket(&worklane, "done", "Fallback Test"); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("comment") + .args([&uuid, "Test comment fallback"]) + .assert() + .success(); + + let comments_dir = worklane.join("comments").join(&uuid); + let files: Vec<_> = fs::read_dir(&comments_dir) + .unwrap() + .filter_map(|e| e.ok()) + .collect(); + let content = fs::read_to_string(files[0].path()).unwrap(); + assert!(content.contains("**Author**")); +}