refactor(validator): rename lenient/legacy to permissive/strict

Same structure, clearer vocabulary:
lenient_validate -> permissive_validate, legacy_validate -> strict_validate,
lenient_external_data_validation? -> permissive_external_data_validation?.

Author: E-L-T

app/models/champ.rb

@@ -29,8 +29,8 @@ class Champ < ApplicationRecord
   before_save :nullify_blank_json_columns
 
   # Overridable extension point. Override to true in a champ subclass to opt into
-  # lenient external data validation (see ExternalDataChampValidator).
-  def lenient_external_data_validation?
+  # permissive external data validation (see ExternalDataChampValidator).
+  def permissive_external_data_validation?
     false
   end
 

app/models/champs/siret_champ.rb

@@ -11,7 +11,7 @@ def has_async_external_data?
 
   # A condition based on one of this champ's columns (value_json) cannot be
   # evaluated until the data is fetched: restore the blocking validation.
-  def lenient_external_data_validation?
+  def permissive_external_data_validation?
     !external_data_required_for_conditions?
   end
 

app/validators/external_data_champ_validator.rb

@@ -3,17 +3,17 @@
 class ExternalDataChampValidator < ActiveModel::Validator
   # Required checks are delegated to check_mandatory_and_visible_champs_public.
   def validate(record)
-    if record.lenient_external_data_validation?
-      lenient_validate(record)
+    if record.permissive_external_data_validation?
+      permissive_validate(record)
     else
-      legacy_validate(record)
+      strict_validate(record)
     end
   end
 
   private
 
   # Historical behavior: any pending or external_error blocks submission.
-  def legacy_validate(record)
+  def strict_validate(record)
     if record.pending?
       # User filled the field, but background job is still running.
       record.errors.add(:external_id, :api_response_pending)
@@ -23,10 +23,10 @@ def legacy_validate(record)
     end
   end
 
-  # Lenient behavior: only a not-found result (HTTP 404) blocks submission.
+  # Permissive behavior: only a not-found result (HTTP 404) blocks submission.
   # Pending and technical errors let the user submit.
   # Exceptions accumulate across retries: only the most recent one is conclusive.
-  def lenient_validate(record)
+  def permissive_validate(record)
     return unless record.external_data_not_found?
 
     record.errors.add(:value, error_key_for(record, record.fetch_external_data_exceptions.last))

spec/models/champs/siret_champ_spec.rb

@@ -97,7 +97,7 @@
 
     context 'with a degraded-mode etablissement when the champ feeds a condition' do
       let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :siret }, { type: :text }]) }
-      let(:champ) { dossier.champs.find(&:siret?).tap { _1.update(external_id:, etablissement:) } }
+      let(:champ) { dossier.champ_data.find(&:siret?).tap { _1.update(external_id:, etablissement:) } }
       let(:external_id) { "12345678901245" }
       let(:etablissement) { Etablissement.new(siret: external_id) }
 
@@ -234,7 +234,7 @@
   describe '#fetch_external_data (result mapping)' do
     let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :siret }]) }
     let(:dossier) { create(:dossier, procedure:) }
-    let(:champ) { dossier.champs.first }
+    let(:champ) { dossier.champ_data.first }
     before { champ.update_column(:external_id, '12345678901234') }
 
     context 'when API returns not_found' do
@@ -295,7 +295,7 @@
   describe '#handle_exhausted_external_data_retries!' do
     let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :siret }]) }
     let(:dossier) { create(:dossier, procedure:) }
-    let(:champ) { dossier.champs.first }
+    let(:champ) { dossier.champ_data.first }
 
     before do
       champ.update_columns(
@@ -319,7 +319,7 @@
     let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :siret }, { type: :text }]) }
     let(:siret_tdc) { procedure.draft_revision.types_de_champ_public.first }
     let(:text_tdc) { procedure.draft_revision.types_de_champ_public.second }
-    let(:champ) { dossier.champs.find(&:siret?) }
+    let(:champ) { dossier.champ_data.find(&:siret?) }
 
     context 'when no other champ has a condition based on the siret champ' do
       it { expect(champ.external_data_required_for_conditions?).to be false }
@@ -335,12 +335,12 @@
     end
   end
 
-  describe '#lenient_external_data_validation?' do
+  describe '#permissive_external_data_validation?' do
     let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :siret }, { type: :text }]) }
-    let(:champ) { dossier.champs.find(&:siret?) }
+    let(:champ) { dossier.champ_data.find(&:siret?) }
 
-    it 'is lenient by default' do
-      expect(champ.lenient_external_data_validation?).to be true
+    it 'is permissive by default' do
+      expect(champ.permissive_external_data_validation?).to be true
     end
 
     context 'when another champ has a condition based on a column of the siret champ' do
@@ -352,7 +352,7 @@
       end
 
       it 'restores the blocking validation' do
-        expect(champ.lenient_external_data_validation?).to be false
+        expect(champ.permissive_external_data_validation?).to be false
       end
     end
   end

spec/validators/external_data_champ_validator_spec.rb

@@ -12,11 +12,11 @@
     it { expect { validator.validate(champ) }.not_to change { champ.errors.size } }
   end
 
-  shared_examples 'adds a lenient error' do
+  shared_examples 'adds a permissive error' do
     it { expect { validator.validate(champ) }.to change { champ.errors[:value].size }.by(1) }
   end
 
-  shared_examples 'adds a legacy error' do
+  shared_examples 'adds a strict error' do
     it { expect { validator.validate(champ) }.to change { champ.errors[:external_id].size }.by(1) }
   end
 
@@ -36,7 +36,7 @@
     before do
       allow(champ).to receive_messages(pending?: true, external_error?: false, external_data_required_for_conditions?: true)
     end
-    include_examples 'adds a legacy error'
+    include_examples 'adds a strict error'
   end
 
   context 'external_error 404 (not found) and not required for conditions' do
@@ -47,7 +47,7 @@
         fetch_external_data_exceptions: [ExternalDataException.new(error: 'NF', code: 404)]
       )
     end
-    include_examples 'adds a lenient error'
+    include_examples 'adds a permissive error'
   end
 
   context 'external_error with a technical code and not required for conditions' do
@@ -69,7 +69,7 @@
         fetch_external_data_exceptions: [ExternalDataException.new(error: 'boom', code: 503)]
       )
     end
-    include_examples 'adds a legacy error'
+    include_examples 'adds a strict error'
   end
 
   context 'external_error with a technical retry followed by a 404 (exceptions accumulate)' do
@@ -83,15 +83,15 @@
         ]
       )
     end
-    include_examples 'adds a lenient error'
+    include_examples 'adds a permissive error'
 
     it 'uses the error key of the most recent exception' do
       validator.validate(champ)
       expect(champ.errors.map(&:type)).to include(:code_404)
     end
   end
 
-  context 'external_error with accumulated exceptions and required for conditions (legacy path)' do
+  context 'external_error with accumulated exceptions and required for conditions (strict path)' do
     before do
       allow(champ).to receive_messages(
         pending?: false, external_error?: true,
@@ -102,7 +102,7 @@
         ]
       )
     end
-    include_examples 'adds a legacy error'
+    include_examples 'adds a strict error'
 
     it 'uses the error key of the most recent exception' do
       validator.validate(champ)