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
74 changes: 61 additions & 13 deletions crates/openplotva-app/src/edited.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,18 +169,23 @@ fn pending_dialog_record(
chat_id: i64,
message_id: i32,
) -> Option<TaskQueueRecord> {
queue.records().into_iter().find(|record| {
record.status == JobStatus::Pending
&& record.job.data.job_type == JobType::Dialog
&& record
.job
.data
.telegram_data
.as_ref()
.is_some_and(|telegram| {
telegram.chat_id == chat_id && telegram.message_id == message_id
})
&& record.job.data.dialog_data.is_some()
queue.inspect_records(|records| {
records
.iter()
.find(|record| {
record.status == JobStatus::Pending
&& record.job.data.job_type == JobType::Dialog
&& record
.job
.data
.telegram_data
.as_ref()
.is_some_and(|telegram| {
telegram.chat_id == chat_id && telegram.message_id == message_id
})
&& record.job.data.dialog_data.is_some()
})
.cloned()
})
}

Expand Down Expand Up @@ -492,7 +497,7 @@ mod tests {
use super::{
EditedDialogJobUpdate, EditedImageJobUpdate, EditedMessageEffects, EditedMessageFuture,
EditedMessageUpdateHandler, EditedMessageUpdateRoute, TaskmanEditedMessageEffects,
handle_edited_message_update_or_else,
handle_edited_message_update_or_else, pending_dialog_record,
};

#[tokio::test]
Expand Down Expand Up @@ -627,6 +632,49 @@ mod tests {
Ok(())
}

#[test]
fn edited_dialog_lookup_preserves_pending_status_and_source_identity() {
let queue = InMemoryTaskQueue::new();
let now = OffsetDateTime::now_utc();
let completed = queue.assign(
DIALOG_AIFARM_QUEUE_NAME,
taskman_dialog_job("done", now, 111, 42, 77),
);
queue.complete(completed, now).expect("complete first");
let processing = queue.assign(
DIALOG_AIFARM_QUEUE_NAME,
taskman_dialog_job("busy", now, 111, 42, 77),
);
assert_eq!(
queue
.dequeue(DIALOG_AIFARM_QUEUE_NAME, "worker", now)
.expect("claim")
.id,
processing
);
queue.assign(
DIALOG_AIFARM_QUEUE_NAME,
taskman_dialog_job("other chat", now, 111, 43, 77),
);
queue.assign(
DIALOG_AIFARM_QUEUE_NAME,
taskman_dialog_job("other message", now, 111, 42, 78),
);
let pending = queue.assign(
DIALOG_AIFARM_QUEUE_NAME,
taskman_dialog_job("target", now, 111, 42, 77),
);
assert_eq!(
pending_dialog_record(&queue, 42, 77)
.expect("pending source")
.id,
pending
);
assert!(pending_dialog_record(&queue, 42, 79).is_none());
queue.complete(pending, now).expect("complete target");
assert!(pending_dialog_record(&queue, 42, 77).is_none());
}

#[tokio::test]
async fn taskman_edited_effects_update_pending_dialog_and_image_jobs()
-> Result<(), Box<dyn Error>> {
Expand Down
Loading
Loading