align capture endpoint with run endpoint

This commit is contained in:
Ruben Fiszel
2023-09-15 01:06:53 +02:00
parent 019601959f
commit 7cd563596d
2 changed files with 8 additions and 7 deletions
+5 -4
View File
@@ -9,7 +9,7 @@
use axum::{
extract::{Extension, Path, Query},
routing::{get, post, put},
Json, Router,
Router,
};
use hyper::{HeaderMap, StatusCode};
use serde::Deserialize;
@@ -21,7 +21,7 @@ use windmill_common::{
use crate::{
db::{ApiAuthed, DB},
jobs::add_include_headers,
jobs::{add_include_headers, add_raw_string, JsonOrForm},
};
const KEEP_LAST: i64 = 8;
@@ -95,11 +95,12 @@ pub async fn update_payload(
Path((w_id, path)): Path<(String, StripPath)>,
Query(run_query): Query<IncludeHeaderQuery>,
headers: HeaderMap,
Json(args): Json<Option<serde_json::Map<String, serde_json::Value>>>,
JsonOrForm(args, raw_string): JsonOrForm,
) -> Result<StatusCode> {
let mut tx = db.begin().await?;
let args = add_include_headers(&run_query.include_header, headers, args.unwrap_or_default());
let args = add_raw_string(raw_string, args);
sqlx::query!(
"
UPDATE capture
+3 -3
View File
@@ -1480,8 +1480,8 @@ struct PreviewFlow {
}
pub struct JsonOrForm(
Option<serde_json::Map<String, serde_json::Value>>,
Option<String>,
pub Option<serde_json::Map<String, serde_json::Value>>,
pub Option<String>,
);
#[axum::async_trait]
@@ -1594,7 +1594,7 @@ fn decode_payload<D: DeserializeOwned>(t: String) -> anyhow::Result<D> {
serde_json::from_slice(vec.as_slice()).context("invalid json")
}
fn add_raw_string(
pub fn add_raw_string(
raw_string: Option<String>,
mut args: serde_json::Map<String, serde_json::Value>,
) -> serde_json::Map<String, serde_json::Value> {