Merge pull request #7152 from tchak/fix-dossiers-pdf

Revert "Merge pull request #7137 from betagouv/faster_pdf"

Gemfile

@@ -59,6 +59,7 @@ gem 'openid_connect'
 gem 'pg'
 gem 'phonelib'
 gem 'prawn-rails' # PDF Generation
+gem 'prawn-svg'
 gem 'premailer-rails'
 gem 'puma' # Use Puma as the app server
 gem 'pundit'

Gemfile.lock

@@ -459,6 +459,9 @@ GEM
       prawn
       prawn-table
       rails (>= 3.1.0)
+    prawn-svg (0.31.0)
+      css_parser (~> 1.6)
+      prawn (>= 0.11.1, < 3)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     premailer (1.14.2)
@@ -837,6 +840,7 @@ DEPENDENCIES
   pg
   phonelib
   prawn-rails
+  prawn-svg
   premailer-rails
   pry-byebug
   puma

app/lib/active_storage/downloadable_file.rb

@@ -1,6 +1,7 @@
 class ActiveStorage::DownloadableFile
   def self.create_list_from_dossiers(dossiers, for_expert = false)
-    PiecesJustificativesService.generate_dossier_export(dossiers) +
+    dossiers
+      .map { |d| pj_and_path(d.id, PiecesJustificativesService.generate_dossier_export(d)) } +
     PiecesJustificativesService.liste_documents(dossiers, for_expert)
   end
 

app/models/dossier.rb

@@ -485,10 +485,9 @@ class Dossier < ApplicationRecord
   end
 
   def motivation
-    if termine?
+    return nil if !termine?
     traitement&.motivation || read_attribute(:motivation)
   end
-  end
 
   def update_search_terms
     self.search_terms = [

app/services/pieces_justificatives_service.rb

@@ -107,44 +107,21 @@ class PiecesJustificativesService
     end
   end
 
-  def self.generate_dossier_export(dossiers)
+  def self.generate_dossier_export(dossier)
-    return [] if dossiers.empty?
-
-    pdfs = []
-
-    procedure = dossiers.first.procedure
-    tdc_by_id = TypeDeChamp
-      .joins(:revisions)
-      .where(revisions: { id: procedure.revisions })
-      .to_a
-      .group_by(&:id)
-
-    dossiers
-      .includes(:champs, :champs_private, :commentaires, :individual,
-                :traitement, :etablissement,
-                user: :france_connect_information, avis: :expert)
-      .find_each do |dossier|
     pdf = ApplicationController
       .render(template: 'dossiers/show', formats: [:pdf],
               assigns: {
                 include_infos_administration: true,
-                  dossier: dossier,
+                dossier: dossier
-                  procedure: procedure,
-                  tdc_by_id: tdc_by_id
               })
 
-      a = FakeAttachment.new(
+    FakeAttachment.new(
       file: StringIO.new(pdf),
       filename: "export-#{dossier.id}.pdf",
       name: 'pdf_export_for_instructeur',
       id: dossier.id,
       created_at: dossier.updated_at
     )
-
-      pdfs << ActiveStorage::DownloadableFile.pj_and_path(dossier.id, a)
-    end
-
-    pdfs
   end
 
   private

app/views/dossiers/dossier_vide.pdf.prawn

@@ -181,7 +181,7 @@ prawn_document(page_size: "A4") do |pdf|
       italic: Rails.root.join('lib/prawn/fonts/marianne/marianne-thin.ttf' ),
   })
   pdf.font 'marianne'
-  pdf.image DOSSIER_PDF_EXPORT_LOGO_SRC, width: 300, position: :center
+  pdf.svg IO.read(DOSSIER_PDF_EXPORT_LOGO_SRC), width: 300, position: :center
   pdf.move_down(40)
 
   render_in_2_columns(pdf, 'Démarche', @dossier.procedure.libelle)

app/views/dossiers/show.pdf.prawn

@@ -130,30 +130,28 @@ def add_identite_etablissement(pdf, etablissement)
 end
 
 def add_single_champ(pdf, champ)
-  tdc = @tdc_by_id[champ.type_de_champ_id].first
-
   case champ.type
   when 'Champs::PieceJustificativeChamp', 'Champs::TitreIdentiteChamp'
     return
   when 'Champs::HeaderSectionChamp'
-    add_section_title(pdf, tdc.libelle)
+    add_section_title(pdf, champ.libelle)
   when 'Champs::ExplicationChamp'
-    format_in_2_lines(pdf, tdc.libelle, tdc.description)
+    format_in_2_lines(pdf, champ.libelle, champ.description)
   when 'Champs::CarteChamp'
-    format_in_2_lines(pdf, tdc.libelle, champ.to_feature_collection.to_json)
+    format_in_2_lines(pdf, champ.libelle, champ.to_feature_collection.to_json)
   when 'Champs::SiretChamp'
     pdf.font 'marianne', style: :bold do
-      pdf.text tdc.libelle
+      pdf.text champ.libelle
     end
     if champ.etablissement.present?
       add_identite_etablissement(pdf, champ.etablissement)
     end
   when 'Champs::NumberChamp'
     value = champ.to_s.empty? ? 'Non communiqué' : number_with_delimiter(champ.to_s)
-    format_in_2_lines(pdf, tdc.libelle, value)
+    format_in_2_lines(pdf, champ.libelle, value)
   else
     value = champ.to_s.empty? ? 'Non communiqué' : champ.to_s
-    format_in_2_lines(pdf, tdc.libelle, value)
+    format_in_2_lines(pdf, champ.libelle, value)
   end
 end
 
@@ -207,9 +205,6 @@ def add_etats_dossier(pdf, dossier)
 end
 
 prawn_document(page_size: "A4") do |pdf|
-  @procedure ||= @dossier.procedure
-  @tdc_by_id ||= @dossier.champs.map(&:type_de_champ).group_by(&:id)
-
   pdf.font_families.update( 'marianne' => {
     normal: Rails.root.join('lib/prawn/fonts/marianne/marianne-regular.ttf' ),
     bold: Rails.root.join('lib/prawn/fonts/marianne/marianne-bold.ttf' ),
@@ -217,12 +212,12 @@ prawn_document(page_size: "A4") do |pdf|
   pdf.font 'marianne'
 
   pdf.pad_bottom(40) do
-    pdf.image DOSSIER_PDF_EXPORT_LOGO_SRC, width: 300, position: :center
+    pdf.svg IO.read(DOSSIER_PDF_EXPORT_LOGO_SRC), width: 300, position: :center
   end
 
   format_in_2_columns(pdf, 'Dossier Nº', @dossier.id.to_s)
-  format_in_2_columns(pdf, 'Démarche', @procedure.libelle)
+  format_in_2_columns(pdf, 'Démarche', @dossier.procedure.libelle)
-  format_in_2_columns(pdf, 'Organisme', @procedure.organisation_name)
+  format_in_2_columns(pdf, 'Organisme', @dossier.procedure.organisation_name)
 
   add_etat_dossier(pdf, @dossier)
 

config/env.example.optional

@@ -69,7 +69,7 @@ DS_ENV="staging"
 # PROCEDURE_DEFAULT_LOGO_SRC="republique-francaise-logo.svg"
 
 # Instance customization: PDF export logo ---> to be put in "app/assets/images"
-# DOSSIER_PDF_EXPORT_LOGO_SRC="app/assets/images/header/logo-ds-wide.png"
+# DOSSIER_PDF_EXPORT_LOGO_SRC="app/assets/images/header/logo-ds-wide.svg"
 
 # Instance customization: watermark for identity documents
 # WATERMARK_FILE=""

config/initializers/images.rb

@@ -17,4 +17,4 @@ MAILER_FOOTER_LOGO_SRC = ENV.fetch("MAILER_FOOTER_LOGO_SRC", "mailer/instructeur
 PROCEDURE_DEFAULT_LOGO_SRC = ENV.fetch("PROCEDURE_DEFAULT_LOGO_SRC", "republique-francaise-logo.svg")
 
 # Logo in PDF export of a "Dossier"
-DOSSIER_PDF_EXPORT_LOGO_SRC = ENV.fetch("DOSSIER_PDF_EXPORT_LOGO_SRC", "app/assets/images/header/logo-ds-wide.png")
+DOSSIER_PDF_EXPORT_LOGO_SRC = ENV.fetch("DOSSIER_PDF_EXPORT_LOGO_SRC", "app/assets/images/header/logo-ds-wide.svg")

spec/services/pieces_justificatives_service_spec.rb

@@ -192,7 +192,7 @@ describe PiecesJustificativesService do
   describe '.generate_dossier_export' do
     let(:dossier) { create(:dossier) }
 
-    subject { PiecesJustificativesService.generate_dossier_export(Dossier.where(id: dossier.id)) }
+    subject { PiecesJustificativesService.generate_dossier_export(dossier) }
 
     it "doesn't update dossier" do
       expect { subject }.not_to change { dossier.updated_at }