Merge pull request #2041 from betagouv/fix-1735

Fix #1735

app/controllers/manager/administrateurs_controller.rb

@@ -14,7 +14,7 @@ module Manager
     end
 
     def reinvite
-      Administrateur.find_inactive_by_id(params[:id]).invite!
+      Administrateur.find_inactive_by_id(params[:id]).invite!(current_administration.id)
       flash.notice = "Invitation renvoyée"
       redirect_to manager_administrateur_path(params[:id])
     end

app/lib/biz_dev.rb

@@ -0,0 +1,48 @@
+module BizDev
+  BIZ_DEV_MAPPING = {
+    8 =>
+      {
+        full_name: "Camille Garrigue",
+        pipedrive_id: 3189424
+      },
+    9 =>
+      {
+        full_name: "Philippe Vrignaud",
+        pipedrive_id: 2753338
+      },
+    10 =>
+      {
+        full_name: "Benjamin Doberset",
+        pipedrive_id: 4223834
+      },
+    11 =>
+      {
+        full_name: "Rédouane Bouchane",
+        pipedrive_id: 4438645
+      }
+  }
+
+  BIZ_DEV_IDS = BIZ_DEV_MAPPING.keys
+
+  def full_name(administration_id)
+    id = ensure_proper_administration_id(administration_id)
+
+    BIZ_DEV_MAPPING[id][:full_name]
+  end
+
+  def pipedrive_id(administration_id)
+    id = ensure_proper_administration_id(administration_id)
+
+    BIZ_DEV_MAPPING[id][:pipedrive_id]
+  end
+
+  private
+
+  def ensure_proper_administration_id(administration_id)
+    if administration_id.in?(BIZ_DEV_IDS)
+      administration_id
+    else
+      BIZ_DEV_IDS[administration_id % BIZ_DEV_IDS.length]
+    end
+  end
+end

app/mailers/administration_mailer.rb

@@ -10,9 +10,10 @@ class AdministrationMailer < ApplicationMailer
          subject: subject)
   end
 
-  def invite_admin(admin, reset_password_token)
+  def invite_admin(admin, reset_password_token, administration_id)
     @reset_password_token = reset_password_token
     @admin = admin
+    @author_name = BizDev.full_name(administration_id)
     subject = "Activez votre compte administrateur"
 
     mail(to: admin.email,

app/models/administrateur.rb

@@ -44,14 +44,14 @@ class Administrateur < ApplicationRecord
     end
   end
 
-  def invite!
+  def invite!(administration_id)
     if active?
       raise "Impossible d'inviter un utilisateur déjà actif !"
     end
 
     reset_password_token = set_reset_password_token
 
-    AdministrationMailer.invite_admin(self, reset_password_token).deliver_later
+    AdministrationMailer.invite_admin(self, reset_password_token, administration_id).deliver_later
 
     reset_password_token
   end

app/models/administration.rb

@@ -18,7 +18,7 @@ class Administration < ApplicationRecord
 
     if administrateur.save
       AdministrationMailer.new_admin_email(administrateur, self).deliver_later
-      administrateur.invite!
+      administrateur.invite!(id)
       User.create({
         email: email,
         password: password

app/views/administrateur_mailer/activate_before_expiration.haml

@@ -15,4 +15,4 @@
   Nous restons à votre disposition si vous avez besoin d’accompagnement.
 
 %p
-  = render partial: "layouts/mailers/bizdev_signature"
+  = render partial: "layouts/mailers/bizdev_signature", locals: { author_name: "Camille Garrigue" }

app/views/administration_mailer/invite_admin.html.haml

@@ -20,4 +20,4 @@
   = link_to(DOC_URL, DOC_URL)
 
 %p
-  = render partial: "layouts/mailers/bizdev_signature"
+  = render partial: "layouts/mailers/bizdev_signature", locals: { author_name: @author_name }

app/views/layouts/mailers/_bizdev_signature.html.haml

@@ -1,7 +1,7 @@
 Cordialement,
 %br
 %br
-Camille Garrigue
+= author_name
 %br
 %br
 Équipe demarches-simplifiees.fr

spec/mailers/previews/administration_mailer_preview.rb

@@ -8,7 +8,7 @@ class AdministrationMailerPreview < ActionMailer::Preview
   end
 
   def invite_admin
-    AdministrationMailer.invite_admin(Administrateur.last, "12345678")
+    AdministrationMailer.invite_admin(Administrateur.last, "12345678", 0)
   end
 
   def refuse_admin

spec/models/administrateur_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Administrateur, type: :model do
+  let(:administration) { create(:administration) }
+
   describe 'assocations' do
     it { is_expected.to have_and_belong_to_many(:gestionnaires) }
     it { is_expected.to have_many(:procedures) }
@@ -53,14 +55,14 @@ describe Administrateur, type: :model do
 
   describe '#find_inactive_by_token' do
     let(:administrateur) { create(:administration).invite_admin('paul@tps.fr') }
-    let(:reset_password_token) { administrateur.invite! }
+    let(:reset_password_token) { administrateur.invite!(administration.id) }
 
     it { expect(Administrateur.find_inactive_by_token(reset_password_token)).not_to be_nil }
   end
 
   describe '#reset_password' do
     let(:administrateur) { create(:administration).invite_admin('paul@tps.fr') }
-    let(:reset_password_token) { administrateur.invite! }
+    let(:reset_password_token) { administrateur.invite!(administration.id) }
 
     it { expect(Administrateur.reset_password(reset_password_token, '12345678').errors).to be_empty }
     it { expect(Administrateur.reset_password('123', '12345678').errors).not_to be_empty }