Added name argument to validators for ticket validations #10572
Conversation
| @@ -41,22 +41,22 @@ def include_persons? | |||
| true | |||
| end | |||
|
|
|||
| def self.dob_validations(dob, competition_id = nil, name = nil) | |||
| def self.dob_validations(dob, message_args = {}, competition_id = nil) | |||
There was a problem hiding this comment.
I think you can make it more Ruby-esque by something like...
| def self.dob_validations(dob, message_args = {}, competition_id = nil) | |
| def self.dob_validations(dob, competition_id = nil, **message_args) |
There was a problem hiding this comment.
If you take this suggestion, then below you can "spread" the parameters into the ValidationIssue class as well: ValidationWarning.new(:persons, competition_id, DOB_0101_WARNING, **message_args)
| @@ -101,7 +101,7 @@ def run_validation(validator_data) | |||
| name: p.name) | |||
| end | |||
|
|
|||
| PersonsValidator.dob_validations(p.dob, competition.id, p.name).each do |validation| | |||
| PersonsValidator.dob_validations(p.dob, { name: p.name }, competition.id).each do |validation| | |||
There was a problem hiding this comment.
For my suggestion above, this could be changed to PersonsValidator.dob_validations(p.dob, competition.id, name: p.name)
| @@ -49,7 +49,7 @@ def edit_person_validators | |||
| ticket.metadata.tickets_edit_person_fields.each do |edit_person_field| | |||
| case edit_person_field[:field_name] | |||
| when TicketsEditPersonField.field_names[:dob] | |||
| dob_validation_issues = ResultsValidators::PersonsValidator.dob_validations(Date.parse(edit_person_field[:new_value])) | |||
| dob_validation_issues = ResultsValidators::PersonsValidator.dob_validations(Date.parse(edit_person_field[:new_value]), { name: ticket.metadata.wca_id }) | |||
There was a problem hiding this comment.
If you like my other suggestion about the method signature, then this can become...
| dob_validation_issues = ResultsValidators::PersonsValidator.dob_validations(Date.parse(edit_person_field[:new_value]), { name: ticket.metadata.wca_id }) | |
| dob_validation_issues = ResultsValidators::PersonsValidator.dob_validations(Date.parse(edit_person_field[:new_value]), name: ticket.metadata.wca_id) |
There was a problem hiding this comment.
Sidenote: You should probably extract the Date.parse into its own line, helps with debugging :)
One drawback of this is still js cannot replace "%{name}" with name. So, this doesn't fix the UI issue. This should be solved when moved to i18n. This PR aims at sending
nameparameter fordob_validationsmethod.