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

Merge pull request #5171 from betagouv/fix-expired-dossiers-deletion

Browse source 
dossiers expiration: fix the mailer arguments
This commit is contained in:
Keirua 2020-05-18 16:39:57 +02:00 • committed by GitHub
commit 6ccb09a9e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/expired_dossiers_deletion_service.rb
View file

@ -117,14 +117,14 @@ class ExpiredDossiersDeletionService
.group_by(&:user) .group_by(&:user)
.each do |(user, dossiers)| .each do |(user, dossiers)|
DossierMailer.notify_automatic_deletion_to_user( DossierMailer.notify_automatic_deletion_to_user(
DeletedDossier.where(dossier_id: dossiers.map(&:id)), DeletedDossier.where(dossier_id: dossiers.map(&:id)).to_a,
user.email user.email
).deliver_later ).deliver_later
end end
self.group_by_fonctionnaire_email(dossiers_to_remove).each do |(email, dossiers)| self.group_by_fonctionnaire_email(dossiers_to_remove).each do |(email, dossiers)|
DossierMailer.notify_automatic_deletion_to_administration( DossierMailer.notify_automatic_deletion_to_administration(
DeletedDossier.where(dossier_id: dossiers.map(&:id)), DeletedDossier.where(dossier_id: dossiers.map(&:id)).to_a,
email email
).deliver_later ).deliver_later

16
spec/services/expired_dossiers_deletion_service_spec.rb
View file

@ -19,8 +19,8 @@ describe ExpiredDossiersDeletionService do
let!(:valid_brouillon) { create(:dossier, procedure: procedure, created_at: date_not_expired) } let!(:valid_brouillon) { create(:dossier, procedure: procedure, created_at: date_not_expired) }
before do before do
allow(DossierMailer).to receive(:notify_brouillon_near_deletion).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_brouillon_near_deletion).and_call_original
allow(DossierMailer).to receive(:notify_brouillon_deletion).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_brouillon_deletion).and_call_original
ExpiredDossiersDeletionService.process_expired_dossiers_brouillon ExpiredDossiersDeletionService.process_expired_dossiers_brouillon
end end
@ -207,8 +207,8 @@ describe ExpiredDossiersDeletionService do
after { Timecop.return } after { Timecop.return }
before do before do
allow(DossierMailer).to receive(:notify_automatic_deletion_to_user).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_automatic_deletion_to_user).and_call_original
allow(DossierMailer).to receive(:notify_automatic_deletion_to_administration).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_automatic_deletion_to_administration).and_call_original
end end
context 'with a single dossier' do context 'with a single dossier' do
@ -275,8 +275,8 @@ describe ExpiredDossiersDeletionService do
after { Timecop.return } after { Timecop.return }
before do before do
allow(DossierMailer).to receive(:notify_near_deletion_to_user).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_near_deletion_to_user).and_call_original
allow(DossierMailer).to receive(:notify_near_deletion_to_administration).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_near_deletion_to_administration).and_call_original
end end
context 'with a single dossier' do context 'with a single dossier' do
@ -344,8 +344,8 @@ describe ExpiredDossiersDeletionService do
after { Timecop.return } after { Timecop.return }
before do before do
allow(DossierMailer).to receive(:notify_automatic_deletion_to_user).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_automatic_deletion_to_user).and_call_original
allow(DossierMailer).to receive(:notify_automatic_deletion_to_administration).and_return(double(deliver_later: nil)) allow(DossierMailer).to receive(:notify_automatic_deletion_to_administration).and_call_original
end end
context 'with a single dossier' do context 'with a single dossier' do