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

refactor(attachment): simplify find champ

Browse source
This commit is contained in:
Paul Chavard 2024-12-03 12:38:25 +01:00
parent 8ae516aca3
commit b1862d6221
No known key found for this signature in database
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/components/attachment/edit_component.rb
View file

@ -58,7 +58,7 @@ class Attachment::EditComponent < ApplicationComponent
def destroy_attachment_path
if champ.present?
attachment_path(dossier_id: champ&.dossier_id, stable_id: champ&.stable_id, row_id: champ&.row_id)
attachment_path
else
attachment_path(auto_attach_url: @auto_attach_url, view_as: @view_as, direct_upload: @direct_upload)
end

26
app/controllers/attachments_controller.rb
View file

@ -20,15 +20,16 @@ class AttachmentsController < ApplicationController
def destroy
@attachment = @blob.attachments.find(params[:id])
@attachment.purge_later
flash.notice = 'La pièce jointe a bien été supprimée.'
if params[:dossier_id]
@champ = find_champ
if champ?
@attachment = champ.piece_justificative_file.find { _1.blob.id == @blob.id }
else
@attachment_options = attachment_options
end
@attachment.purge_later
flash.notice = 'La pièce jointe a bien été supprimée.'
respond_to do |format|
format.turbo_stream
format.html { redirect_back(fallback_location: root_url) }
@ -37,14 +38,23 @@ class AttachmentsController < ApplicationController
private
def find_champ
dossier = policy_scope(Dossier).includes(:champs).find(params[:dossier_id])
dossier.champs.find_by(stable_id: params[:stable_id], row_id: params[:row_id] || Champ::NULL_ROW_ID)
def record
@attachment.record
end
def champ?
record.is_a?(Champ)
end
def champ
@champ ||= if champ?
record.dossier.champ_for_update(record.type_de_champ, row_id: record.row_id, updated_by: current_user.email)
end
end
def attachment_options
{
attached_file: @attachment.record.public_send(@attachment.name),
attached_file: record.public_send(@attachment.name),
view_as: params[:view_as]&.to_sym,
direct_upload: params[:direct_upload] == "true",
auto_attach_url: params[:direct_upload] == "true" ? params[:auto_attach_url] : nil