wip

Author: emersion

front/src/applications/operationalStudies/hooks/__tests__/useSetupItineraryForTrainUpdate.spec.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect } from 'vitest';
 
 import type { PathfindingResult } from 'common/api/osrdEditoastApi';
+import { populatePathStepIdInSuggestedOPs } from 'modules/pathfinding/utils';
 
 import { updatePathStepsFromOperationalPoints } from '../useSetupItineraryForTrainUpdate';
 
@@ -177,7 +178,7 @@ describe('updatePathStepsFrom', () => {
       ];
       const result = updatePathStepsFromOperationalPoints(
         pathSteps,
-        suggestedOpPoints,
+        populatePathStepIdInSuggestedOPs(suggestedOpPoints, pathSteps),
         pathFindingResult as Extract<PathfindingResult, { status: 'success' }>,
         stepsCoordinates
       );
@@ -253,7 +254,7 @@ describe('updatePathStepsFrom', () => {
       ];
       const result = updatePathStepsFromOperationalPoints(
         pathSteps,
-        suggestedOpPoints,
+        populatePathStepIdInSuggestedOPs(suggestedOpPoints, pathSteps),
         pathFindingResult as Extract<PathfindingResult, { status: 'success' }>,
         stepsCoordinates
       );

front/src/modules/pathfinding/utils.ts

@@ -32,6 +32,17 @@ export const matchPathStepAndOp = (
   return step.track === op.track && step.offset === op.offsetOnTrack;
 };
 
+export const populatePathStepIdInSuggestedOPs = (
+  suggestedOPs: SuggestedOP[],
+  pathSteps: PathStep[]
+): SuggestedOP[] =>
+  suggestedOPs.map((op) => ({
+    ...op,
+    pathStepId: pathSteps.find(
+      (pathStep) => matchPathStepAndOp(pathStep, op) // TODO: && op.kp === pathStep.kp
+    )?.id,
+  }));
+
 export const formatSuggestedOperationalPoints = (
   operationalPoints: Array<
     NonNullable<Required<PathProperties['operational_points']>>[number] & {
@@ -41,27 +52,22 @@ export const formatSuggestedOperationalPoints = (
   pathSteps: PathStep[],
   geometry: GeoJsonLineString,
   pathLength: number
-): SuggestedOP[] =>
-  operationalPoints
-    .map((op) => ({
-      opId: op.id,
-      name: op.extensions?.identifier?.name,
-      uic: op.extensions?.identifier?.uic,
-      ch: op.extensions?.sncf?.ch,
-      kp: op.part.extensions?.sncf?.kp,
-      trigram: op.extensions?.sncf?.trigram,
-      offsetOnTrack: op.part.position,
-      track: op.part.track,
-      positionOnPath: op.position,
-      coordinates: getPointCoordinates(geometry, pathLength, op.position),
-      metadata: op?.metadata,
-    }))
-    .map((op) => ({
-      ...op,
-      pathStepId: pathSteps.find(
-        (pathStep) => matchPathStepAndOp(pathStep, op) && op.kp === pathStep.kp
-      )?.id,
-    }));
+): SuggestedOP[] => {
+  const suggestedOPs = operationalPoints.map((op) => ({
+    opId: op.id,
+    name: op.extensions?.identifier?.name,
+    uic: op.extensions?.identifier?.uic,
+    ch: op.extensions?.sncf?.ch,
+    kp: op.part.extensions?.sncf?.kp,
+    trigram: op.extensions?.sncf?.trigram,
+    offsetOnTrack: op.part.position,
+    track: op.part.track,
+    positionOnPath: op.position,
+    coordinates: getPointCoordinates(geometry, pathLength, op.position),
+    metadata: op?.metadata,
+  }));
+  return populatePathStepIdInSuggestedOPs(suggestedOPs, pathSteps);
+};
 
 export const getPathfindingQuery = ({
   infraId,