Skip to content

Remove Completed at history column #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spacebear21 merged 1 commit into from
Jun 30, 2026
Merged

Remove Completed at history column #1683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
116 changes: 46 additions & 70 deletions payjoin-cli/src/app/v2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ mod ohttp;

const W_ID: usize = 12;
const W_ROLE: usize = 25;
const W_DONE: usize = 15;
const W_STATUS: usize = 15;

#[derive(Clone)]
Expand Down Expand Up @@ -92,10 +91,7 @@ impl StatusText for ReceiveSession {
}

fn print_header() {
println!(
"{:<W_ID$} {:<W_ROLE$} {:<W_DONE$} {:<W_STATUS$}",
"Session ID", "Sender/Receiver", "Completed At", "Status"
);
println!("{:<W_ID$} {:<W_ROLE$} {:<W_STATUS$}", "Session ID", "Sender/Receiver", "Status");
}

enum Role {
Expand All @@ -115,24 +111,16 @@ struct SessionHistoryRow<Status> {
session_id: SessionId,
role: Role,
status: Status,
completed_at: Option<u64>,
error_message: Option<String>,
}

impl<Status: StatusText> fmt::Display for SessionHistoryRow<Status> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(
f,
"{:<W_ID$} {:<W_ROLE$} {:<W_DONE$} {:<W_STATUS$}",
"{:<W_ID$} {:<W_ROLE$} {:<W_STATUS$}",
self.session_id.to_string(),
self.role.as_str(),
match self.completed_at {
None => "Not Completed".to_string(),
Some(secs) => {
// TODO: human readable time
secs.to_string()
}
},
self.error_message.as_deref().unwrap_or(self.status.status_text())
)
}
Expand Down Expand Up @@ -416,7 +404,6 @@ impl AppTrait for App {
session_id,
role: Role::Sender,
status: sender_state.clone(),
completed_at: None,
error_message: None,
};
send_rows.push(row);
Expand All @@ -426,7 +413,6 @@ impl AppTrait for App {
session_id,
role: Role::Sender,
status: SendSession::Closed(SenderSessionOutcome::Aborted),
completed_at: None,
error_message: Some(e.to_string()),
};
send_rows.push(row);
Expand All @@ -442,7 +428,6 @@ impl AppTrait for App {
session_id,
role: Role::Receiver,
status: receiver_state.clone(),
completed_at: None,
error_message: None,
};
recv_rows.push(row);
Expand All @@ -452,69 +437,60 @@ impl AppTrait for App {
session_id,
role: Role::Receiver,
status: ReceiveSession::Closed(ReceiverSessionOutcome::Aborted),
completed_at: None,
error_message: Some(e.to_string()),
};
recv_rows.push(row);
}
}
});

self.db.get_inactive_send_session_ids()?.into_iter().for_each(
|(session_id, completed_at)| {
let persister = SenderPersister::from_id(self.db.clone(), session_id.clone());
match replay_sender_event_log(&persister) {
Ok((sender_state, _)) => {
let row = SessionHistoryRow {
session_id,
role: Role::Sender,
status: sender_state.clone(),
completed_at: Some(completed_at),
error_message: None,
};
send_rows.push(row);
}
Err(e) => {
let row = SessionHistoryRow {
session_id,
role: Role::Sender,
status: SendSession::Closed(SenderSessionOutcome::Aborted),
completed_at: Some(completed_at),
error_message: Some(e.to_string()),
};
send_rows.push(row);
}
self.db.get_inactive_send_session_ids()?.into_iter().for_each(|(session_id, _)| {
let persister = SenderPersister::from_id(self.db.clone(), session_id.clone());
match replay_sender_event_log(&persister) {
Ok((sender_state, _)) => {
let row = SessionHistoryRow {
session_id,
role: Role::Sender,
status: sender_state.clone(),
error_message: None,
};
send_rows.push(row);
}
},
);
Err(e) => {
let row = SessionHistoryRow {
session_id,
role: Role::Sender,
status: SendSession::Closed(SenderSessionOutcome::Aborted),
error_message: Some(e.to_string()),
};
send_rows.push(row);
}
}
});

self.db.get_inactive_recv_session_ids()?.into_iter().for_each(
|(session_id, completed_at)| {
let persister = ReceiverPersister::from_id(self.db.clone(), session_id.clone());
match replay_receiver_event_log(&persister) {
Ok((receiver_state, _)) => {
let row = SessionHistoryRow {
session_id,
role: Role::Receiver,
status: receiver_state.clone(),
completed_at: Some(completed_at),
error_message: None,
};
recv_rows.push(row);
}
Err(e) => {
let row = SessionHistoryRow {
session_id,
role: Role::Receiver,
status: ReceiveSession::Closed(ReceiverSessionOutcome::Aborted),
completed_at: Some(completed_at),
error_message: Some(e.to_string()),
};
recv_rows.push(row);
}
self.db.get_inactive_recv_session_ids()?.into_iter().for_each(|(session_id, _)| {
let persister = ReceiverPersister::from_id(self.db.clone(), session_id.clone());
match replay_receiver_event_log(&persister) {
Ok((receiver_state, _)) => {
let row = SessionHistoryRow {
session_id,
role: Role::Receiver,
status: receiver_state.clone(),
error_message: None,
};
recv_rows.push(row);
}
},
);
Err(e) => {
let row = SessionHistoryRow {
session_id,
role: Role::Receiver,
status: ReceiveSession::Closed(ReceiverSessionOutcome::Aborted),
error_message: Some(e.to_string()),
};
recv_rows.push(row);
}
}
});

// Print receiver and sender rows separately
for row in send_rows {
Expand Down
Loading