-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
editoast: add autofix of operational points parts
- Loading branch information
1 parent
17e2a67
commit f7b218a
Showing
4 changed files
with
206 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
188 changes: 184 additions & 4 deletions
188
editoast/src/views/infra/auto_fixes/operational_point.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,206 @@ | ||
| use editoast_schemas::primitives::OSRDIdentified; | ||
| use editoast_schemas::primitives::OSRDObject as _; | ||
| use editoast_schemas::primitives::ObjectRef; | ||
| use editoast_schemas::primitives::ObjectType; | ||
| use itertools::Itertools; | ||
| use json_patch::Patch; | ||
| use json_patch::PatchOperation; | ||
| use json_patch::RemoveOperation; | ||
| use std::collections::HashMap; | ||
|
|
||
| use tracing::debug; | ||
|
|
||
| use super::new_ref_fix_delete_pair; | ||
| use super::Fix; | ||
| use super::OrderedOperation; | ||
| use crate::generated_data::infra_error::InfraError; | ||
| use crate::generated_data::infra_error::InfraErrorType; | ||
| use crate::infra_cache::object_cache::OperationalPointCache; | ||
| use crate::infra_cache::operation::CacheOperation; | ||
| use crate::infra_cache::operation::DeleteOperation; | ||
| use crate::infra_cache::operation::Operation; | ||
| use crate::infra_cache::operation::UpdateOperation; | ||
| use crate::infra_cache::ObjectCache; | ||
|
|
||
| fn invalid_reference_to_ordered_operation( | ||
| operational_point: &OperationalPointCache, | ||
| object_ref: &ObjectRef, | ||
| ) -> Option<OrderedOperation> { | ||
| let (track_refs, _) = operational_point | ||
| .parts | ||
| .iter() | ||
| .enumerate() | ||
| .find(|(_idx, part)| part.track.as_str() == object_ref.obj_id)?; | ||
| Some(OrderedOperation::RemoveTrackRef { track_refs }) | ||
| } | ||
|
|
||
| pub fn fix_operational_point( | ||
| operational_point: &OperationalPointCache, | ||
| errors: impl Iterator<Item = InfraError>, | ||
| ) -> HashMap<ObjectRef, Fix> { | ||
| errors | ||
| let mut new_op = operational_point.clone(); | ||
| let operation = errors | ||
| .filter_map(|infra_error| match infra_error.get_sub_type() { | ||
| InfraErrorType::EmptyObject => Some(new_ref_fix_delete_pair(operational_point)), | ||
| InfraErrorType::EmptyObject => Some(OrderedOperation::Delete), | ||
| InfraErrorType::InvalidReference { reference } | ||
| if reference.obj_type == ObjectType::TrackSection => | ||
| { | ||
| new_op | ||
| .parts | ||
| .retain(|part| part.track.as_str() != reference.obj_id); | ||
| invalid_reference_to_ordered_operation(operational_point, reference) | ||
| } | ||
| _ => { | ||
| debug!("error not (yet) fixable for '{}'", infra_error.get_type()); | ||
| None | ||
| } | ||
| }) | ||
| .unique() | ||
| // Need to invert the ordering because removing from the front would invalidate other indexes | ||
| .sorted_by_key(|ordered_operation| std::cmp::Reverse(ordered_operation.clone())) | ||
| .map(|ordered_operation| match ordered_operation { | ||
| OrderedOperation::RemoveTrackRef { track_refs } => Operation::Update(UpdateOperation { | ||
| obj_id: operational_point.get_id().clone(), | ||
| obj_type: operational_point.get_type(), | ||
| railjson_patch: Patch(vec![PatchOperation::Remove(RemoveOperation { | ||
| path: format!("/parts/{track_refs}").parse().unwrap(), | ||
| })]), | ||
| }), | ||
| OrderedOperation::Delete => { | ||
| Operation::Delete(DeleteOperation::from(operational_point.get_ref())) | ||
| } | ||
| }) | ||
| .map(Some) | ||
| .reduce(super::reduce_operation) | ||
| .flatten(); | ||
| operation | ||
| .map(|operation| { | ||
| let cache_operation = match operation { | ||
| Operation::Update(_) => CacheOperation::Update(ObjectCache::from(new_op)), | ||
| Operation::Delete(_) => CacheOperation::Delete(operational_point.get_ref()), | ||
| Operation::Create(_) => panic!("We should not create new operational points"), | ||
| }; | ||
| (operational_point.get_ref(), (operation, cache_operation)) | ||
| }) | ||
| .into_iter() | ||
| .collect() | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use json_patch::Patch; | ||
|
|
||
| use crate::generated_data::infra_error::InfraError; | ||
| use crate::infra_cache::object_cache::OperationalPointCache; | ||
| use crate::infra_cache::object_cache::OperationalPointPartCache; | ||
| use crate::infra_cache::operation::CacheOperation; | ||
| use crate::infra_cache::operation::Operation; | ||
| use crate::infra_cache::ObjectCache; | ||
| use editoast_schemas::primitives::Identifier; | ||
| use editoast_schemas::primitives::OSRDObject as _; | ||
| use editoast_schemas::primitives::ObjectRef; | ||
| use editoast_schemas::primitives::ObjectType; | ||
|
|
||
| #[test] | ||
| fn invalid_refs_ordered_operational_point() { | ||
| let op_cache = OperationalPointCache { | ||
| obj_id: "operational_point_id".into(), | ||
| parts: vec![ | ||
| OperationalPointPartCache { | ||
| track: Identifier::from("unknown_track_section_1"), | ||
| position: 0., | ||
| }, | ||
| OperationalPointPartCache { | ||
| track: Identifier::from("track_section_id"), | ||
| position: 0., | ||
| }, | ||
| OperationalPointPartCache { | ||
| track: Identifier::from("unknown_track_section_2"), | ||
| position: 0., | ||
| }, | ||
| ], | ||
| }; | ||
| let error_op_1 = InfraError::new_invalid_reference( | ||
| &op_cache, | ||
| "parts.0", | ||
| ObjectRef::new(ObjectType::TrackSection, "unknown_track_section_1"), | ||
| ); | ||
| let error_op_2 = InfraError::new_invalid_reference( | ||
| &op_cache, | ||
| "parts.2", | ||
| ObjectRef::new(ObjectType::TrackSection, "unknown_track_section_2"), | ||
| ); | ||
|
|
||
| let operations = | ||
| super::fix_operational_point(&op_cache, vec![error_op_1, error_op_2].into_iter()); | ||
|
|
||
| assert_eq!(operations.len(), 1); | ||
|
|
||
| let (operation, cache_operation) = operations.get(&op_cache.get_ref()).unwrap(); | ||
| let Operation::Update(update_operation) = operation else { | ||
| panic!("not an `Operation::Update`"); | ||
| }; | ||
| assert_eq!(update_operation.obj_id, "operational_point_id"); | ||
| assert!(matches!( | ||
| update_operation.obj_type, | ||
| ObjectType::OperationalPoint | ||
| )); | ||
| assert_eq!( | ||
| update_operation.railjson_patch, | ||
| serde_json::from_str::<Patch>( | ||
| r#"[ | ||
| {"op":"remove","path":"/parts/2"}, | ||
| {"op":"remove","path":"/parts/0"} | ||
| ]"# | ||
| ) | ||
| .unwrap() | ||
| ); | ||
| let CacheOperation::Update(ObjectCache::OperationalPoint(op)) = cache_operation else { | ||
| panic!("not a `CacheOperation::Update(ObjectCache::OperationalPoint())`"); | ||
| }; | ||
| assert_eq!(op.parts.len(), 1); | ||
| assert_eq!(op.parts[0].track.0, "track_section_id"); | ||
| } | ||
|
|
||
| #[test] | ||
| fn empty_object_and_invalid_ref_operational_points() { | ||
| let op_cache = OperationalPointCache { | ||
| obj_id: "operational_point_id".into(), | ||
| parts: vec![ | ||
| OperationalPointPartCache { | ||
| track: Identifier::from("unknown_track_section_1"), | ||
| position: 0., | ||
| }, | ||
| OperationalPointPartCache { | ||
| track: Identifier::from("track_section_id"), | ||
| position: 0., | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| let error_op_1 = InfraError::new_invalid_reference( | ||
| &op_cache, | ||
| "parts.0", | ||
| ObjectRef::new(ObjectType::TrackSection, "unknown_track_section_1"), | ||
| ); | ||
| let error_op_2 = InfraError::new_empty_object(&op_cache, "parts"); | ||
|
|
||
| let operations = | ||
| super::fix_operational_point(&op_cache, vec![error_op_1, error_op_2].into_iter()); | ||
|
|
||
| assert_eq!(operations.len(), 1); | ||
|
|
||
| let (operation, cache_operation) = operations.get(&op_cache.get_ref()).unwrap(); | ||
| let Operation::Delete(delete_operation) = operation else { | ||
| panic!("not an `Operation::Delete`"); | ||
| }; | ||
| assert_eq!(delete_operation.obj_id, "operational_point_id"); | ||
| assert!(matches!( | ||
| delete_operation.obj_type, | ||
| ObjectType::OperationalPoint | ||
| )); | ||
| let CacheOperation::Delete(object_ref) = cache_operation else { | ||
| panic!("not a `CacheOperation::Delete()`"); | ||
| }; | ||
| assert_eq!(object_ref.obj_id, "operational_point_id"); | ||
| assert_eq!(object_ref.obj_type, ObjectType::OperationalPoint); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters