Skip to content

editost: adapt track_occupancy endpoint with new exceptions#15793

Merged
Wadjetz merged 1 commit intofeatures/train-schedule-exceptionsfrom
ebe/editoast/adapt-track-occupancy-endpoint
Mar 26, 2026
Merged

editost: adapt track_occupancy endpoint with new exceptions#15793
Wadjetz merged 1 commit intofeatures/train-schedule-exceptionsfrom
ebe/editoast/adapt-track-occupancy-endpoint

Conversation

@Wadjetz
Copy link
Copy Markdown
Member

@Wadjetz Wadjetz commented Mar 17, 2026

Part of #15202

This PR adapt the /train_schedules/track_occupancyendpoint to use the new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now related to a timetable and not just to a train schedule
Fix tests and frontend

Note

This PR targets a feature branch and may contain all its commits, as it has not been rebased yet. Only the last commit need to be reviewed.

@Wadjetz Wadjetz self-assigned this Mar 17, 2026
@github-actions github-actions Bot added the area:editoast Work on Editoast Service label Mar 17, 2026
@theocrsb theocrsb force-pushed the features/train-schedule-exceptions branch from ca988aa to 33cc939 Compare March 18, 2026 08:20
@Wadjetz Wadjetz force-pushed the features/train-schedule-exceptions branch from 33cc939 to c35b312 Compare March 19, 2026 09:02
@Wadjetz Wadjetz force-pushed the ebe/editoast/adapt-track-occupancy-endpoint branch 2 times, most recently from 6107992 to 7365c96 Compare March 19, 2026 11:30
@github-actions github-actions Bot added area:front Work on Standard OSRD Interface modules kind:api-change labels Mar 19, 2026
@github-actions
Copy link
Copy Markdown
Contributor

⚠️ API changes

This Pull Request introduces some changes in the API:

  • please own it: notify or even prepare dedicated PR(s) to consumer projects

@Wadjetz Wadjetz marked this pull request as ready for review March 19, 2026 11:37
@Wadjetz Wadjetz requested review from a team as code owners March 19, 2026 11:37
@theocrsb theocrsb force-pushed the features/train-schedule-exceptions branch from 5e9a382 to 9f4b508 Compare March 20, 2026 09:01
@theocrsb theocrsb requested a review from a team as a code owner March 20, 2026 09:01
@theocrsb theocrsb requested review from Castavo and removed request for a team March 20, 2026 09:01
Comment thread editoast/src/views/timetable/paced_train.rs Outdated
Comment thread editoast/src/views/timetable/paced_train.rs Outdated
Comment thread editoast/src/views/timetable/paced_train.rs
Copy link
Copy Markdown
Contributor

@Castavo Castavo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on RaiMI part

