mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-11-17 06:01:21 +01:00
Format the request versioning code with rustfmt
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
1b0a196c50
commit
1062de4862
6 files changed
+56
-40
No files matched your search
@@ -176,9 +176,8 @@ pub async fn cmd_ws_connect<R: Runtime>(
|
||||
let connection = app_handle.with_tx(|tx| {
|
||||
// Capture the stored request, not the rendered one: what a restore should
|
||||
// put back is what the user typed
|
||||
let version_id = tx.snapshot_request_for_send(&AnyRequest::WebsocketRequest(
|
||||
unrendered_request.clone(),
|
||||
));
|
||||
let version_id =
|
||||
tx.snapshot_request_for_send(&AnyRequest::WebsocketRequest(unrendered_request.clone()));
|
||||
tx.upsert_websocket_connection(
|
||||
&WebsocketConnection {
|
||||
workspace_id: request.workspace_id.clone(),
|
||||
|
||||
@@ -7,8 +7,8 @@ use yaak_models::models::{
|
||||
AnyModel, GraphQlIntrospection, GrpcEvent, HttpRequestHeader, ModelVersion,
|
||||
RequestVersionComparison, Settings, WebsocketEvent, WorkspaceMeta,
|
||||
};
|
||||
use yaak_models::versions::version_document;
|
||||
use yaak_models::queries::workspaces::default_headers;
|
||||
use yaak_models::versions::version_document;
|
||||
use yaak_rpc_schema::*;
|
||||
|
||||
pub async fn models_upsert<H: Host>(host: H, req: ModelsUpsertReq) -> Result<String> {
|
||||
@@ -57,9 +57,7 @@ pub async fn models_snapshot_request<H: Host>(
|
||||
host: H,
|
||||
req: ModelsSnapshotRequestReq,
|
||||
) -> Result<ModelVersion> {
|
||||
Ok(host
|
||||
.query_manager()
|
||||
.with_tx(|tx| tx.snapshot_request_by_id(&req.request_id, req.reason))?)
|
||||
Ok(host.query_manager().with_tx(|tx| tx.snapshot_request_by_id(&req.request_id, req.reason))?)
|
||||
}
|
||||
|
||||
/// A version and the live request side by side, for the diff and for deciding
|
||||
@@ -81,9 +79,8 @@ pub async fn models_restore_request_version<H: Host>(
|
||||
req: ModelsRestoreRequestVersionReq,
|
||||
) -> Result<String> {
|
||||
let source = host.update_source();
|
||||
let restored = host
|
||||
.query_manager()
|
||||
.with_tx(|tx| tx.restore_request_version(&req.version_id, &source))?;
|
||||
let restored =
|
||||
host.query_manager().with_tx(|tx| tx.restore_request_version(&req.version_id, &source))?;
|
||||
Ok(restored.id().to_string())
|
||||
}
|
||||
|
||||
|
||||
@@ -130,12 +130,14 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn key_order_does_not_change_the_hash_when_nested() {
|
||||
let a: Value =
|
||||
serde_json::from_str(r#"{"body":{"text":"x","type":"json"},"headers":[{"a":1,"b":2}]}"#)
|
||||
.unwrap();
|
||||
let b: Value =
|
||||
serde_json::from_str(r#"{"headers":[{"b":2,"a":1}],"body":{"type":"json","text":"x"}}"#)
|
||||
.unwrap();
|
||||
let a: Value = serde_json::from_str(
|
||||
r#"{"body":{"text":"x","type":"json"},"headers":[{"a":1,"b":2}]}"#,
|
||||
)
|
||||
.unwrap();
|
||||
let b: Value = serde_json::from_str(
|
||||
r#"{"headers":[{"b":2,"a":1}],"body":{"type":"json","text":"x"}}"#,
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(content_hash(&a).unwrap(), content_hash(&b).unwrap());
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use crate::client_db::{ClientDb, WriteDb};
|
||||
use crate::content::content_hash;
|
||||
use crate::error::Result;
|
||||
use crate::models::{
|
||||
GrpcRequest, HttpRequest, ModelVersion, ModelVersionIden, ModelVersionReason, UpsertModelInfo,
|
||||
@@ -6,7 +7,6 @@ use crate::models::{
|
||||
};
|
||||
use crate::queries::any_request::AnyRequest;
|
||||
use crate::util::UpdateSource;
|
||||
use crate::content::content_hash;
|
||||
use crate::versions::{apply_version_document, version_document};
|
||||
use log::warn;
|
||||
use sea_query::{Expr, ExprTrait, Query, SqliteQueryBuilder};
|
||||
@@ -139,18 +139,24 @@ impl<'a> WriteDb<'a> {
|
||||
|
||||
let restored = apply_version_document(&live.to_value()?, &version.document);
|
||||
Ok(match live {
|
||||
AnyRequest::HttpRequest(_) => AnyRequest::HttpRequest(
|
||||
self.upsert_http_request(&serde_json::from_value::<HttpRequest>(restored)?, source)?,
|
||||
),
|
||||
AnyRequest::GrpcRequest(_) => AnyRequest::GrpcRequest(
|
||||
self.upsert_grpc_request(&serde_json::from_value::<GrpcRequest>(restored)?, source)?,
|
||||
),
|
||||
AnyRequest::WebsocketRequest(_) => AnyRequest::WebsocketRequest(
|
||||
self.upsert_websocket_request(
|
||||
AnyRequest::HttpRequest(_) => {
|
||||
AnyRequest::HttpRequest(self.upsert_http_request(
|
||||
&serde_json::from_value::<HttpRequest>(restored)?,
|
||||
source,
|
||||
)?)
|
||||
}
|
||||
AnyRequest::GrpcRequest(_) => {
|
||||
AnyRequest::GrpcRequest(self.upsert_grpc_request(
|
||||
&serde_json::from_value::<GrpcRequest>(restored)?,
|
||||
source,
|
||||
)?)
|
||||
}
|
||||
AnyRequest::WebsocketRequest(_) => {
|
||||
AnyRequest::WebsocketRequest(self.upsert_websocket_request(
|
||||
&serde_json::from_value::<WebsocketRequest>(restored)?,
|
||||
source,
|
||||
)?,
|
||||
),
|
||||
)?)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -213,7 +219,10 @@ mod tests {
|
||||
|
||||
fn seed(db: &WriteDb) -> (Workspace, HttpRequest) {
|
||||
let workspace = db
|
||||
.upsert_workspace(&Workspace { name: "Versions".to_string(), ..Default::default() }, &source())
|
||||
.upsert_workspace(
|
||||
&Workspace { name: "Versions".to_string(), ..Default::default() },
|
||||
&source(),
|
||||
)
|
||||
.expect("Failed to upsert workspace");
|
||||
let request = db
|
||||
.upsert_http_request(
|
||||
@@ -298,7 +307,10 @@ mod tests {
|
||||
};
|
||||
|
||||
let request = db
|
||||
.upsert_http_request(&HttpRequest { headers: vec![header(None)], ..request }, &source())
|
||||
.upsert_http_request(
|
||||
&HttpRequest { headers: vec![header(None)], ..request },
|
||||
&source(),
|
||||
)
|
||||
.unwrap();
|
||||
let first = snapshot(db, &request.id, ModelVersionReason::Send);
|
||||
|
||||
|
||||
@@ -100,8 +100,11 @@ mod tests {
|
||||
let resorted = HttpRequest { sort_priority: 99.5, ..request() };
|
||||
assert_eq!(hash_of(&resorted), base, "sort priority");
|
||||
|
||||
let touched =
|
||||
HttpRequest { updated_at: Utc::now().naive_utc(), created_at: Utc::now().naive_utc(), ..request() };
|
||||
let touched = HttpRequest {
|
||||
updated_at: Utc::now().naive_utc(),
|
||||
created_at: Utc::now().naive_utc(),
|
||||
..request()
|
||||
};
|
||||
assert_eq!(hash_of(&touched), base, "timestamps");
|
||||
|
||||
let renamed_id = HttpRequest { id: "rq_2".to_string(), ..request() };
|
||||
@@ -120,8 +123,7 @@ mod tests {
|
||||
let base = version_document(&request()).unwrap();
|
||||
let moved =
|
||||
version_document(&HttpRequest { folder_id: Some("fl_2".into()), ..request() }).unwrap();
|
||||
let resorted =
|
||||
version_document(&HttpRequest { sort_priority: 99.5, ..request() }).unwrap();
|
||||
let resorted = version_document(&HttpRequest { sort_priority: 99.5, ..request() }).unwrap();
|
||||
|
||||
assert_eq!(moved, base);
|
||||
assert_eq!(resorted, base);
|
||||
@@ -131,7 +133,10 @@ mod tests {
|
||||
fn editable_content_changes_the_hash() {
|
||||
let base = hash_of(&request());
|
||||
|
||||
assert_ne!(hash_of(&HttpRequest { url: "https://example.com/users/2".into(), ..request() }), base);
|
||||
assert_ne!(
|
||||
hash_of(&HttpRequest { url: "https://example.com/users/2".into(), ..request() }),
|
||||
base
|
||||
);
|
||||
assert_ne!(hash_of(&HttpRequest { method: "POST".into(), ..request() }), base);
|
||||
assert_ne!(hash_of(&HttpRequest { name: "Get other user".into(), ..request() }), base);
|
||||
assert_ne!(hash_of(&HttpRequest { description: "Notes".into(), ..request() }), base);
|
||||
@@ -142,9 +147,6 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#[test]
|
||||
fn applying_a_document_keeps_the_live_model_identity() {
|
||||
let live = serde_json::to_value(request()).unwrap();
|
||||
|
||||
@@ -24,8 +24,8 @@ use yaak_http::types::{
|
||||
use yaak_models::blob_manager::{BODY_CHUNK_SIZE, BlobManager, BodyChunk, BodyChunkWriter};
|
||||
use yaak_models::models::{
|
||||
ClientCertificate, Cookie, CookieJar, DnsOverride, Environment, HttpRequest, HttpResponse,
|
||||
HttpResponseEvent, HttpResponseEventData, HttpResponseHeader, HttpResponseState,
|
||||
ProxySetting, ProxySettingAuth, ResolvedHttpRequestSettings,
|
||||
HttpResponseEvent, HttpResponseEventData, HttpResponseHeader, HttpResponseState, ProxySetting,
|
||||
ProxySettingAuth, ResolvedHttpRequestSettings,
|
||||
};
|
||||
use yaak_models::queries::any_request::AnyRequest;
|
||||
use yaak_models::query_manager::QueryManager;
|
||||
@@ -1512,7 +1512,11 @@ mod tests {
|
||||
let second = stored_send(&query_manager, &blob_manager, temp_dir.path(), &request).await;
|
||||
|
||||
let version_id = first.version_id.clone().expect("a stored send must record a version");
|
||||
assert_eq!(second.version_id, Some(version_id.clone()), "an unchanged request is one version");
|
||||
assert_eq!(
|
||||
second.version_id,
|
||||
Some(version_id.clone()),
|
||||
"an unchanged request is one version"
|
||||
);
|
||||
|
||||
let db = query_manager.connect();
|
||||
let version = db.get_model_version(&version_id).expect("Failed to load version");
|
||||
|
||||
Reference in new issue
Block a user