[Fix #1808] Use &. where possible

app/controllers/admin/attestation_templates_controller.rb

@@ -71,7 +71,7 @@ class Admin::AttestationTemplatesController < AdminController
   end
 
   def uninterlaced_png(uploaded_file)
-    if uploaded_file.present? && uploaded_file.content_type == 'image/png'
+    if uploaded_file&.content_type == 'image/png'
       chunky_img = ChunkyPNG::Image.from_io(uploaded_file)
       chunky_img.save(uploaded_file.tempfile.to_path, interlace: false)
       uploaded_file.tempfile.reopen(uploaded_file.tempfile.to_path, 'rb')

app/controllers/admin/procedures_controller.rb

@@ -225,7 +225,7 @@ class Admin::ProceduresController < AdminController
 
   def procedure_params
     editable_params = [:libelle, :description, :organisation, :direction, :lien_site_web, :notice, :web_hook_url, :euro_flag, :logo, :auto_archive_on]
-    if @procedure.try(:locked?)
+    if @procedure&.locked?
       params.require(:procedure).permit(*editable_params)
     else
       params.require(:procedure).permit(*editable_params, :lien_demarche, :cerfa_flag, :for_individual, :individual_with_siret, :ask_birthday, module_api_carto_attributes: [:id, :use_api_carto, :quartiers_prioritaires, :cadastre]).merge(administrateur_id: current_administrateur.id)

app/controllers/new_gestionnaire/avis_controller.rb

@@ -118,7 +118,7 @@ module NewGestionnaire
         # a gestionnaire is authenticated ... lets see if it can view the dossier
 
         redirect_to gestionnaire_avis_url(avis)
-      elsif avis.gestionnaire.present? && avis.gestionnaire.email == params[:email]
+      elsif avis.gestionnaire&.email == params[:email]
         # the avis gestionnaire has already signed up and it sould sign in
 
         redirect_to new_gestionnaire_session_url

app/helpers/application_helper.rb

@@ -15,9 +15,9 @@ module ApplicationHelper
   end
 
   def current_email
-    current_user.try(:email) ||
-      current_gestionnaire.try(:email) ||
-      current_administrateur.try(:email)
+    current_user&.email ||
+      current_gestionnaire&.email ||
+      current_administrateur&.email
   end
 
   def root_path_for_profile(nav_bar_profile)

app/mailers/avis_mailer.rb

@@ -1,7 +1,7 @@
 class AvisMailer < ApplicationMailer
   def avis_invitation(avis)
     @avis = avis
-    email = @avis.gestionnaire.try(:email) || @avis.email
+    email = @avis.gestionnaire&.email || @avis.email
     mail(to: email, subject: "Donnez votre avis sur le dossier nº #{@avis.dossier.id} (#{@avis.dossier.procedure.libelle})")
   end
 end

app/models/avis.rb

@@ -19,7 +19,7 @@ class Avis < ApplicationRecord
   scope :updated_since?, -> (date) { where('avis.updated_at > ?', date) }
 
   def email_to_display
-    gestionnaire.try(:email) || email
+    gestionnaire&.email || email
   end
 
   def self.link_avis_to_gestionnaire(gestionnaire)
@@ -27,8 +27,7 @@ class Avis < ApplicationRecord
   end
 
   def self.avis_exists_and_email_belongs_to_avis?(avis_id, email)
-    avis = Avis.find_by(id: avis_id)
-    avis.present? && avis.email == email
+    Avis.find_by(id: avis_id)&.email == email
   end
 
   private

app/models/mails/closed_mail.rb

@@ -11,7 +11,7 @@ module Mails
 
     def self.default_template_name_for_procedure(procedure)
       attestation_template = procedure.attestation_template
-      if attestation_template.present? && attestation_template.activated?
+      if attestation_template&.activated?
         "mails/closed_mail_with_attestation"
       else
         "mails/closed_mail"

app/models/procedure.rb

@@ -209,11 +209,11 @@ class Procedure < ApplicationRecord
     end
 
     procedure.administrateur = admin
-    procedure.initiated_mail = initiated_mail.try(:dup)
-    procedure.received_mail = received_mail.try(:dup)
-    procedure.closed_mail = closed_mail.try(:dup)
-    procedure.refused_mail = refused_mail.try(:dup)
-    procedure.without_continuation_mail = without_continuation_mail.try(:dup)
+    procedure.initiated_mail = initiated_mail&.dup
+    procedure.received_mail = received_mail&.dup
+    procedure.closed_mail = closed_mail&.dup
+    procedure.refused_mail = refused_mail&.dup
+    procedure.without_continuation_mail = without_continuation_mail&.dup
 
     procedure.cloned_from_library = from_library
     procedure.parent_procedure = self

app/serializers/dossier_serializer.rb

@@ -31,7 +31,7 @@ class DossierSerializer < ActiveModel::Serializer
   end
 
   def email
-    object.user.try(:email)
+    object.user&.email
   end
 
   def entreprise

app/serializers/dossier_table_export_serializer.rb

@@ -18,7 +18,7 @@ class DossierTableExportSerializer < ActiveModel::Serializer
     :individual_birthdate
 
   def email
-    object.user.try(:email)
+    object.user&.email
   end
 
   def state
@@ -47,19 +47,19 @@ class DossierTableExportSerializer < ActiveModel::Serializer
   end
 
   def individual_prenom
-    object.individual.try(:prenom)
+    object.individual&.prenom
   end
 
   def individual_nom
-    object.individual.try(:nom)
+    object.individual&.nom
   end
 
   def individual_birthdate
-    object.individual.try(:birthdate)
+    object.individual&.birthdate
   end
 
   def individual_gender
-    object.individual.try(:gender)
+    object.individual&.gender
   end
 
   def emails_accompagnateurs

app/views/layouts/_new_header.haml

@@ -1,3 +1,4 @@
+/ We can't use &. because the controller may not implement #nav_bar_profile
 - nav_bar_profile = controller.try(:nav_bar_profile)
 
 .new-header{ class: current_page?(root_path) ? nil : "new-header-with-border" }

app/views/shared/dossiers/editable_champs/_dossier_link.html.haml

@@ -1,7 +1,7 @@
 - dossier = Dossier.find_by(id: champ.value)
 - show_text_summary = dossier.present?
 - show_warning = !show_text_summary && champ.value.present?
-- text_summary = sanitize(dossier.try(:text_summary))
+- text_summary = sanitize(dossier&.text_summary)
 
 .dossier-link
   = form.number_field :value,

app/views/users/description/champs/_dossier_link.html.haml

@@ -1,7 +1,7 @@
 - dossier = Dossier.find_by(id: champ.value)
 - show_text_summary = dossier.present?
 - show_warning = !show_text_summary && champ.value.present?
-- text_summary = dossier.try(:text_summary)
+- text_summary = dossier&.text_summary
 
 .dossier-link
   %input.form-control{ name: "champs['#{ champ.id }']",

lib/tasks/2018_02_28_clean_gestionnaire_emails.rake

@@ -1,11 +1,11 @@
 namespace :'2018_02_28_clean_invalid_emails_accounts' do
   task clean: :environment do
     Gestionnaire.pluck(:email, :id).select { |e, id| e.include?(" ") }.each do |email, id|
-      Gestionnaire.find_by(id: id, current_sign_in_at: nil).try(:destroy) # ensure account was never used
+      Gestionnaire.find_by(id: id, current_sign_in_at: nil)&.destroy # ensure account was never used
     end
 
     User.pluck(:email, :id).select { |e, id| e.include?(" ") }.each do |email, id|
-      User.find_by(id: id, current_sign_in_at: nil).try(:destroy) # ensure account was never used
+      User.find_by(id: id, current_sign_in_at: nil)&.destroy # ensure account was never used
     end
   end
 end