DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

chore(logic): commune and epci champs are always compute with compute_value_json

Browse source
This commit is contained in:
Eric Leroy-Terquem 2023-12-21 14:20:54 +01:00
parent deab400057
commit 547a4d95b7
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/logic/champ_value.rb
View file

@ -53,8 +53,6 @@ class Logic::ChampValue < Logic::Term
targeted_champ.selected_options targeted_champ.selected_options
when "Champs::DepartementChamp", "Champs::RegionChamp" when "Champs::DepartementChamp", "Champs::RegionChamp"
targeted_champ.code targeted_champ.code
when "Champs::CommuneChamp", "Champs::EpciChamp"
targeted_champ.code_departement
end end
end end

4
spec/models/routing_engine_spec.rb
View file

@ -122,7 +122,7 @@ describe RoutingEngine, type: :model do
context 'with a matching rule' do context 'with a matching rule' do
before do before do
gi_2.update(routing_rule: ds_eq(champ_value(communes_tdc.stable_id), constant('92'))) gi_2.update(routing_rule: ds_in_departement(champ_value(communes_tdc.stable_id), constant('92')))
dossier.champs.first.update(code_postal: '92500', external_id: '92063') dossier.champs.first.update(code_postal: '92500', external_id: '92063')
end end
@ -141,7 +141,7 @@ describe RoutingEngine, type: :model do
context 'with a matching rule' do context 'with a matching rule' do
before do before do
gi_2.update(routing_rule: ds_eq(champ_value(epci_tdc.stable_id), constant('42'))) gi_2.update(routing_rule: ds_in_departement(champ_value(epci_tdc.stable_id), constant('42')))
dossier.champs.first.update_columns( dossier.champs.first.update_columns(
external_id: 244200895, external_id: 244200895,
value: 'CC du Pilat Rhodanien', value: 'CC du Pilat Rhodanien',