Merge pull request #9881 from demarches-simplifiees/fix-compute-value-json-on-departement-champ
Correction : une condition / règle de routage du type "un département est dans une région" est valide
This commit is contained in:
Eric Leroy-Terquem
GitHub
commit
1ecbddc5d3
2 changed files with 137 additions and 121 deletions
|
|
@ -2,6 +2,7 @@ class Champs::DepartementChamp < Champs::TextChamp
|
|||
store_accessor :value_json, :code_region
|
||||
validate :value_in_departement_names, unless: -> { value.nil? }
|
||||
validate :external_id_in_departement_codes, unless: -> { external_id.nil? }
|
||||
before_save :store_code_region
|
||||
|
||||
def for_export
|
||||
[name, code]
|
||||
|
|
@ -40,7 +41,7 @@ class Champs::DepartementChamp < Champs::TextChamp
|
|||
end
|
||||
end
|
||||
|
||||
def code_region(departement_name)
|
||||
def code_region
|
||||
APIGeoService.region_code_by_departement(name)
|
||||
end
|
||||
|
||||
|
|
@ -74,4 +75,8 @@ class Champs::DepartementChamp < Champs::TextChamp
|
|||
|
||||
errors.add(:external_id, :not_in_departement_codes)
|
||||
end
|
||||
|
||||
def store_code_region
|
||||
self.code_region = code_region
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,160 +1,171 @@
|
|||
describe Logic::ChampValue do
|
||||
include Logic
|
||||
|
||||
subject { champ_value(champ.stable_id).compute([champ]) }
|
||||
describe '#compute' do
|
||||
subject { champ_value(champ.stable_id).compute([champ]) }
|
||||
|
||||
context 'yes_no tdc' do
|
||||
let(:value) { 'true' }
|
||||
let(:champ) { create(:champ_yes_no, value: value) }
|
||||
context 'yes_no tdc' do
|
||||
let(:value) { 'true' }
|
||||
let(:champ) { create(:champ_yes_no, value: value) }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:boolean) }
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:boolean) }
|
||||
|
||||
context 'with true value' do
|
||||
it { is_expected.to be(true) }
|
||||
end
|
||||
|
||||
context 'with false value' do
|
||||
let(:value) { 'false' }
|
||||
|
||||
it { is_expected.to be(false) }
|
||||
end
|
||||
|
||||
context 'with a value not visible' do
|
||||
before do
|
||||
expect(champ).to receive(:visible?).and_return(false)
|
||||
context 'with true value' do
|
||||
it { is_expected.to be(true) }
|
||||
end
|
||||
|
||||
it { is_expected.to be nil }
|
||||
end
|
||||
end
|
||||
context 'with false value' do
|
||||
let(:value) { 'false' }
|
||||
|
||||
context 'integer tdc' do
|
||||
let(:champ) { create(:champ_integer_number, value: '42') }
|
||||
it { is_expected.to be(false) }
|
||||
end
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:number) }
|
||||
it { is_expected.to eq(42) }
|
||||
context 'with a value not visible' do
|
||||
before do
|
||||
expect(champ).to receive(:visible?).and_return(false)
|
||||
end
|
||||
|
||||
context 'with a blank value' do
|
||||
let(:champ) { create(:champ_integer_number, value: '') }
|
||||
|
||||
it { is_expected.to be nil }
|
||||
it { is_expected.to be nil }
|
||||
end
|
||||
end
|
||||
|
||||
context 'with invalid value' do
|
||||
before { champ.value = 'environ 300' }
|
||||
context 'integer tdc' do
|
||||
let(:champ) { create(:champ_integer_number, value: '42') }
|
||||
|
||||
it { is_expected.to be nil }
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:number) }
|
||||
it { is_expected.to eq(42) }
|
||||
|
||||
context 'with a blank value' do
|
||||
let(:champ) { create(:champ_integer_number, value: '') }
|
||||
|
||||
it { is_expected.to be nil }
|
||||
end
|
||||
|
||||
context 'with invalid value' do
|
||||
before { champ.value = 'environ 300' }
|
||||
|
||||
it { is_expected.to be nil }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'decimal tdc' do
|
||||
let(:champ) { create(:champ_decimal_number, value: '42.01') }
|
||||
context 'decimal tdc' do
|
||||
let(:champ) { create(:champ_decimal_number, value: '42.01') }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:number) }
|
||||
it { is_expected.to eq(42.01) }
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:number) }
|
||||
it { is_expected.to eq(42.01) }
|
||||
|
||||
context 'with invalid value' do
|
||||
before { champ.value = 'racine de 2' }
|
||||
context 'with invalid value' do
|
||||
before { champ.value = 'racine de 2' }
|
||||
|
||||
it { is_expected.to be nil }
|
||||
it { is_expected.to be nil }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'dropdown tdc' do
|
||||
let(:champ) { create(:champ_drop_down_list, value: 'val1') }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:enum) }
|
||||
it { is_expected.to eq('val1') }
|
||||
it { expect(champ_value(champ.stable_id).options([champ.type_de_champ])).to match_array([["val1", "val1"], ["val2", "val2"], ["val3", "val3"]]) }
|
||||
|
||||
context 'with other enabled' do
|
||||
let(:champ) { create(:champ_drop_down_list, value: 'val1', other: true) }
|
||||
context 'dropdown tdc' do
|
||||
let(:champ) { create(:champ_drop_down_list, value: 'val1') }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:enum) }
|
||||
it { is_expected.to eq('val1') }
|
||||
it { expect(champ_value(champ.stable_id).options([champ.type_de_champ])).to match_array([["val1", "val1"], ["val2", "val2"], ["val3", "val3"], ["Autre", "__other__"]]) }
|
||||
it { expect(champ_value(champ.stable_id).options([champ.type_de_champ])).to match_array([["val1", "val1"], ["val2", "val2"], ["val3", "val3"]]) }
|
||||
|
||||
context 'with other enabled' do
|
||||
let(:champ) { create(:champ_drop_down_list, value: 'val1', other: true) }
|
||||
|
||||
it { is_expected.to eq('val1') }
|
||||
it { expect(champ_value(champ.stable_id).options([champ.type_de_champ])).to match_array([["val1", "val1"], ["val2", "val2"], ["val3", "val3"], ["Autre", "__other__"]]) }
|
||||
end
|
||||
|
||||
context 'with other filled' do
|
||||
let(:champ) { create(:champ_drop_down_list, value: 'other value', other: true) }
|
||||
|
||||
it { is_expected.to eq(Champs::DropDownListChamp::OTHER) }
|
||||
end
|
||||
end
|
||||
|
||||
context 'with other filled' do
|
||||
let(:champ) { create(:champ_drop_down_list, value: 'other value', other: true) }
|
||||
context 'checkbox tdc' do
|
||||
let(:champ) { create(:champ_checkbox, value: 'true') }
|
||||
|
||||
it { is_expected.to eq(Champs::DropDownListChamp::OTHER) }
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:boolean) }
|
||||
it { is_expected.to eq(true) }
|
||||
end
|
||||
|
||||
context 'departement tdc' do
|
||||
let(:champ) { create(:champ_departements, value: '02') }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:departement_enum) }
|
||||
it { is_expected.to eq('02') }
|
||||
end
|
||||
|
||||
context 'region tdc' do
|
||||
let(:champ) { create(:champ_regions, value: 'La Réunion') }
|
||||
|
||||
it { is_expected.to eq('04') }
|
||||
end
|
||||
|
||||
describe 'errors' do
|
||||
let(:champ) { create(:champ) }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).errors([champ.type_de_champ])).to be_empty }
|
||||
it { expect(champ_value(champ.stable_id).errors([])).to eq([{ type: :not_available }]) }
|
||||
end
|
||||
|
||||
describe '#sources' do
|
||||
let(:champ) { create(:champ) }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).sources).to eq([champ.stable_id]) }
|
||||
end
|
||||
|
||||
context 'with multiple revision' do
|
||||
let(:options) { ['revision_1'] }
|
||||
let(:procedure) do
|
||||
create(:procedure, :published, :for_individual, types_de_champ_public: [{ type: :drop_down_list, libelle: 'dropdown', options: options }])
|
||||
end
|
||||
let(:drop_down_r1) { procedure.published_revision.types_de_champ_public.first }
|
||||
let(:stable_id) { drop_down_r1.stable_id }
|
||||
|
||||
it { expect(champ_value(stable_id).options([drop_down_r1])).to match_array([["revision_1", "revision_1"]]) }
|
||||
|
||||
context 'with a new revision' do
|
||||
let(:drop_down_r2) { procedure.draft_revision.types_de_champ_public.first }
|
||||
|
||||
before do
|
||||
tdc = procedure.draft_revision.find_and_ensure_exclusive_use(stable_id)
|
||||
tdc.drop_down_options = ['revision_2']
|
||||
tdc.save!
|
||||
end
|
||||
|
||||
it do
|
||||
expect(champ_value(stable_id).options([drop_down_r2])).to match_array([["revision_2", "revision_2"]])
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'checkbox tdc' do
|
||||
let(:champ) { create(:champ_checkbox, value: 'true') }
|
||||
describe '#compute_value_json' do
|
||||
subject { champ_value(champ.stable_id).compute_value_json([champ]) }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:boolean) }
|
||||
it { is_expected.to eq(true) }
|
||||
end
|
||||
context 'commune tdc' do
|
||||
let(:champ) { create(:champ_communes, code_postal: '92500', external_id: '92063') }
|
||||
|
||||
context 'commune tdc' do
|
||||
let(:champ) { create(:champ_communes, code_postal: '92500', external_id: '92063') }
|
||||
|
||||
it { is_expected.to eq('92') }
|
||||
end
|
||||
|
||||
context 'epci tdc' do
|
||||
let(:champ) { build(:champ_epci, code_departement: '43') }
|
||||
|
||||
before do
|
||||
champ.save!
|
||||
champ.update_columns(external_id: '244301016', value: 'CC des Sucs')
|
||||
it { is_expected.to eq({ 'code_departement' => '92', 'code_postal' => '92500', 'code_region' => '11' }) }
|
||||
end
|
||||
|
||||
it do
|
||||
is_expected.to eq('43')
|
||||
end
|
||||
end
|
||||
|
||||
context 'departement tdc' do
|
||||
let(:champ) { create(:champ_departements, value: '02') }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:departement_enum) }
|
||||
it { is_expected.to eq('02') }
|
||||
end
|
||||
|
||||
context 'region tdc' do
|
||||
let(:champ) { create(:champ_regions, value: 'La Réunion') }
|
||||
|
||||
it { is_expected.to eq('04') }
|
||||
end
|
||||
|
||||
describe 'errors' do
|
||||
let(:champ) { create(:champ) }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).errors([champ.type_de_champ])).to be_empty }
|
||||
it { expect(champ_value(champ.stable_id).errors([])).to eq([{ type: :not_available }]) }
|
||||
end
|
||||
|
||||
describe '#sources' do
|
||||
let(:champ) { create(:champ) }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).sources).to eq([champ.stable_id]) }
|
||||
end
|
||||
|
||||
context 'with multiple revision' do
|
||||
let(:options) { ['revision_1'] }
|
||||
let(:procedure) do
|
||||
create(:procedure, :published, :for_individual, types_de_champ_public: [{ type: :drop_down_list, libelle: 'dropdown', options: options }])
|
||||
end
|
||||
let(:drop_down_r1) { procedure.published_revision.types_de_champ_public.first }
|
||||
let(:stable_id) { drop_down_r1.stable_id }
|
||||
|
||||
it { expect(champ_value(stable_id).options([drop_down_r1])).to match_array([["revision_1", "revision_1"]]) }
|
||||
|
||||
context 'with a new revision' do
|
||||
let(:drop_down_r2) { procedure.draft_revision.types_de_champ_public.first }
|
||||
context 'epci tdc' do
|
||||
let(:champ) { build(:champ_epci, code_departement: '43') }
|
||||
|
||||
before do
|
||||
tdc = procedure.draft_revision.find_and_ensure_exclusive_use(stable_id)
|
||||
tdc.drop_down_options = ['revision_2']
|
||||
tdc.save!
|
||||
champ.save!
|
||||
champ.update_columns(external_id: '244301016', value: 'CC des Sucs')
|
||||
end
|
||||
|
||||
it do
|
||||
expect(champ_value(stable_id).options([drop_down_r2])).to match_array([["revision_2", "revision_2"]])
|
||||
end
|
||||
it { is_expected.to eq({ 'code_departement' => '43', 'code_region' => '84' }) }
|
||||
end
|
||||
|
||||
context 'departement tdc' do
|
||||
let(:champ) { create(:champ_departements, value: '02') }
|
||||
|
||||
it { expect(champ_value(champ.stable_id).type([champ.type_de_champ])).to eq(:departement_enum) }
|
||||
it { is_expected.to eq({ 'code_region' => '32' }) }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue