Merge pull request #13451 from demarche-numerique/push-knlxrkqvlvln

Tech: filtrer les valeurs de préremplissage dans les classes PrefillTypeDeChamp

Author: tchak

app/models/champs/civilite_champ.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Champs::CiviliteChamp < Champ
-  validates :value, inclusion: ["M.", "Mme"], allow_nil: true, allow_blank: false, if: :should_validate_in_current_context?
+  validates :value, inclusion: [Individual::GENDER_MALE, Individual::GENDER_FEMALE], allow_nil: true, allow_blank: false, if: :should_validate_in_current_context?
 
   def legend_label?
     true

app/models/champs/date_champ.rb

@@ -4,7 +4,7 @@ class Champs::DateChamp < Champ
   attr_accessor :prefilling_from_france_connect_information
 
   validates_with DateLimitValidator, if: :should_validate_in_current_context?
-  before_validation :convert_to_iso8601_date, unless: -> { validation_context == :prefill }
+  normalizes :value, with: -> { DateDetectionUtils.convert_to_iso8601_date(it) }
   before_save :clear_prefilled_from_france_connect_information_flag_if_modified
   validate :iso_8601
 
@@ -22,10 +22,6 @@ def clear_prefilled_from_france_connect_information_flag_if_modified
     data.delete("prefilled_from_france_connect_information")
   end
 
-  def convert_to_iso8601_date
-    self.value = DateDetectionUtils.convert_to_iso8601_date(value)
-  end
-
   def iso_8601
     return if DateDetectionUtils.parsable_iso8601_date?(value) || value.blank?
 

app/models/champs/datetime_champ.rb

@@ -2,7 +2,7 @@
 
 class Champs::DatetimeChamp < Champ
   validates_with DateLimitValidator, if: :should_validate_in_current_context?
-  normalizes :value, with: -> v { DateDetectionUtils.convert_to_iso8601_datetime(v) }
+  normalizes :value, with: -> { DateDetectionUtils.convert_to_iso8601_datetime(it) }
   validate :iso_8601
 
   def search_terms

app/models/champs/decimal_number_champ.rb

@@ -1,30 +1,7 @@
 # frozen_string_literal: true
 
 class Champs::DecimalNumberChamp < Champ
+  validates_with NumberFormatValidator, if: :should_validate_in_current_context?
   validates_with NumberLimitValidator, if: :should_validate_in_current_context?
-  before_validation :format_value
-
-  validates :value, numericality: {
-    allow_nil: true,
-    allow_blank: true,
-    message: -> (object, _data) {
-      object.errors.generate_message(:value, :not_a_number)
-    },
-  }, format: {
-    with: /\A-?[0-9]+([\.,][0-9]{1,3})?\z/,
-    allow_nil: true,
-    allow_blank: true,
-    message: -> (object, _data) {
-      # i18n-tasks-use t('errors.messages.not_a_float')
-      object.errors.generate_message(:value, :not_a_float)
-    },
-  }, if: :should_validate_in_current_context?
-
-  private
-
-  def format_value
-    return if value.blank?
-
-    self.value = value.tr(",", ".").gsub(/[[:space:]]/, "")
-  end
+  normalizes :value, with: -> { NumberFormatValidator.normalize(it, decimal: true) }
 end

app/models/champs/dossier_link_champ.rb

@@ -1,39 +1,5 @@
 # frozen_string_literal: true
 
 class Champs::DossierLinkChamp < Champ
-  validate :value_integerable, if: -> { value.present? }, on: :prefill
-  validate :dossier_exists, if: -> { should_validate_in_current_context? && value.present? }
-  validate :dossier_in_allowed_procedures, if: -> { should_validate_in_current_context? && value.present? }
-
-  private
-
-  def dossier_exists
-    linked_dossier = Dossier.find_by(id: value)
-    if linked_dossier.nil? && !DeletedDossier.exists?(dossier_id: value)
-      errors.add(:value, :not_found)
-    elsif linked_dossier&.brouillon?
-      errors.add(:value, :brouillon_not_allowed)
-    end
-  end
-
-  def dossier_in_allowed_procedures
-    return if errors.include?(:value) # dossier_exists already failed
-    return if !type_de_champ.procedures_limit?
-
-    allowed_ids = type_de_champ.dossier_link_procedure_ids
-    return if allowed_ids.empty?
-
-    dossier_matches = Dossier.joins(:revision).exists?(id: value, user: dossier.user, procedure_revisions: { procedure_id: allowed_ids })
-    deleted_dossier_matches = DeletedDossier.exists?(dossier_id: value, user_id: dossier.user_id, procedure_id: allowed_ids)
-
-    if !dossier_matches && !deleted_dossier_matches
-      errors.add(:value, :not_in_allowed_procedures)
-    end
-  end
-
-  def value_integerable
-    Integer(value)
-  rescue ArgumentError
-    errors.add(:value, :not_integerable)
-  end
+  validates_with DossierLinkValidator, if: -> { should_validate_in_current_context? && value.present? }
 end

app/models/champs/integer_number_champ.rb

@@ -1,22 +1,7 @@
 # frozen_string_literal: true
 
 class Champs::IntegerNumberChamp < Champ
+  validates_with NumberFormatValidator, if: :should_validate_in_current_context?
   validates_with NumberLimitValidator, if: :should_validate_in_current_context?
