Merge pull request #3326 from betagouv/dev

2019-01-23-03
This commit is contained in:
Pierre de La Morinerie 2019-01-23 17:39:19 +01:00 committed by GitHub
commit 537fb77b7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 88 additions and 17 deletions

View file

@ -54,6 +54,7 @@ class Admin::ProceduresController < AdminController
return render json: {}, status: 401
end
procedure.reset!
procedure.destroy
flash.notice = 'Démarche supprimée'

View file

@ -6,7 +6,7 @@ class Procedure < ApplicationRecord
has_many :types_de_piece_justificative, -> { ordered }, dependent: :destroy
has_many :types_de_champ, -> { root.public_only.ordered }, dependent: :destroy
has_many :types_de_champ_private, -> { root.private_only.ordered }, class_name: 'TypeDeChamp', dependent: :destroy
has_many :dossiers
has_many :dossiers, dependent: :restrict_with_exception
has_many :deleted_dossiers, dependent: :destroy
has_one :module_api_carto, dependent: :destroy

View file

@ -0,0 +1,25 @@
require Rails.root.join("lib", "tasks", "task_helper")
namespace :after_party do
desc 'Deployment task: delete_dossiers_without_procedure'
task delete_dossiers_without_procedure: :environment do
rake_puts "Running deploy task 'delete_dossiers_without_procedure'"
dossiers_without_procedure = Dossier.left_outer_joins(:procedure).where(procedures: { id: nil })
total = dossiers_without_procedure.count
expected_dossiers_count = 60
if total > expected_dossiers_count
raise "Error: #{expected_dossiers_count} dossiers expected, but found #{total}. Aborting."
end
dossiers_without_procedure.each do |dossier|
rake_puts "Destroy dossier #{dossier.id}"
dossier.destroy!
end
rake_puts "#{total} dossiers without procedure were destroyed."
AfterParty::TaskRecord.create version: '20190117154829'
end # task :delete_dossiers_without_procedure
end # namespace :after_party

View file

@ -91,41 +91,44 @@ describe Admin::ProceduresController, type: :controller do
end
describe 'DELETE #destroy' do
let(:procedure_draft) { create :procedure, administrateur: admin, published_at: nil, archived_at: nil }
let(:procedure_published) { create :procedure, administrateur: admin, aasm_state: :publiee, published_at: Time.zone.now, archived_at: nil }
let(:procedure_archived) { create :procedure, administrateur: admin, aasm_state: :archivee, published_at: nil, archived_at: Time.zone.now }
let(:procedure_draft) { create :procedure_with_dossiers, administrateur: admin, published_at: nil, archived_at: nil }
let(:procedure_published) { create :procedure_with_dossiers, administrateur: admin, aasm_state: :publiee, published_at: Time.zone.now, archived_at: nil }
let(:procedure_archived) { create :procedure_with_dossiers, administrateur: admin, aasm_state: :archivee, published_at: nil, archived_at: Time.zone.now }
subject { delete :destroy, params: { id: procedure.id } }
context 'when procedure is draft' do
context 'when the procedure is a draft' do
let!(:procedure) { procedure_draft }
describe 'tech params' do
before do
subject
end
it { expect(subject.status).to eq 302 }
it { expect(flash[:notice]).to be_present }
it 'destroys the procedure' do
expect { subject }.to change { Procedure.count }.by(-1)
end
it 'destroy procedure is call' do
expect_any_instance_of(Procedure).to receive(:destroy)
it 'deletes associated dossiers' do
subject
expect(Dossier.find_by(procedure_id: procedure.id)).to be_blank
end
it { expect { subject }.to change { Procedure.count }.by(-1) }
it 'redirects to the procedure drafts page' do
subject
expect(response).to redirect_to admin_procedures_draft_path
expect(flash[:notice]).to be_present
end
end
context 'when procedure is published' do
let(:procedure) { procedure_published }
let!(:procedure) { procedure_published }
it { expect { subject }.not_to change { Procedure.count } }
it { expect { subject }.not_to change { Dossier.count } }
it { expect(subject.status).to eq 401 }
end
context 'when procedure is archived' do
let(:procedure) { procedure_published }
let!(:procedure) { procedure_archived }
it { expect { subject }.not_to change { Procedure.count } }
it { expect { subject }.not_to change { Dossier.count } }
it { expect(subject.status).to eq 401 }
end

View file

@ -0,0 +1,42 @@
describe '20190117154829_delete_dossiers_without_procedure.rake' do
let(:rake_task) { Rake::Task['after_party:delete_dossiers_without_procedure'] }
subject do
rake_task.invoke
end
after do
rake_task.reenable
end
context 'when the procedure of some dossiers has been deleted' do
let!(:procedure1) { create(:procedure_with_dossiers, dossiers_count: 2) }
let!(:procedure2) { create(:procedure_with_dossiers, :published, dossiers_count: 2) }
let!(:procedure3) { create(:procedure_with_dossiers, :published, dossiers_count: 2) }
let!(:procedure4) { create(:procedure_with_dossiers, :archived, dossiers_count: 2) }
let(:procedure_2_dossier_ids) { procedure2.dossiers.pluck(:id) }
before do
procedure_2_dossier_ids
procedure2.delete
expect(procedure_2_dossier_ids.count).to eq(2)
expect(Dossier.find_by(id: procedure_2_dossier_ids.first).procedure).to be nil
expect(Dossier.find_by(id: procedure_2_dossier_ids.second).procedure).to be nil
end
it 'destroy dossiers without an existing procedure' do
subject
expect(Dossier.unscoped.find_by(id: procedure_2_dossier_ids.first)).to be nil
expect(Dossier.unscoped.find_by(id: procedure_2_dossier_ids.last)).to be nil
end
it 'doesnt destroy other dossiers' do
subject
expect(Dossier.all.count).to eq(6)
expect(procedure1.reload.dossiers.count).to eq(2)
expect(procedure3.reload.dossiers.count).to eq(2)
expect(procedure4.reload.dossiers.count).to eq(2)
end
end
end