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

Merge pull request #9072 from colinux/fix-modif-en-construction-demarche-test

Browse source 
ETQ admin: corrige une erreur lorsque je modifie mon dossier en construction d'une démarche en test
This commit is contained in:
Colin Darie 2023-05-23 10:30:57 +00:00 • committed by GitHub
commit 1afd5e7f12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 99 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/dossier_rebase_concern.rb
View file

@ -2,6 +2,8 @@ module DossierRebaseConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
def rebase!(force: false) def rebase!(force: false)
return if procedure.published_revision.blank?
if force || can_rebase? if force || can_rebase?
transaction do transaction do
rebase rebase

24
spec/models/concern/dossier_rebase_concern_spec.rb
View file

@ -250,8 +250,9 @@ describe DossierRebaseConcern do
end end
describe "#rebase" do describe "#rebase" do
let(:procedure) do let(:procedure) { create(:procedure, types_de_champ_public:, types_de_champ_private:) }
create(:procedure, types_de_champ_public: [ let(:types_de_champ_public) do
[
{ type: :text, mandatory: true, stable_id: 1 }, { type: :text, mandatory: true, stable_id: 1 },
{ {
type: :repetition, stable_id: 101, mandatory: true, children: [ type: :repetition, stable_id: 101, mandatory: true, children: [
@ -261,8 +262,9 @@ describe DossierRebaseConcern do
{ type: :datetime, stable_id: 103 }, { type: :datetime, stable_id: 103 },
{ type: :yes_no, stable_id: 104 }, { type: :yes_no, stable_id: 104 },
{ type: :integer_number, stable_id: 105 } { type: :integer_number, stable_id: 105 }
], types_de_champ_private: [{ type: :text, stable_id: 11 }]) ]
end end
let(:types_de_champ_private) { [{ type: :text, stable_id: 11 }] }
let(:dossier) { create(:dossier, procedure: procedure) } let(:dossier) { create(:dossier, procedure: procedure) }
let(:types_de_champ) { procedure.active_revision.types_de_champ } let(:types_de_champ) { procedure.active_revision.types_de_champ }
@ -286,6 +288,7 @@ describe DossierRebaseConcern do
let(:private_text_type_de_champ) { types_de_champ.find { _1.stable_id == 11 } } let(:private_text_type_de_champ) { types_de_champ.find { _1.stable_id == 11 } }
let(:rebased_private_text_champ) { dossier.champs_private.find { _1.stable_id == 11 } } let(:rebased_private_text_champ) { dossier.champs_private.find { _1.stable_id == 11 } }
context "when revision is published" do
before do before do
procedure.publish! procedure.publish!
procedure.draft_revision.add_type_de_champ({ procedure.draft_revision.add_type_de_champ({
@ -370,6 +373,21 @@ describe DossierRebaseConcern do
end end
end end
context 'force rebase en construction' do
subject { dossier.rebase!(force: true) }
context 'procedure not published' do
let(:procedure) { create(:procedure, :draft, types_de_champ_public:, types_de_champ_private:) }
let(:dossier) { create(:dossier, :en_construction, procedure:) }
it 'is noop' do
expect { subject }.not_to change { dossier.reload.champs_public[0].rebased_at }
expect { subject }.not_to change { dossier.updated_at }
end
end
end
end
context 'small grained' do context 'small grained' do
subject do subject do
procedure.publish_revision! procedure.publish_revision!