From 9e5095b7e9c21944d2559901c2b02f9da591fea1 Mon Sep 17 00:00:00 2001
From: damon <zhaorong@outlook.com>
Date: Thu, 18 Jan 2024 22:09:35 +0800
Subject: [PATCH] Make ValuesDiffer overridable.

---
 Source/Euonia.Business/Core/BusinessObject.cs           | 8 ++++----
 Source/Euonia.Business/Core/EditableObject.cs           | 8 +++++++-
 Source/Euonia.Business/Factory/BusinessObjectFactory.cs | 3 +--
 Source/Euonia.Business/Factory/IObjectFactory.cs        | 4 ++--
 project.props                                           | 2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Source/Euonia.Business/Core/BusinessObject.cs b/Source/Euonia.Business/Core/BusinessObject.cs
index 216c94f..883b259 100644
--- a/Source/Euonia.Business/Core/BusinessObject.cs
+++ b/Source/Euonia.Business/Core/BusinessObject.cs
@@ -312,7 +312,7 @@ protected void PropertyHasChanged(string propertyName)
 	/// <summary>
 	/// Checks if the object has changed properties.
 	/// </summary>
-	public virtual bool HasChangedProperties => ChangedProperties.Any();
+	public virtual bool HasChangedProperties => ChangedProperties.Count > 0;
 
 	#endregion
 
@@ -670,7 +670,7 @@ private object LoadPropertyByReflection(string methodName, IPropertyInfo propert
 	/// <param name="oldValue"></param>
 	/// <typeparam name="TValue"></typeparam>
 	/// <returns></returns>
-	private static bool ValuesDiffer<TValue>(IPropertyInfo propertyInfo, TValue newValue, TValue oldValue)
+	protected virtual bool ValuesDiffer<TValue>(IPropertyInfo propertyInfo, TValue newValue, TValue oldValue)
 	{
 		bool valuesDiffer;
 		if (oldValue == null)
@@ -679,14 +679,14 @@ private static bool ValuesDiffer<TValue>(IPropertyInfo propertyInfo, TValue newV
 		}
 		else
 		{
-			// use reference equals for objects that inherit from CSLA base class
+			// use reference equals for objects that inherit from base class
 			if (typeof(IBusinessObject).IsAssignableFrom(propertyInfo.Type))
 			{
 				valuesDiffer = !(ReferenceEquals(oldValue, newValue));
 			}
 			else
 			{
-				valuesDiffer = !(oldValue.Equals(newValue));
+				valuesDiffer = !EqualityComparer<TValue>.Default.Equals(newValue, oldValue);
 			}
 		}
 
diff --git a/Source/Euonia.Business/Core/EditableObject.cs b/Source/Euonia.Business/Core/EditableObject.cs
index 4bff769..af9a810 100644
--- a/Source/Euonia.Business/Core/EditableObject.cs
+++ b/Source/Euonia.Business/Core/EditableObject.cs
@@ -373,14 +373,20 @@ protected void SetProperty<TValue>(string propertyName, ref TValue field, TValue
 		if (field == null)
 		{
 			if (newValue != null)
+			{
 				doChange = true;
+			}
 		}
 		else
 		{
 			if (typeof(TValue) == typeof(string) && newValue == null)
+			{
 				newValue = TypeHelper.CoerceValue<TValue>(typeof(string), string.Empty);
-			if (!field.Equals(newValue))
+			}
+			if (ValuesDiffer(propertyInfo, newValue, field))
+			{
 				doChange = true;
+			}
 		}
 
 		if (doChange)
diff --git a/Source/Euonia.Business/Factory/BusinessObjectFactory.cs b/Source/Euonia.Business/Factory/BusinessObjectFactory.cs
index b7981b3..8fd09b8 100644
--- a/Source/Euonia.Business/Factory/BusinessObjectFactory.cs
+++ b/Source/Euonia.Business/Factory/BusinessObjectFactory.cs
@@ -131,11 +131,10 @@ public async Task<TTarget> SaveAsync<TTarget>(TTarget target, CancellationToken
 	}
 
 	/// <inheritdoc/>
-	public async Task<TTarget> ExecuteAsync<TTarget>(TTarget command, CancellationToken cancellationToken = default)
+	public async Task<TTarget> ExecuteAsync<TTarget>(TTarget target, CancellationToken cancellationToken = default)
 		where TTarget : ICommandObject
 	{
 		var method = ObjectReflector.FindFactoryMethod<TTarget, FactoryExecuteAttribute>(new object[] { cancellationToken });
-		var target = GetObjectInstance<TTarget>();
 
 		try
 		{
diff --git a/Source/Euonia.Business/Factory/IObjectFactory.cs b/Source/Euonia.Business/Factory/IObjectFactory.cs
index 612a118..16c797c 100644
--- a/Source/Euonia.Business/Factory/IObjectFactory.cs
+++ b/Source/Euonia.Business/Factory/IObjectFactory.cs
@@ -80,13 +80,13 @@ public interface IObjectFactory
 	/// Invoke the execute method of an exists command object of <typeparamref name="TTarget"/>.
 	/// </summary>
 	/// <typeparam name="TTarget">Type of the target object.</typeparam>
-	/// <param name="command"></param>
+	/// <param name="target"></param>
 	/// <param name="cancellationToken"></param>
 	/// <returns></returns>
 	/// <remarks>
 	/// The method should named as Execute, ExecuteAsync, FactoryExecute, FactoryExecuteAsync, or attributed use <see cref="FactoryExecuteAttribute"/>.
 	/// </remarks>
-	Task<TTarget> ExecuteAsync<TTarget>(TTarget command, CancellationToken cancellationToken = default)
+	Task<TTarget> ExecuteAsync<TTarget>(TTarget target, CancellationToken cancellationToken = default)
         where TTarget : ICommandObject;
 
     /// <summary>
diff --git a/project.props b/project.props
index 54d7d86..a7f93a1 100644
--- a/project.props
+++ b/project.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>8.1.19</Version>
+        <Version>8.1.20</Version>
         <Authors>damon</Authors>
         <Company>Nerosoft Ltd.</Company>
         <Product>Euonia</Product>