-
Notifications
You must be signed in to change notification settings - Fork 46
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
core: add v2 conflict detection endpoint #7345
Conversation
b9e826d
to
4707776
Compare
Codecov ReportAttention: Patch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## dev #7345 +/- ##
=============================================
- Coverage 29.13% 18.58% -10.55%
+ Complexity 2020 2016 -4
=============================================
Files 1137 887 -250
Lines 139713 112304 -27409
Branches 2755 2769 +14
=============================================
- Hits 40707 20874 -19833
+ Misses 97397 89814 -7583
- Partials 1609 1616 +7
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
67991e6
to
d3573a9
Compare
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionEndpointV2.kt
Outdated
Show resolved
Hide resolved
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionEndpointV2.kt
Outdated
Show resolved
Hide resolved
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionResponse.kt
Show resolved
Hide resolved
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionResponse.kt
Outdated
Show resolved
Hide resolved
d3573a9
to
d868cd9
Compare
d868cd9
to
3805d3d
Compare
6b78f05
to
6199e2b
Compare
00677a3
to
455e729
Compare
455e729
to
706f50b
Compare
core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/json/UnitJsonAdapters.kt
Outdated
Show resolved
Hide resolved
f3b5661
to
8c59e5f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've reviewed only the editoast
part. There is at least one comment about the redundancy of information that I'd like to be addressed (or be convinced it's good as-is). The 2 other comments are minor. Apart from that, thanks for the good work, and long live v2!
8c59e5f
to
95808ea
Compare
95808ea
to
944a8fa
Compare
4f14e24
to
3b7f250
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the pair programming, looks good for editoast
🎉
1eeca71
to
1188669
Compare
Co-authored-by: Florian Amsallem <[email protected]>
- Handle batch simulation for better performances - Rename signal projection endpoint url
1188669
to
73c143f
Compare
new FkRegex("/detect_conflicts", new ConflictDetectionEndpoint()), | ||
new FkRegex("/v2/conflict_detection", new ConflictDetectionEndpointV2()), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe these endpoints should be added to the core/openapi.yaml
.
Fixes #6905. Convert V2 payload to V1 structs to use them in
Conflicts.kt
, because stdcm is not v2 yet and still calls conflict detection with v1 structs.