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

Merge pull request #10014 from mfo/US/better-expert-exports

Browse source 
ETQ expert: je retrouve mes avis confidentiel dans les exports. ETQ instructeur, je retrouve les fichiers joint a une demande d'avis expert
This commit is contained in:
Colin Darie 2024-02-21 11:25:58 +00:00 • committed by GitHub
commit 41a27fbad2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app/services/pieces_justificatives_service.rb
View file

@ -84,11 +84,23 @@ class PiecesJustificativesService
def acl_for_dossier_export
case @user_profile
when Expert
{ include_infos_administration: true, include_avis_for_expert: true, only_for_expert: @user_profile }
{
include_infos_administration: true,
include_avis_for_expert: true,
only_for_expert: @user_profile
}
when Instructeur, Administrateur
{ include_infos_administration: true, include_avis_for_expert: true, only_for_export: false }
{
include_infos_administration: true,
include_avis_for_expert: true,
only_for_export: false
}
when User
{ include_infos_administration: false, include_avis_for_expert: false, only_for_expert: false }
{
include_infos_administration: false,
include_avis_for_expert: false, # should be true, expert can use the messagerie, why not provide avis ?
only_for_expert: false
}
else
raise 'not supported'
end
@ -211,12 +223,21 @@ class PiecesJustificativesService
def pjs_for_avis(dossiers)
avis_ids_dossier_id_query = Avis.joins(:dossier).where(dossier: dossiers)
avis_ids_dossier_id_query = avis_ids_dossier_id_query.where(confidentiel: false) if !liste_documents_allows?(:with_avis_piece_justificative)
if !liste_documents_allows?(:with_avis_piece_justificative)
avis_ids_dossier_id_query = avis_ids_dossier_id_query.where(confidentiel: false)
end
if @user_profile.is_a?(Expert)
avis_ids = Avis.joins(:dossier, experts_procedure: :expert)
.where(experts_procedure: { expert: @user_profile })
.where(dossier: dossiers)
.pluck(:id)
avis_ids_dossier_id_query = avis_ids_dossier_id_query.or(Avis.where(id: avis_ids))
end
avis_ids_dossier_id = avis_ids_dossier_id_query.pluck(:id, :dossier_id).to_h
ActiveStorage::Attachment
.includes(:blob)
.where(record_type: "Avis", name: "piece_justificative_file", record_id: avis_ids_dossier_id.keys)
.where(record_type: "Avis", record_id: avis_ids_dossier_id.keys)
.filter { |a| safe_attachment(a) }
.map do |a|
dossier_id = avis_ids_dossier_id[a.record_id]