fixup! editoast: pathfinding: add CI/CH codes to pathfinding response

Author: Yohh

editoast/openapi.yaml

@@ -1333,6 +1333,8 @@ components:
       - suggestion
       - geo
       - sch
+      - uic
+      - ch
       type: object
     PathfindingPayload:
       description: |-

editoast/src/models/pathfinding.rs

@@ -185,7 +185,9 @@ pub struct PathWaypoint {
     ))]
     #[schema(value_type = GeoJsonPoint)]
     pub sch: geojson::Geometry,
+    #[schema(required)]
     pub uic: Option<i64>,
+    #[schema(required)]
     pub ch: Option<String>,
 }
 

editoast/src/views/pathfinding/mod.rs

@@ -375,20 +375,18 @@ impl Pathfinding {
                 } else {
                     steps_duration.next().unwrap()
                 };
-                let mut op_name = None;
-                let mut op_uic = None;
-                let mut op_ch = None;
-                let op = waypoint
-                    .id
-                    .as_ref()
-                    .map(|op_id| op_map.get(op_id).expect("unexpected OP id"));
-                op.and_then(|op| op.extensions.identifier.as_ref())
-                    .map(|ident| {
-                        op_name = Some(ident.name.as_ref().to_owned());
-                        op_uic = Some(ident.uic);
-                    });
-                op.and_then(|op| op.extensions.sncf.as_ref())
-                    .map(|sncf| op_ch = Some(sncf.ch.to_owned()));
+                let op_info = waypoint.id.as_ref().map(|op_id| {
+                    let op = op_map.get(op_id).expect("unexpected OP id");
+                    let name = op
+                        .extensions
+                        .identifier
+                        .as_ref()
+                        .map(|ident| ident.name.as_ref().to_owned());
+                    let uic = op.extensions.identifier.as_ref().map(|ident| ident.uic);
+                    let ch = op.extensions.sncf.as_ref().map(|sncf| sncf.ch.to_owned());
+                    (name, uic, ch)
+                });
+                let (name, uic, ch) = op_info.unwrap_or_default();
                 let track = track_map
                     .get(&waypoint.location.track_section.0)
                     .expect("unexpected track id");
@@ -405,15 +403,15 @@ impl Pathfinding {
                 let sch = geos::geojson::Geometry::try_from(sch).unwrap();
                 PathWaypoint {
                     id: waypoint.id.clone(),
-                    name: op_name,
+                    name,
                     location: waypoint.location.clone(),
                     duration,
                     path_offset: waypoint.path_offset,
                     suggestion: waypoint.suggestion,
                     geo,
                     sch,
-                    uic: op_uic,
-                    ch: op_ch,
+                    uic,
+                    ch,
                 }
             })
             .collect();

tests/tests/test_pathfinding.py

@@ -52,7 +52,6 @@
         "curves": [{"radius": 0.0, "position": 0.0}, {"radius": 0.0, "position": 45549.5653000392}],
         "steps": [
             {
-                "ch": None,
                 "id": None,
                 "name": None,
                 "location": {"track_section": "TA2", "offset": 837.033949007362},
@@ -61,10 +60,10 @@
                 "suggestion": False,
                 "geo": {"coordinates": [-0.387122554630656, 49.49979999999999], "type": "Point"},
                 "sch": {"coordinates": [-0.387122554630656, 49.49979999999999], "type": "Point"},
+                "ch": None,
                 "uic": None,
             },
             {
-                "ch": None,
                 "id": "Mid_West_station",
                 "name": "Mid_West_station",
                 "location": {"track_section": "TC2", "offset": 450.0},
@@ -73,10 +72,10 @@
                 "suggestion": True,
                 "geo": {"coordinates": [-0.30369999999999997, 49.4999], "type": "Point"},
                 "sch": {"coordinates": [-0.30369999999999997, 49.4999], "type": "Point"},
-                "uic": None,
+                "ch": "aa",
+                "uic": 0,
             },
             {
-                "ch": None,
                 "id": "Mid_East_station",
                 "name": "Mid_East_station",
                 "location": {"track_section": "TD1", "offset": 14000.0},
@@ -85,10 +84,10 @@
                 "suggestion": True,
                 "geo": {"coordinates": [-0.22656, 49.4999], "type": "Point"},
                 "sch": {"coordinates": [-0.22656, 49.4999], "type": "Point"},
-                "uic": None,
+                "ch": "aa",
+                "uic": 0,
             },
             {
-                "ch": None,
                 "id": None,
                 "name": None,
                 "location": {"track_section": "TH1", "offset": 4386.599249046556},
@@ -97,6 +96,7 @@
                 "suggestion": False,
                 "geo": {"coordinates": [-0.095104854807785, 49.484], "type": "Point"},
                 "sch": {"coordinates": [-0.095104854807785, 49.484], "type": "Point"},
+                "ch": None,
                 "uic": None,
             },
         ],