Skip to content

Commit 9559d98

Browse files
committed
front: change arrivalDate type to Date in isArrivalDateInSearchTimeWindow
Signed-off-by: SarahBellaha <sarah.bellaha@sncf.fr>
1 parent 48cb9e5 commit 9559d98

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const StdcmOpSchedule = ({
6161
useMemo(() => {
6262
const isArrivalDateValid =
6363
opTimingData?.arrivalDate &&
64-
isArrivalDateInSearchTimeWindow(opTimingData.arrivalDate, searchDatetimeWindow);
64+
isArrivalDateInSearchTimeWindow(new Date(opTimingData.arrivalDate), searchDatetimeWindow);
6565
return {
6666
arrivalDate:
6767
opTimingData && isArrivalDateValid

front/src/utils/__tests__/date.spec.ts

+9-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ describe('extractDateAndTimefromISO', () => {
116116

117117
describe('isArrivalDateInSearchTimeWindow', () => {
118118
it('should return true if searchDatetimeWindow is undefined', () => {
119-
const result = isArrivalDateInSearchTimeWindow('2024-08-01T10:00:00Z', undefined);
119+
const result = isArrivalDateInSearchTimeWindow(new Date('2024-08-01T10:00:00Z'), undefined);
120120
expect(result).toBe(true);
121121
});
122122

@@ -125,7 +125,10 @@ describe('isArrivalDateInSearchTimeWindow', () => {
125125
begin: new Date('2024-08-01T00:00:00Z'),
126126
end: new Date('2024-08-02T00:00:00Z'),
127127
};
128-
const result = isArrivalDateInSearchTimeWindow('2024-08-01T10:00:00Z', searchDatetimeWindow);
128+
const result = isArrivalDateInSearchTimeWindow(
129+
new Date('2024-08-01T10:00:00Z'),
130+
searchDatetimeWindow
131+
);
129132
expect(result).toBe(true);
130133
});
131134

@@ -134,7 +137,10 @@ describe('isArrivalDateInSearchTimeWindow', () => {
134137
begin: new Date('2024-08-01T00:00:00Z'),
135138
end: new Date('2024-08-02T00:00:00Z'),
136139
};
137-
const result = isArrivalDateInSearchTimeWindow('2024-07-30T23:59:59Z', searchDatetimeWindow);
140+
const result = isArrivalDateInSearchTimeWindow(
141+
new Date('2024-07-30T23:59:59Z'),
142+
searchDatetimeWindow
143+
);
138144
expect(result).toBe(false);
139145
});
140146
});

front/src/utils/date.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -218,18 +218,17 @@ export function extractDateAndTimefromISO(arrivalTime: string, dateFormat: strin
218218
/**
219219
* Checks if the given arrival date falls within the specified search time window.
220220
*
221-
* @param {string | Date} arrivalTime - The arrival time, which can be a Date object or an ISO string that will be parsed into a Date object.
221+
* @param {Date} arrivalDate - The arrival time, which is a Date object.
222222
* @param {{ begin: Date; end: Date } | undefined} searchDatetimeWindow - An object containing the start and end dates of the search window. If undefined, the function will return true.
223223
* @returns {boolean} - Returns true if the arrival date is within the search time window, or if the search time window is undefined. Returns false otherwise.
224224
*/
225225
export function isArrivalDateInSearchTimeWindow(
226-
arrivalTime: string | Date,
226+
arrivalDate: Date,
227227
searchDatetimeWindow?: { begin: Date; end: Date }
228228
) {
229229
if (!searchDatetimeWindow) {
230230
return true;
231231
}
232-
const arrivalDate = typeof arrivalTime === 'string' ? new Date(arrivalTime) : arrivalTime;
233232
return arrivalDate >= searchDatetimeWindow.begin && arrivalDate <= searchDatetimeWindow.end;
234233
}
235234

0 commit comments

Comments
 (0)