Formatting
This commit is contained in:
@@ -27,7 +27,7 @@ use doctate_common::constants::{
|
||||
API_KEY_HEADER, CONTENT_TYPE_AUDIO_MP4, FIELD_AUDIO, FIELD_CASE_ID, FIELD_RECORDED_AT,
|
||||
UPLOAD_PATH,
|
||||
};
|
||||
use doctate_common::oneliners::{OnelinersResponse, ONELINERS_PATH};
|
||||
use doctate_common::oneliners::{ONELINERS_PATH, OnelinersResponse};
|
||||
use reqwest::StatusCode;
|
||||
use tokio::sync::{mpsc, watch};
|
||||
use tokio::task::AbortHandle;
|
||||
@@ -36,7 +36,7 @@ use uuid::Uuid;
|
||||
|
||||
use crate::case_store::CaseStore;
|
||||
use crate::snapshot_cache::{CachedSnapshot, SnapshotCache};
|
||||
use crate::upload::{scan_pending_dir, sidecar_path_for, PendingUpload, UploadEvent};
|
||||
use crate::upload::{PendingUpload, UploadEvent, scan_pending_dir, sidecar_path_for};
|
||||
|
||||
const INITIAL_BACKOFF: Duration = Duration::from_secs(2);
|
||||
const MAX_BACKOFF: Duration = Duration::from_secs(60);
|
||||
@@ -233,8 +233,7 @@ async fn run_loop(
|
||||
let mut files = scan_pending_dir(&pending_dir);
|
||||
files.sort_by(|a, b| a.recorded_at.cmp(&b.recorded_at)); // FIFO
|
||||
let queue_len = files.len();
|
||||
let pending_ids: Arc<HashSet<Uuid>> =
|
||||
Arc::new(files.iter().map(|u| u.case_id).collect());
|
||||
let pending_ids: Arc<HashSet<Uuid>> = Arc::new(files.iter().map(|u| u.case_id).collect());
|
||||
let next = files.into_iter().next();
|
||||
|
||||
if let Some(upload) = next {
|
||||
@@ -565,7 +564,10 @@ mod tests {
|
||||
|
||||
let http = reqwest::Client::new();
|
||||
let outcome = post_upload(&http, &cfg(&server), &upload).await;
|
||||
assert!(matches!(outcome, UploadOutcome::Succeeded(AckStatus::Received)));
|
||||
assert!(matches!(
|
||||
outcome,
|
||||
UploadOutcome::Succeeded(AckStatus::Received)
|
||||
));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
@@ -710,7 +712,8 @@ mod tests {
|
||||
sample_pending(&pending_dir, case_id, "2026-04-18T10-00-00Z");
|
||||
|
||||
let (store, cache) = make_store_and_cache(&tmp).await;
|
||||
store.create_local(case_id, time::OffsetDateTime::now_utc())
|
||||
store
|
||||
.create_local(case_id, time::OffsetDateTime::now_utc())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
@@ -914,10 +917,11 @@ mod tests {
|
||||
async fn fifo_order_by_recorded_at() {
|
||||
let server = MockServer::start().await;
|
||||
// Record which case_ids we saw, in order.
|
||||
let seen: Arc<tokio::sync::Mutex<Vec<Uuid>>> = Arc::new(tokio::sync::Mutex::new(Vec::new()));
|
||||
let seen: Arc<tokio::sync::Mutex<Vec<Uuid>>> =
|
||||
Arc::new(tokio::sync::Mutex::new(Vec::new()));
|
||||
let seen_for_mock = seen.clone();
|
||||
let responder = wiremock::ResponseTemplate::new(200)
|
||||
.set_body_json(ack_body(AckStatus::Received));
|
||||
let responder =
|
||||
wiremock::ResponseTemplate::new(200).set_body_json(ack_body(AckStatus::Received));
|
||||
// Simpler: just let both POSTs succeed; infer order from event
|
||||
// stream on our side.
|
||||
let _ = seen_for_mock;
|
||||
|
||||
Reference in New Issue
Block a user