From b4b9ab48d05f37445ee7238d07013dc1f0e0070f Mon Sep 17 00:00:00 2001
From: Sebastian Serth <Sebastian.Serth@student.hpi.de>
Date: Wed, 12 Dec 2018 16:47:49 +0100
Subject: [PATCH] External User: Set name to displayname and introduce
 real_name

---
 app/models/external_user.rb             | 28 +++++++++++++++++++------
 app/views/external_users/show.html.slim |  2 +-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/models/external_user.rb b/app/models/external_user.rb
index b877f08d..61efaea5 100644
--- a/app/models/external_user.rb
+++ b/app/models/external_user.rb
@@ -4,12 +4,28 @@ class ExternalUser < ApplicationRecord
   validates :consumer_id, presence: true
   validates :external_id, presence: true
 
-  def displayname
-    result = name
-    if(result == nil || result == "")
-      result = "User " + id.to_s
-    end
-    result
+  def name
+    # Internal name, shown to teachers and administrators
+    pseudo_name
   end
 
+  def displayname
+    # External name, shown to the user itself and other users, e.g. on RfCs
+    pseudo_name
+  end
+
+  def real_name
+    # Name attribute of the object as persistet in the database
+    self[:name]
+  end
+
+  def pseudo_name
+    if real_name.blank?
+      "User " + id.to_s
+    else
+      real_name
+    end
+  end
+  private :pseudo_name
+
 end
diff --git a/app/views/external_users/show.html.slim b/app/views/external_users/show.html.slim
index 33e2dd6b..c68a91f5 100644
--- a/app/views/external_users/show.html.slim
+++ b/app/views/external_users/show.html.slim
@@ -1,6 +1,6 @@
 h1 = @user.name
 
-= row(label: 'external_user.name', value: @user.name)
+= row(label: 'external_user.name', value: @user.real_name)
 //= row(label: 'external_user.email', value: @user.email)
 = row(label: 'external_user.consumer', value: link_to(@user.consumer, @user.consumer))