Skip to content

Use request data for undo #17

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
merged 12 commits into from
Feb 28, 2024
Merged

Use request data for undo #17

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3a07300
first refac
HantingZhang2 Feb 16, 2024
498a920
finish the extract function
HantingZhang2 Feb 16, 2024
963fc22
Refactor
HantingZhang2 Feb 21, 2024
157b692
Change fixture
HantingZhang2 Feb 22, 2024
7ba2e9e
Merge branch 'master' into hzhang-use-request-data-for-undo
HantingZhang2 Feb 22, 2024
dbff421
Refactor
HantingZhang2 Feb 22, 2024
a56ac2f
Remove useless part
HantingZhang2 Feb 22, 2024
8969adf
remove prints
HantingZhang2 Feb 22, 2024
0baddc9
remove useless line
HantingZhang2 Feb 22, 2024
a416183
Merge branch 'master' into hzhang-use-request-data-for-undo
HantingZhang2 Feb 26, 2024
b64a5ad
lint
skarimo Feb 28, 2024
f3b3700
Merge branch 'master' into hzhang-use-request-data-for-undo
skarimo Feb 28, 2024
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
132 changes: 107 additions & 25 deletions tests/scenarios/fixtures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub async fn before_scenario(
// freeze_file
// .write_all(
// DateTime::to_rfc3339(
// &DateTime::from_timestamp(frozen_time as i64, 0)
// &DateTime::from_timestamp(frozen_time.num_milliseconds() as i64, 0)
// .expect("failed to convert timestamp to datetime"),
// )
// .as_bytes(),
Expand Down Expand Up @@ -356,8 +356,12 @@ pub fn given_resource_in_system(
} else if let Value::Object(ref mut map) = world.fixtures {
map.insert(given_key.clone(), world.response.object.clone());
}

match build_undo(world, &operation_id, Some(given_key)) {
match build_undo(
world,
&operation_id,
Some(given_key),
given_parameters.clone(),
) {
Ok(Some(undo)) => world.undo_operations.push(undo),
Ok(None) => {}
Err(err) => panic!("{err}"),
Expand Down Expand Up @@ -442,7 +446,12 @@ fn request_sent(world: &mut DatadogWorld) {
world.operation_id
))(world, &world.parameters.clone());

match build_undo(world, &world.operation_id.clone(), None) {
match build_undo(
world,
&world.operation_id.clone(),
None,
world.parameters.clone(),
) {
Ok(Some(undo)) => {
world.undo_operations.push(undo);
}
Expand Down Expand Up @@ -650,10 +659,80 @@ fn template(string: String, fixtures: &Value) -> String {
.expect("failed to apply template")
}

fn process_param_from_response(
param: &Value,
undo_operation: &mut UndoOperation,
given_key: Option<String>,
world: &DatadogWorld,
) {
let param_name = param.get("name").unwrap().as_str().unwrap().to_string();

if let Some(source) = param.get("source") {
if let Some(value) = lookup(
&source.as_str().unwrap().to_string(),
&world.response.object,
) {
undo_operation.parameters.insert(param_name.clone(), value);
}
}

if let Some(template_value) = param.get("template") {
if let Some(rendered) = template_value.as_str() {
let json_value = match given_key.clone() {
Some(key) => template(
rendered.to_string(),
&world
.fixtures
.get(&key)
.unwrap_or_else(|| &world.response.object),
),
None => template(rendered.to_string(), &world.response.object),
};
undo_operation.parameters.insert(
param_name.clone(),
serde_json::from_str(json_value.as_str()).unwrap(),
);
}
}
}

fn process_param_from_request(
param: &Value,
undo_operation: &mut UndoOperation,
request_parameters: HashMap<String, Value>,
) {
let param_name = param.get("name").unwrap().as_str().unwrap().to_string();

if let Some(source) = param.get("source") {
if let Some(value) = lookup(
&source.as_str().unwrap().to_string(),
&serde_json::to_value(&request_parameters).unwrap(),
) {
undo_operation.parameters.insert(param_name.clone(), value);
}
}
let request_params_value = &serde_json::to_value(
&request_parameters
.get(&param_name)
.unwrap_or(&serde_json::Value::Null),
)
.unwrap();
if let Some(template_value) = param.get("template") {
if let Some(rendered) = template_value.as_str() {
let json_value = template(rendered.to_string(), request_params_value);
undo_operation.parameters.insert(
param_name.clone(),
serde_json::from_str(json_value.as_str()).unwrap(),
);
}
}
}

fn build_undo(
world: &mut DatadogWorld,
operation_id: &String,
given_key: Option<String>,
request_parameters: HashMap<String, Value>,
) -> Result<Option<UndoOperation>, Value> {
if world.response.code < 200 || world.response.code >= 300 {
return Ok(None);
Expand Down Expand Up @@ -705,29 +784,32 @@ fn build_undo(

let params = undo.get("parameters").unwrap().as_array().unwrap();
for param in params {
let param_name = param.get("name").unwrap().as_str().unwrap().to_string();
if let Some(source) = param.get("source") {
if let Some(value) = lookup(
&source.as_str().unwrap().to_string(),
&world.response.object,
) {
undo_operation.parameters.insert(param_name.clone(), value);
match param.get("origin") {
Some(origin) => {
if origin == "response" {
process_param_from_response(
param,
&mut undo_operation,
given_key.clone(),
world,
);
} else if origin == "request" {
process_param_from_request(
param,
&mut undo_operation,
request_parameters.clone(),
);
}
}
};
if let Some(template_value) = param.get("template") {
if let Some(rendered) = template_value.as_str() {
let json_value = match given_key.clone() {
Some(key) => {
template(rendered.to_string(), &world.fixtures.get(key).unwrap())
}
None => template(rendered.to_string(), &world.response.object),
};
undo_operation.parameters.insert(
param_name.clone(),
serde_json::from_str(json_value.as_str()).unwrap(),
None => {
process_param_from_response(
param,
&mut undo_operation,
given_key.clone(),
world,
);
};
};
}
}
}
Ok(Some(undo_operation))
}
Expand Down