front: use getStepLocation in pathfinding/utils and checkCurrentConfig

Signed-off-by: Clara Ni <[email protected]>

Author: clarani

front/src/modules/pathfinding/helpers/getStepLocation.ts

@@ -4,6 +4,8 @@ import { mToMm } from 'utils/physics';
 
 const getStepLocation = (step: PathStep | StdcmPathStep): PathItemLocation => {
   if ('track' in step) {
+    // TODO: step offset should be in mm in the store /!\
+    // pathfinding blocks endpoint requires offsets in mm
     return { track: step.track, offset: mToMm(step.offset) };
   }
   if ('operational_point' in step) {

front/src/modules/pathfinding/utils.ts

@@ -13,6 +13,8 @@ import type { PathStep } from 'reducers/osrdconf/types';
 import { addElementAtIndex } from 'utils/array';
 import { getPointCoordinates } from 'utils/geometry';
 
+import getStepLocation from './helpers/getStepLocation';
+
 export const formatSuggestedOperationalPoints = (
   operationalPoints: NonNullable<Required<PathProperties['operational_points']>>,
   geometry: GeoJsonLineString,
@@ -65,28 +67,9 @@ export const getPathfindingQuery = ({
 }): PostInfraByInfraIdPathfindingBlocksApiArg | null => {
   if (infraId && rollingStock && origin && destination) {
     // Only origin and destination can be null so we can compact and we want to remove any via that would be null
-    const pathItems: PathfindingInput['path_items'] = compact(pathSteps).map((step) => {
-      if ('uic' in step) {
-        return { uic: step.uic, secondary_code: step.ch };
-      }
-      if ('track' in step) {
-        return {
-          track: step.track,
-          // TODO: step offset should be in mm in the store /!\
-          // pathfinding blocks endpoint requires offsets in mm
-          offset: step.offset * 1000,
-        };
-      }
-      if ('operational_point' in step) {
-        return {
-          operational_point: step.operational_point,
-        };
-      }
-      return {
-        trigram: step.trigram,
-        secondary_code: step.ch,
-      };
-    });
+    const pathItems: PathfindingInput['path_items'] = compact(pathSteps).map((step) =>
+      getStepLocation(step)
+    );
 
     return {
       infraId,

front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/checkCurrentConfig.ts

@@ -1,12 +1,12 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import { compact } from 'lodash';
 import type { Dispatch } from 'redux';
 
+import getStepLocation from 'modules/pathfinding/helpers/getStepLocation';
 import type { ValidConfig } from 'modules/trainschedule/components/ManageTrainSchedule/types';
 import { setFailure } from 'reducers/main';
 import type { OsrdConfState } from 'reducers/osrdconf/types';
 import { isInvalidFloatNumber } from 'utils/numbers';
-import { kmhToMs, mToMm } from 'utils/physics';
+import { kmhToMs } from 'utils/physics';
 
 import formatMargin from './formatMargin';
 import formatSchedule from './formatSchedule';
@@ -145,32 +145,7 @@ const checkCurrentConfig = (
     rollingStockComfort,
     initialSpeed: initialSpeed ? kmhToMs(initialSpeed) : 0,
     usingElectricalProfiles,
-    path: compact(pathSteps).map((step) => {
-      // TODO use lodash pick
-      const {
-        arrival,
-        locked,
-        stopFor,
-        positionOnPath,
-        coordinates,
-        name,
-        ch,
-        metadata,
-        kp,
-        receptionSignal,
-        theoreticalMargin,
-        ...stepLocation
-      } = step;
-
-      if ('track' in stepLocation) {
-        return {
-          ...stepLocation,
-          offset: mToMm(stepLocation.offset),
-        };
-      }
-      return { ...stepLocation, secondary_code: ch };
-    }),
-
+    path: compact(pathSteps).map((step) => ({ id: step.id, ...getStepLocation(step) })),
     margins: formatMargin(compact(pathSteps)),
     schedule: formatSchedule(compact(pathSteps)),
     powerRestrictions: powerRestriction,