From 535c6329d4a7236c5e8a47b9197bbd23e3ecb02f Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Thu, 21 Feb 2019 09:09:08 +0300
Subject: [PATCH] BlogUser refactored.

---
 .../Volo/Blogging/Users/BlogUser.cs           | 49 ++++++++++++-------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Users/BlogUser.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Users/BlogUser.cs
index fe4ce41e6a..9bdbb2fc0d 100644
--- a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Users/BlogUser.cs
+++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Users/BlogUser.cs
@@ -30,29 +30,46 @@ namespace Volo.Blogging.Users
         public BlogUser(IUserData user)
             : base(user.Id)
         {
-            Email = user.Email;
-            Name = user.Name;
-            Surname = user.Surname;
-            EmailConfirmed = user.EmailConfirmed;
-            PhoneNumber = user.PhoneNumber;
-            PhoneNumberConfirmed = user.PhoneNumberConfirmed;
-            UserName = user.UserName;
             TenantId = user.TenantId;
+            UpdateInternal(user);
         }
 
-        public bool Update(IUserData user)
+        public virtual bool Update(IUserData user)
         {
-            if (UserName == user.UserName &&
-                Name == user.Name &&
-                Surname == user.Surname &&
-                Email == user.Email &&
-                EmailConfirmed == user.EmailConfirmed &&
-                PhoneNumber == user.PhoneNumber &&
-                PhoneNumberConfirmed == user.PhoneNumberConfirmed)
+            if (Id != user.Id)
+            {
+                throw new ArgumentException($"Given User's Id '{user.Id}' does not match to this User's Id '{Id}'");
+            }
+
+            if (TenantId != user.TenantId)
+            {
+                throw new ArgumentException($"Given User's TenantId '{user.TenantId}' does not match to this User's TenantId '{TenantId}'");
+            }
+
+            if (Equals(user))
             {
                 return false;
             }
 
+            UpdateInternal(user);
+            return true;
+        }
+
+        protected virtual bool Equals(IUserData user)
+        {
+            return Id == user.Id &&
+                   TenantId == user.TenantId &&
+                   UserName == user.UserName &&
+                   Name == user.Name &&
+                   Surname == user.Surname &&
+                   Email == user.Email &&
+                   EmailConfirmed == user.EmailConfirmed &&
+                   PhoneNumber == user.PhoneNumber &&
+                   PhoneNumberConfirmed == user.PhoneNumberConfirmed;
+        }
+
+        protected virtual void UpdateInternal(IUserData user)
+        {
             Email = user.Email;
             Name = user.Name;
             Surname = user.Surname;
@@ -60,8 +77,6 @@ namespace Volo.Blogging.Users
             PhoneNumber = user.PhoneNumber;
             PhoneNumberConfirmed = user.PhoneNumberConfirmed;
             UserName = user.UserName;
-
-            return true;
         }
     }
 }