Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add schema and models for train schedule V2 #6532

Merged
merged 9 commits into from
Feb 27, 2024
Merged

Add schema and models for train schedule V2 #6532

merged 9 commits into from
Feb 27, 2024

Conversation

younesschrifi
Copy link
Contributor

@younesschrifi younesschrifi commented Feb 1, 2024 •
edited by flomonster
Loading

Close #6500
Close #6501

@younesschrifi younesschrifi force-pushed the yci/create-model-v2-timetable branch 2 times, most recently from aa69e74 to 698c5c1 Compare February 1, 2024 00:29
@codecov Codecov
Copy link

codecov bot commented Feb 1, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 91.54489% with 81 lines in your changes are missing coverage. Please review.

Project coverage is 28.42%. Comparing base (3fa93ae) to head (0cad0d3).

Files Patch % Lines
editoast/src/views/v2/timetable.rs 83.96% 21 Missing ⚠️
editoast/src/schema/v2/trainschedule.rs 92.80% 20 Missing ⚠️
front/src/common/api/osrdEditoastApi.ts 91.07% 19 Missing ⚠️
editoast/src/modelsv2/train_schedule.rs 12.50% 7 Missing ⚠️
editoast/src/schema/utils/duration.rs 93.33% 5 Missing ⚠️
editoast/editoast_derive/src/modelv2.rs 84.00% 4 Missing ⚠️
editoast/src/modelsv2/timetable.rs 94.44% 2 Missing ⚠️
editoast/src/fixtures.rs 66.66% 1 Missing ⚠️
editoast/src/schema/utils/mod.rs 0.00% 1 Missing ⚠️
editoast/src/views/v2/train_schedule.rs 99.25% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                dev    #6532      +/-   ##
============================================
+ Coverage     27.94%   28.42%   +0.48%     
  Complexity     2177     2177              
============================================
  Files          1041     1047       +6     
  Lines        128683   129620     +937     
  Branches       2576     2576              
============================================
+ Hits          35962    36847     +885     
- Misses        91233    91285      +52     
  Partials       1488     1488
Flag Coverage Δ
core 79.39% <ø> (ø)
editoast 76.01% <91.67%> (+0.60%) ⬆️
front 8.61% <91.07%> (+0.19%) ⬆️
gateway 2.50% <ø> (ø)
railjson_generator 87.26% <ø> (ø)
tests 83.07% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@younesschrifi younesschrifi force-pushed the yci/create-model-v2-timetable branch 9 times, most recently from 7ba2152 to 9358bbd Compare February 6, 2024 15:46
@younesschrifi younesschrifi force-pushed the yci/create-model-v2-timetable branch 3 times, most recently from 7f59ae8 to 73c1e0b Compare February 13, 2024 02:29
@flomonster flomonster force-pushed the yci/create-model-v2-timetable branch 15 times, most recently from 5fe1b38 to ad796af Compare February 21, 2024 16:47
@younesschrifi younesschrifi force-pushed the yci/create-model-v2-timetable branch 3 times, most recently from 13cbe10 to 84323c1 Compare February 27, 2024 09:00
@younesschrifi younesschrifi requested review from SharglutDev and removed request for clarani February 27, 2024 09:01
SharglutDev
SharglutDev approved these changes Feb 27, 2024
View reviewed changes
Copy link
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.

Only review front part (can't test)

@younesschrifi younesschrifi force-pushed the yci/create-model-v2-timetable branch 2 times, most recently from c9de449 to 3a37545 Compare February 27, 2024 09:35
leovalais
leovalais requested changes Feb 27, 2024
View reviewed changes
Copy link
Contributor

@leovalais leovalais left a comment

Choose a reason for hiding this comment

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

LGTM for the most part, congratz! I have a few questions and suggestions ⬇️

editoast/src/schema/utils/duration.rs Outdated Show resolved Hide resolved
editoast/src/schema/v2/trainschedule.rs Show resolved Hide resolved
editoast/src/tests/train_schedules/simple.json Outdated Show resolved Hide resolved
editoast/src/modelsv2/timetable.rs Outdated Show resolved Hide resolved
editoast/src/modelsv2/train_schedule.rs Outdated Show resolved Hide resolved
editoast/src/views/v2/timetable.rs Outdated Show resolved Hide resolved
editoast/src/views/v2/train_schedule.rs Outdated Show resolved Hide resolved
editoast/src/schema/v2/trainschedule.rs Outdated Show resolved Hide resolved
editoast/src/schema/v2/trainschedule.rs Outdated Show resolved Hide resolved
editoast/src/schema/v2/mod.rs Outdated Show resolved Hide resolved
flomonster and others added 3 commits February 27, 2024 15:32
@flomonster @younesschrifi
editoast: add support serde support for chrono::duration
88f09c9 
Co-authored-by: Youness Chrifi Alaoui <youness.chrifi_alaoui@telecom-sudparis.eu>
@flomonster
editoast: add ToSchema implementation for NonBlankString
450f2ad
@flomonster @younesschrifi
editoast: derive: add enum support to modelv2
b308189 
Co-authored-by: Youness Chrifi Alaoui <youness.chrifi_alaoui@telecom-sudparis.eu>
@flomonster flomonster force-pushed the yci/create-model-v2-timetable branch from ed8229b to 99a7269 Compare February 27, 2024 14:32
flomonster and others added 6 commits February 27, 2024 16:21
@flomonster @younesschrifi
editoast: add schema for train schedule v2
ab46068 
Co-authored-by: Youness Chrifi Alaoui <youness.chrifi_alaoui@telecom-sudparis.eu>
@flomonster @younesschrifi
editoast: add into impl for paginated results
4b8a874 
Co-authored-by: Youness Chrifi Alaoui <youness.chrifi_alaoui@telecom-sudparis.eu>
@flomonster @younesschrifi
editoast: add migrations for timetable and train schedule v2
b699c70 
Co-authored-by: Youness Chrifi Alaoui <youness.chrifi_alaoui@telecom-sudparis.eu>
@flomonster @younesschrifi
editoast: add models for timetable and train schedule v2
2592c37 
Co-authored-by: Youness Chrifi Alaoui <youness.chrifi_alaoui@telecom-sudparis.eu>
@flomonster @younesschrifi
editoast: add views for timetable and train schedule v2
40308cc 
Co-authored-by: Youness Chrifi Alaoui <youness.chrifi_alaoui@telecom-sudparis.eu>
@younesschrifi @flomonster
front: add new errors translation for train schedule v2
0cad0d3
@flomonster flomonster force-pushed the yci/create-model-v2-timetable branch from f0b60b9 to 0cad0d3 Compare February 27, 2024 15:21
@flomonster flomonster requested a review from leovalais February 27, 2024 15:24
@flomonster flomonster enabled auto-merge February 27, 2024 15:30
leovalais
leovalais reviewed Feb 27, 2024
View reviewed changes
Copy link
Contributor

@leovalais leovalais left a comment

Choose a reason for hiding this comment

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

LGTM

@flomonster flomonster added this pull request to the merge queue Feb 27, 2024
Merged via the queue into dev with commit cc71ce8 Feb 27, 2024
22 checks passed
@flomonster flomonster deleted the yci/create-model-v2-timetable branch February 27, 2024 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flomonster flomonster flomonster left review comments

@SharglutDev SharglutDev SharglutDev approved these changes

@leovalais leovalais leovalais approved these changes

@Wadjetz Wadjetz Wadjetz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@younesschrifi @Wadjetz @flomonster @leovalais @SharglutDev