Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/api/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ impl ApiClient {
pub async fn update_bug_review(
&self,
bug_id: &BugId,
state: &str,
dismissal_reason: Option<&str>,
state: BugReviewState,
dismissal_reason: Option<BugDismissalReason>,
notes: Option<&str>,
) -> Result<BugReview> {
let path = format!("/public/v1/bugs/{}/review", bug_id);
let request = BugReviewRequest {
state: state.to_string(),
dismissal_reason: dismissal_reason.map(String::from),
state,
dismissal_reason,
notes: notes.map(String::from),
};
let body = serde_json::to_value(request)?;
Expand Down
4 changes: 2 additions & 2 deletions src/api/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ impl std::fmt::Display for BugDismissalReason {

#[derive(Debug, Serialize)]
pub struct BugReviewRequest {
pub state: String,
pub state: BugReviewState,
#[serde(skip_serializing_if = "Option::is_none")]
pub dismissal_reason: Option<String>,
pub dismissal_reason: Option<BugDismissalReason>,
#[serde(skip_serializing_if = "Option::is_none")]
pub notes: Option<String>,
}
Expand Down
22 changes: 14 additions & 8 deletions src/commands/bugs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub enum DismissalReason {
}

impl DismissalReason {
#[allow(dead_code)]
fn as_str(&self) -> &str {
match self {
DismissalReason::NotABug => "not_a_bug",
Expand Down Expand Up @@ -276,7 +277,7 @@ pub async fn handle(command: &BugCommands, cli: &crate::Cli) -> Result<()> {
dismissal_reason,
notes,
} => {
use crate::api::types::BugId;
use crate::api::types::{BugDismissalReason, BugId, BugReviewState};

// Validate that dismissal_reason is provided when state is dismissed
if matches!(state, ReviewState::Dismissed) && dismissal_reason.is_none() {
Expand All @@ -285,15 +286,20 @@ pub async fn handle(command: &BugCommands, cli: &crate::Cli) -> Result<()> {

let bug_id = BugId::new(bug_id).map_err(|e| anyhow::anyhow!(e))?;

let dismissal_reason_str = dismissal_reason.as_ref().map(|r| r.as_str());
let api_state = match state {
ReviewState::Pending => BugReviewState::Pending,
ReviewState::Resolved => BugReviewState::Resolved,
ReviewState::Dismissed => BugReviewState::Dismissed,
};
let api_reason = dismissal_reason.as_ref().map(|r| match r {
DismissalReason::NotABug => BugDismissalReason::NotABug,
DismissalReason::WontFix => BugDismissalReason::WontFix,
DismissalReason::Duplicate => BugDismissalReason::Duplicate,
DismissalReason::Other => BugDismissalReason::Other,
});

client
.update_bug_review(
&bug_id,
state.as_str(),
dismissal_reason_str,
notes.as_deref(),
)
.update_bug_review(&bug_id, api_state, api_reason, notes.as_deref())
.await
.context("Failed to update bug review")?;

Expand Down