fix(ProcedureExportService): downloadable_sorted_batch is scoped by export, no need to re-filter them via downloadablable_sorted_batch otherwise export for supprimes_recemment does not includes dossier.supprimes_recemment
This commit is contained in:
parent
8f2d0168e5
commit
c921e6e1ee
3 changed files with 37 additions and 19 deletions
|
@ -241,19 +241,8 @@ class Dossier < ApplicationRecord
|
|||
.joins(:traitements)
|
||||
.where(traitements: { processed_at: date.beginning_of_month..date.end_of_month })
|
||||
end
|
||||
scope :downloadable_sorted, -> {
|
||||
state_not_brouillon
|
||||
.visible_by_administration
|
||||
.includes(
|
||||
:user,
|
||||
:individual,
|
||||
:followers_instructeurs,
|
||||
:traitement,
|
||||
:groupe_instructeur,
|
||||
:etablissement,
|
||||
procedure: [:groupe_instructeurs],
|
||||
avis: [:claimant, :expert]
|
||||
).order(depose_at: 'asc')
|
||||
scope :ordered_for_export, -> {
|
||||
order(depose_at: 'asc')
|
||||
}
|
||||
scope :en_cours, -> { not_archived.state_en_construction_ou_instruction }
|
||||
scope :without_followers, -> { left_outer_joins(:follows).where(follows: { id: nil }) }
|
||||
|
@ -434,7 +423,16 @@ class Dossier < ApplicationRecord
|
|||
end
|
||||
|
||||
def self.downloadable_sorted_batch
|
||||
DossierPreloader.new(downloadable_sorted).in_batches
|
||||
DossierPreloader.new(includes(
|
||||
:user,
|
||||
:individual,
|
||||
:followers_instructeurs,
|
||||
:traitement,
|
||||
:groupe_instructeur,
|
||||
:etablissement,
|
||||
procedure: [:groupe_instructeurs],
|
||||
avis: [:claimant, :expert]
|
||||
).ordered_for_export).in_batches
|
||||
end
|
||||
|
||||
def user_deleted?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue