From 9a2798331361954c259657a96d300fbe59ad5590 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Wed, 19 Jul 2017 10:49:47 +0200
Subject: [PATCH] Refactor name condition to a cleaner code, delegate
 :full_name from profile to person to user

---
 app/models/person.rb              | 2 +-
 app/models/user.rb                | 2 +-
 app/views/notifier/invite.markerb | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/models/person.rb b/app/models/person.rb
index 13be8ec8b..d76cfcb92 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -22,7 +22,7 @@ class Person < ActiveRecord::Base
   end
 
   has_one :profile, dependent: :destroy
-  delegate :last_name, :image_url, :tag_string, :bio, :location,
+  delegate :last_name, :full_name, :image_url, :tag_string, :bio, :location,
            :gender, :birthday, :formatted_birthday, :tags, :searchable,
            :public_details?, to: :profile
   accepts_nested_attributes_for :profile
diff --git a/app/models/user.rb b/app/models/user.rb
index 940a48f25..2061efc9b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -46,7 +46,7 @@ class User < ActiveRecord::Base
 
   delegate :guid, :public_key, :posts, :photos, :owns?, :image_url,
            :diaspora_handle, :name, :atom_url, :profile_url, :profile, :url,
-           :first_name, :last_name, :gender, :participations, to: :person
+           :first_name, :last_name, :full_name, :gender, :participations, to: :person
   delegate :id, :guid, to: :person, prefix: true
 
   has_many :aspects, -> { order('order_id ASC') }
diff --git a/app/views/notifier/invite.markerb b/app/views/notifier/invite.markerb
index ee3942a3b..8c20a00c0 100644
--- a/app/views/notifier/invite.markerb
+++ b/app/views/notifier/invite.markerb
@@ -1,8 +1,6 @@
 <%= t('.message',
   invite_url: invite_code_url(@invitation_code),
   diasporafoundation_url: 'https://diasporafoundation.org/',
-  user: @inviter.try(:diaspora_handle) == @inviter.try(:name) ?
-    @inviter.try(:diaspora_handle) :
-    @inviter.try(:name) + " (" + @inviter.try(:diaspora_handle) + ")",
+  user: @inviter.try(:full_name).empty? ? @inviter.try(:diaspora_handle) : "#{@inviter.name} (#{@inviter.diaspora_handle})",
   diaspora_id: @inviter.try(:diaspora_handle))
 %>