(Besides the TODO in the argument description, but I suppose it'll be gone in a next pull request)

Copy link
Copy Markdown
Contributor

@SharglutDev SharglutDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you rebase with the feature branch ? Some of the changes are already on it

@Wadjetz Wadjetz force-pushed the ebe/editoast/adapt-track-occupancy-endpoint branch 2 times, most recently from 830e9e6 to 4501a4f Compare March 24, 2026 10:17
@Wadjetz Wadjetz requested a review from SharglutDev March 24, 2026 10:29
Copy link
Copy Markdown
Contributor

@younesschrifi younesschrifi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Signed-off-by: Egor <egor@berezify.fr>
@Wadjetz Wadjetz force-pushed the ebe/editoast/adapt-track-occupancy-endpoint branch from 4501a4f to 0852ca4 Compare March 26, 2026 08:24
@Wadjetz Wadjetz merged commit 744d14c into features/train-schedule-exceptions Mar 26, 2026
29 of 30 checks passed
@Wadjetz Wadjetz deleted the ebe/editoast/adapt-track-occupancy-endpoint branch March 26, 2026 08:58
theocrsb pushed a commit that referenced this pull request Mar 26, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
theocrsb pushed a commit that referenced this pull request Mar 30, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
theocrsb pushed a commit that referenced this pull request Mar 31, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
theocrsb pushed a commit that referenced this pull request Apr 3, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
theocrsb pushed a commit that referenced this pull request Apr 4, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
theocrsb pushed a commit that referenced this pull request Apr 7, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
theocrsb pushed a commit that referenced this pull request Apr 8, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
younesschrifi pushed a commit that referenced this pull request Apr 13, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
younesschrifi pushed a commit that referenced this pull request Apr 13, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
younesschrifi pushed a commit that referenced this pull request Apr 14, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
Wadjetz added a commit that referenced this pull request Apr 17, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
Wadjetz added a commit that referenced this pull request Apr 21, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
Wadjetz added a commit that referenced this pull request Apr 21, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
theocrsb pushed a commit that referenced this pull request Apr 22, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
younesschrifi pushed a commit that referenced this pull request Apr 23, 2026
Part of #15202

This PR adapt the `/train_schedules/track_occupancy`endpoint to use the
new exceptions table
It also requires the timetable_id as a parameter, as exceptions are now
related to a timetable and not just to a train schedule
Fix tests and frontend

> [!NOTE]
> This PR targets a feature branch and may contain all its commits, as
it has not been rebased yet. Only the last commit need to be reviewed.

Signed-off-by: Egor <egor@berezify.fr>
flomonster pushed a commit that referenced this pull request Apr 30, 2026
This commit is a squash of a feature branch.
We moved exceptions from train schedule in a separated table.
This required to adapt few endpoints and workflow.

List of sub-commits:
- editoast: front: new train schedule exceptions
- editoast: adapt get train schedules exceptions (#15502)
- editoast: add apply_train_schedule_exception (#15688)
- front: use create exceptions endpoint for added exception
- front: create exception when train is duplicate
- front: invalidate rtk cache on exception creation
- editoast: add occurrences utilities functions (#15741)
- editoast: adapt etcs braking curves endpoint (#15796)
- front: adapt timetable import (#15604)
- editoast: adapt train schedule get path endpoint to use exceptions table (#15690)
- editoast: adapt simulation endpoint with new exceptions (#15695)
- editoast: adapt conflicts endpoint (#15689)
- editoast: adapt track_occupancy endpoint with new exceptions (#15793)
- editoast: adapt paced train simulation summary (#15591)
- editoast: adapt project path endpoint
- editoast: adapt level crossing occupancy endpoint with new exceptions (#15930)
- editoast: adapt occupancy blocks endpoint (#15765)
- editoast: replace exception_key with excpetion_id
- editoast: refactor train schedule exceptions fixtures (#16008)
- editoast: adapt requirements endpoin to new exception model
- editoast: adapt project path op endpoint
- front: create exception when train is update (#15497)
- front: use local state instead of API call in useSelectedTimetableItem (#16118)
- editoast: cleanup train schedule occurrences utilities (#16121)
- editoast: remove tests for old exception model
- editoast: project_path_op panicked when train_schedule_id is not first
- front: extract syncOccurrenceException helper and align useUpdateTimetableItem
- front: use exception-specific endpoints in useUpdateTimesStopsTable
- editoast: check train schedule exception occurrence index (#16149)
- front: drop getTimetableItemById query
- editoast: delete exceptions when update train schedule paced field (#16021)
- editoast: remove exception_key from OccurrenceId
- front: remove the exception key added to the store and use an empty string until the key has been removed on the backend
- front: update SelectedTrainId in deleteAddedException

Co-authored: Theo Macron <theo.macron0315@gmail.com>
Co-authored: theocrsb <theo_crosbie@yahoo.fr>
Co-authored: Youness CHRIFI ALAOUI <youness.chrifi@gmail.com>
Co-authored: Simon Ser <contact@emersion.fr>
Signed-off-by: Egor <egor@berezify.fr>
flomonster pushed a commit that referenced this pull request Apr 30, 2026
This commit is a squash of a feature branch.
We moved exceptions from train schedule in a separated table.
This required to adapt few endpoints and workflow.

List of sub-commits:
- editoast: front: new train schedule exceptions
- editoast: adapt get train schedules exceptions (#15502)
- editoast: add apply_train_schedule_exception (#15688)
- front: use create exceptions endpoint for added exception
- front: create exception when train is duplicate
- front: invalidate rtk cache on exception creation
- editoast: add occurrences utilities functions (#15741)
- editoast: adapt etcs braking curves endpoint (#15796)
- front: adapt timetable import (#15604)
- editoast: adapt train schedule get path endpoint to use exceptions table (#15690)
- editoast: adapt simulation endpoint with new exceptions (#15695)
- editoast: adapt conflicts endpoint (#15689)
- editoast: adapt track_occupancy endpoint with new exceptions (#15793)
- editoast: adapt paced train simulation summary (#15591)
- editoast: adapt project path endpoint
- editoast: adapt level crossing occupancy endpoint with new exceptions (#15930)
- editoast: adapt occupancy blocks endpoint (#15765)
- editoast: replace exception_key with excpetion_id
- editoast: refactor train schedule exceptions fixtures (#16008)
- editoast: adapt requirements endpoin to new exception model
- editoast: adapt project path op endpoint
- front: create exception when train is update (#15497)
- front: use local state instead of API call in useSelectedTimetableItem (#16118)
- editoast: cleanup train schedule occurrences utilities (#16121)
- editoast: remove tests for old exception model
- editoast: project_path_op panicked when train_schedule_id is not first
- front: extract syncOccurrenceException helper and align useUpdateTimetableItem
- front: use exception-specific endpoints in useUpdateTimesStopsTable
- editoast: check train schedule exception occurrence index (#16149)
- front: drop getTimetableItemById query
- editoast: delete exceptions when update train schedule paced field (#16021)
- editoast: remove exception_key from OccurrenceId
- front: remove the exception key added to the store and use an empty string until the key has been removed on the backend
- front: update SelectedTrainId in deleteAddedException

Co-authored: Theo Macron <theo.macron0315@gmail.com>
Co-authored: theocrsb <theo_crosbie@yahoo.fr>
Co-authored: Youness CHRIFI ALAOUI <youness.chrifi@gmail.com>
Co-authored: Simon Ser <contact@emersion.fr>
Signed-off-by: Egor <egor@berezify.fr>
flomonster pushed a commit that referenced this pull request Apr 30, 2026
This commit is a squash of a feature branch.
We moved exceptions from train schedule in a separated table.
This required to adapt few endpoints and workflow.

List of sub-commits:
- editoast: front: new train schedule exceptions
- editoast: adapt get train schedules exceptions (#15502)
- editoast: add apply_train_schedule_exception (#15688)
- front: use create exceptions endpoint for added exception
- front: create exception when train is duplicate
- front: invalidate rtk cache on exception creation
- editoast: add occurrences utilities functions (#15741)
- editoast: adapt etcs braking curves endpoint (#15796)
- front: adapt timetable import (#15604)
- editoast: adapt train schedule get path endpoint to use exceptions table (#15690)
- editoast: adapt simulation endpoint with new exceptions (#15695)
- editoast: adapt conflicts endpoint (#15689)
- editoast: adapt track_occupancy endpoint with new exceptions (#15793)
- editoast: adapt paced train simulation summary (#15591)
- editoast: adapt project path endpoint
- editoast: adapt level crossing occupancy endpoint with new exceptions (#15930)
- editoast: adapt occupancy blocks endpoint (#15765)
- editoast: replace exception_key with excpetion_id
- editoast: refactor train schedule exceptions fixtures (#16008)
- editoast: adapt requirements endpoin to new exception model
- editoast: adapt project path op endpoint
- front: create exception when train is update (#15497)
- front: use local state instead of API call in useSelectedTimetableItem (#16118)
- editoast: cleanup train schedule occurrences utilities (#16121)
- editoast: remove tests for old exception model
- editoast: project_path_op panicked when train_schedule_id is not first
- front: extract syncOccurrenceException helper and align useUpdateTimetableItem
- front: use exception-specific endpoints in useUpdateTimesStopsTable
- editoast: check train schedule exception occurrence index (#16149)
- front: drop getTimetableItemById query
- editoast: delete exceptions when update train schedule paced field (#16021)
- editoast: remove exception_key from OccurrenceId
- front: remove the exception key added to the store and use an empty string until the key has been removed on the backend
- front: update SelectedTrainId in deleteAddedException

Co-authored: Theo Macron <theo.macron0315@gmail.com>
Co-authored: theocrsb <theo_crosbie@yahoo.fr>
Co-authored: Youness CHRIFI ALAOUI <youness.chrifi@gmail.com>
Co-authored: Simon Ser <contact@emersion.fr>
Signed-off-by: Egor <egor@berezify.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:editoast Work on Editoast Service area:front Work on Standard OSRD Interface modules kind:api-change

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants