Petits nettoyages de RecurrenceConcern #5159
Open
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
| @@ -68,12 +68,16 @@ def first_occurrence_ends_at | |||
| end | |||
| end | |||
|
|
|||
| def recurrence=(hash) | |||
| super(hash.presence) # on évite d'avoir un objet Montrose::Recurrence avec une config vide | |||
There was a problem hiding this comment.
Ce setter nous éviter d'avoir un callback clear_empty_recurrence qui est seulement appelé before_save, ce qui signifie qu'on pouvait avoir
plage = PlageOuverture.new(..., recurrence: {})
plage.recurring?
# => true
plage.save
plage.recurring?
=> falseOn évite donc ainsi d'être dans un état invalide, plutôt que de corriger cet état invalide juste avant de save.
| def duration | ||
| (first_occurrence_ends_at - starts_at).to_i | ||
| end | ||
|
|
||
| def exceptionnelle? | ||
| recurrence.nil? | ||
| !recurring? |
There was a problem hiding this comment.
Jusqu'ici, si on avait recurrence == {}, alors on avait en même temps exceptionnelle? => true et recurring? => true.
Comment on lines
-91
to
-96
| def recurrence_interval | ||
| return nil if recurrence.nil? | ||
|
|
||
| recurrence.to_hash[:interval] || 1 # when interval is nil, it means 1 | ||
| end | ||
|
|
There was a problem hiding this comment.
Sauf erreur de ma part, cette méthode n'est utilisée nulle part.
| @@ -6,7 +6,7 @@ module RecurrenceConcern | |||
| attribute :start_time, :time_only # uses Tod::TimeOfDayType | |||
| attribute :end_time, :time_only # uses Tod::TimeOfDayType | |||
|
|
|||
| before_save :clear_empty_recurrence, :set_recurrence_ends_at | |||
| before_save { self.recurrence_ends_at = recurrence&.ends_at&.end_of_day } | |||
There was a problem hiding this comment.
Vu la longueur du code je préfère inliner plutôt que d'avoir de l'indirection.
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.
Ces petits changements ont été extraits de #5065, où ils ne sont pas nécessaires. Il s'agit de changements sans impact fonctionnel, simplement du nettoyage.