Ajout de contraintes sur les dates de début et de fin des scolarités #1253
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pskl
reviewed
Dec 2, 2024
pskl
reviewed
Dec 2, 2024
pskl
reviewed
Dec 2, 2024
tnicolas1
force-pushed
the
fix/validates-dates
branch
2 times, most recently
from
36d9833 to
ad05873
Compare
tnicolas1
force-pushed
the
fix/validates-dates
branch
3 times, most recently
from
da012d1 to
0b184f0
Compare
tnicolas1
commented
Dec 2, 2024
tnicolas1
commented
Dec 3, 2024
| @@ -34,6 +34,19 @@ class Schooling < ApplicationRecord # rubocop:disable Metrics/ClassLength | |||
| validates :student, uniqueness: { scope: :end_date, message: :unique_active_schooling }, if: :open? | |||
| validates :student, uniqueness: { scope: :classe }, if: :closed? | |||
|
|
|||
| validates :end_date, | |||
| :start_date, | |||
| if: ->(schooling) { schooling.classe.present? }, | |||
There was a problem hiding this comment.
Condition ajoutée à cause du test dans schooling_spec (Ligne 10) :
it { is_expected.to belong_to(:classe).class_name("Classe") }
tnicolas1
force-pushed
the
fix/validates-dates
branch
from
1e31825 to
ca9aac6
Compare
tnicolas1
changed the title
pskl
reviewed
Dec 4, 2024
| status { :student } | ||
|
|
||
| after(:build) do |schooling| | ||
| schooling.start_date = if schooling.end_date.present? | ||
| schooling.end_date - 1.month | ||
| else | ||
| "#{SchoolYear.current.start_year}-01-10" | ||
| Date.parse("#{schooling.classe.school_year.start_year}-09-01") |
There was a problem hiding this comment.
A un moment dans le code, j'ai aussi adapté l'année des dates de la Factory 'PFMP' sur celles de la Factory 'Schooling', mais j'ai supprimé ce code quand j'ai annulé mes modifications sur le 'validates' du modèle 'PFMP'.
Est-ce qu'il faudrait que je rajoute cette logique ou non ? (Sachant que tous les tests passent actuellement)
There was a problem hiding this comment.
Pour l'instant c'est pas très grave je dirais.
pskl
reviewed
Dec 4, 2024
| @@ -16,12 +16,6 @@ | |||
| sign_in(user) | |||
| schooling.pfmps = [payment_request.pfmp] | |||
| schooling.save! | |||
| Timecop.safe_mode = false | |||
pskl
approved these changes
Dec 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.