From 1f76b25e2a3f2e5280c452397526f9ca6ec3fd59 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Fri, 31 May 2019 18:29:11 +0200
Subject: [PATCH] Show name and email for deleted poll officer's user account

Avoid to raise an exception `Module::DelegationError' when trying to
show the name and/or email of a poll officer whose user account has
been deleted.
We'll show a message "User deleted" and "Email deleted" instead.
---
 app/models/poll/officer.rb       |  8 +++++++-
 config/locales/en/general.yml    |  1 +
 config/locales/es/general.yml    |  1 +
 spec/models/poll/officer_spec.rb | 28 ++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/models/poll/officer.rb b/app/models/poll/officer.rb
index c44256a5aba..429add05a9d 100644
--- a/app/models/poll/officer.rb
+++ b/app/models/poll/officer.rb
@@ -7,7 +7,13 @@ class Officer < ApplicationRecord
 
     validates :user_id, presence: true, uniqueness: true
 
-    delegate :name, :email, to: :user
+    def name
+      user&.name || I18n.t("shared.author_info.author_deleted")
+    end
+
+    def email
+      user&.email || I18n.t("shared.author_info.email_deleted")
+    end
 
     def voting_days_assigned_polls
       officer_assignments.voting_days.includes(booth_assignment: :poll).
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 1cc83c602af..5bb51982d21 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -724,6 +724,7 @@ en:
       to: "To"
     author_info:
       author_deleted: User deleted
+      email_deleted: Email deleted
     back: Go back
     check: Select
     check_all: All
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index b7a527c6a4f..52994ae8715 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -722,6 +722,7 @@ es:
       to: "Hasta"
     author_info:
       author_deleted: Usuario eliminado
+      email_deleted: Email eliminado
     back: Volver
     check: Seleccionar
     check_all: Todos
diff --git a/spec/models/poll/officer_spec.rb b/spec/models/poll/officer_spec.rb
index 4cdc581b126..d86efce14fd 100644
--- a/spec/models/poll/officer_spec.rb
+++ b/spec/models/poll/officer_spec.rb
@@ -2,6 +2,34 @@
 
 describe Poll::Officer do
 
+  describe "#name" do
+    let(:officer) { create(:poll_officer) }
+
+    it "returns user name if user is not deleted" do
+      expect(officer.name).to eq officer.user.name
+    end
+
+    it "returns 'User deleted' if user is deleted" do
+      officer.user.destroy
+
+      expect(officer.reload.name).to eq "User deleted"
+    end
+  end
+
+  describe "#email" do
+    let(:officer) { create(:poll_officer) }
+
+    it "returns user email if user is not deleted" do
+      expect(officer.email).to eq officer.user.email
+    end
+
+    it "returns 'Email deleted' if user is deleted" do
+      officer.user.destroy
+
+      expect(officer.reload.email).to eq "Email deleted"
+    end
+  end
+
   describe "#voting_days_assigned_polls" do
     it "returns all polls with this officer assigned during voting days" do
       officer = create(:poll_officer)