-  before_validation :format_value
-
-  validates :value, numericality: {
-    only_integer: true,
-    allow_nil: true,
-    allow_blank: true,
-    message: -> (object, _data) {
-      # i18n-tasks-use t('errors.messages.not_an_integer')
-      object.errors.generate_message(:value, :not_an_integer)
-    },
-  }, if: :should_validate_in_current_context?
-
-  def format_value
-    return if value.blank?
-
-    self.value = value.gsub(/[[:space:]]/, "")
-  end
+  normalizes :value, with: -> { NumberFormatValidator.normalize(it) }
 end

app/models/champs/multiple_drop_down_list_champ.rb

@@ -2,7 +2,7 @@
 
 class Champs::MultipleDropDownListChamp < Champ
   store_accessor :value_json, :referentiels
-  validate :values_are_in_options, if: -> { value.present? && should_validate_in_current_context? }
+  validates_with DropDownOptionsValidator, if: -> { value.present? && should_validate_in_current_context? }
   before_save :store_referentiels, if: :drop_down_advanced?
 
   THRESHOLD_NB_OPTIONS_AS_CHECKBOX = 5
@@ -43,17 +43,24 @@ def checkbox_label_id(value)
     "#{checkbox_id(value)}-label"
   end
 
-  def value=(value)
-    return super(nil) if value.blank?
-
+  # Parses a raw input (array, JSON string or scalar) into the list of
+  # selected options; shared with the prefill screening so both sides agree
+  # on what a raw value selects.
+  def self.parse_values(value, existing = [])
     values = if value.is_a?(Array)
       value
-    elsif value.starts_with?('[')
-      JSON.parse(value) rescue selected_options + [value] # value may start by [ without being a real JSON value
+    elsif value.is_a?(String) && value.starts_with?('[')
+      JSON.parse(value) rescue existing + [value] # value may start by [ without being a real JSON value
     else
-      selected_options + [value]
-    end.uniq.without('')
+      existing + [value]
+    end
+    values.uniq.without('')
+  end
 
+  def value=(value)
+    return super(nil) if value.blank?
+
+    values = self.class.parse_values(value, selected_options)
     if values.empty?
       super(nil)
     else
@@ -106,13 +113,4 @@ def referentiels_from(value)
   rescue JSON::ParserError
     {}
   end
-
-  def values_are_in_options
-    json = selected_options.compact_blank
-    return if json.empty?
-    return if (json - drop_down_options).empty? && !drop_down_advanced?
-    return if drop_down_advanced? && referentiels.present? && (json - referentiels.keys).empty?
-
-    errors.add(:value, :not_in_options)
-  end
 end

app/models/champs/pays_champ.rb

@@ -6,13 +6,6 @@ class Champs::PaysChamp < Champs::TextChamp
     validates :value, inclusion: APIGeoService.countries.pluck(:name), allow_nil: true, allow_blank: false
   end
 
-  # def value=(code) can reset champs to nil if value is empty, in case of prefill
-  #   we do not want to try to save the champ with an nil value
-  with_options if: -> { validation_context == :prefill } do
-    validates :external_id, inclusion: APIGeoService.countries.pluck(:code), allow_nil: false, allow_blank: false
-    validates :value, inclusion: APIGeoService.countries.pluck(:name), allow_nil: false, allow_blank: false
-  end
-
   def selected
     code || value
   end

app/models/concerns/champ_validate_concern.rb

@@ -10,14 +10,7 @@ module ChampValidateConcern
   private
 
   def should_validate_in_current_context?
-    case validation_context
-    when :champ_value
-      visible?
-    when :prefill
-      true
-    else
-      false
-    end
+    validation_context == :champ_value && visible?
   end
 
   def validate_external_data_response?

app/models/prefill_champs.rb

@@ -31,22 +31,6 @@ def build_prefill_values
   end
 
   class PrefillValue
-    NEED_VALIDATION_TYPES_DE_CHAMPS = [
-      TypeDeChamp.type_champs.fetch(:decimal_number),
-      TypeDeChamp.type_champs.fetch(:integer_number),
-      TypeDeChamp.type_champs.fetch(:date),
-      TypeDeChamp.type_champs.fetch(:datetime),
-      TypeDeChamp.type_champs.fetch(:civilite),
-      TypeDeChamp.type_champs.fetch(:yes_no),
-      TypeDeChamp.type_champs.fetch(:checkbox),
-      TypeDeChamp.type_champs.fetch(:pays),
-      TypeDeChamp.type_champs.fetch(:regions),
-      TypeDeChamp.type_champs.fetch(:departements),
-      TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
-      TypeDeChamp.type_champs.fetch(:epci),
-      TypeDeChamp.type_champs.fetch(:dossier_link),
-    ]
-
     attr_reader :champ, :value, :dossier
 
     def initialize(champ:, value:, dossier:)
@@ -56,7 +40,7 @@ def initialize(champ:, value:, dossier:)
     end
 
     def prefillable?
-      champ.prefillable? && champ_attributes.present? && valid?
+      champ.prefillable? && champ_attributes.present?
     end
 
     # An array of [champ, attributes] pairs; a repetition champ expands to
@@ -70,14 +54,5 @@ def champ_attributes
         .build(champ.type_de_champ, dossier.revision)
         .to_assignable_attributes(champ, value)
     end
-
-    private
-
-    def valid?
-      return true unless NEED_VALIDATION_TYPES_DE_CHAMPS.include?(champ.type_champ)
-
-      champ.assign_attributes(champ_attributes)
-      champ.valid?(:prefill)
-    end
   end
 end