Merge pull request #24 from johelvisguzman/hotfix/issue22

Add check to throw an exception if trying to get an entity with an invalid key value type

Author: johelvisguzman

src/DotNetToolkit.Repository.InMemory/InMemoryRepositoryBase.cs

@@ -229,10 +229,6 @@ protected override IQueryable<TEntity> GetQuery(IFetchStrategy<TEntity> fetchStr
         /// </summary>
         protected override TEntity GetEntity(TKey key, IFetchStrategy<TEntity> fetchStrategy)
         {
-            var propertyInfo = GetPrimaryKeyPropertyInfo();
-            if (propertyInfo.PropertyType != key.GetType())
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.EntityKeyValueTypeMismatch, key.GetType(), propertyInfo.PropertyType));
-
             InMemoryCache<TEntity, TKey>.Instance
                 .GetContext(_name)
                 .TryGetValue(key, out EntitySet<TEntity, TKey> entitySet);

src/DotNetToolkit.Repository.InMemory/Properties/Resources.Designer.cs

@@ -127,9 +127,6 @@
   <data name="EntityKeyValueTypeInvalid" xml:space="preserve">
     <value>The instance of entity type '{0}' cannot be added to the in-memory store because the key type '{1}' is an invalid primary key property type.</value>
   </data>
-  <data name="EntityKeyValueTypeMismatch" xml:space="preserve">
-    <value>The key value was of type '{0}', which does not match the property type of '{1}'.</value>
-  </data>
   <data name="EntityNotFoundInStore" xml:space="preserve">
     <value>Attempted to update or delete an entity that does not exist in the in-memory store.</value>
   </data>

src/DotNetToolkit.Repository.InMemory/Properties/Resources.resx

@@ -123,6 +123,9 @@
   <data name="EntityKeyValueTypeInvalid" xml:space="preserve">
     <value>The instance of entity type '{0}' cannot be added to the in-memory store because the key type '{1}' is an invalid primary key property type.</value>
   </data>
+  <data name="EntityKeyValueTypeMismatch" xml:space="preserve">
+    <value>The key value was of type '{0}', which does not match the property type of '{1}'.</value>
+  </data>
   <data name="EntityRequiresPrimaryKey" xml:space="preserve">
     <value>The instance of entity type '{0}' requires a primary key to be defined.</value>
   </data>

src/DotNetToolkit.Repository/Properties/Resources.Designer.cs

@@ -1,10 +1,12 @@
 namespace DotNetToolkit.Repository
 {
     using FetchStrategies;
+    using Properties;
     using Queries;
     using Specifications;
     using System;
     using System.Collections.Generic;
+    using System.Globalization;
     using System.Linq.Expressions;
     using System.Threading;
     using System.Threading.Tasks;
@@ -214,7 +216,7 @@ public abstract class RepositoryAsyncBase<TEntity, TKey> : RepositoryBase<TEntit
 
             var entity = await GetAsync(key, cancellationToken);
             if (entity == null)
-                throw new InvalidOperationException($"No entity found in the repository with the '{key}' key.");
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.EntityKeyNotFound, key));
 
             DeleteItem(entity);
             await SaveChangesAsync(cancellationToken);

src/DotNetToolkit.Repository/Properties/Resources.resx

@@ -246,6 +246,16 @@ protected virtual TKey GeneratePrimaryKey()
             throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.EntityKeyValueTypeInvalid, typeof(TEntity), propertyType));
         }
 
+        /// <summary>
+        /// Throws if the entity key value type does not match the type of the property defined.
+        /// </summary>
+        protected void ThrowIfEntityKeyValueTypeMismatch()
+        {
+            var propertyInfo = GetPrimaryKeyPropertyInfo();
+            if (propertyInfo.PropertyType != typeof(TKey))
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.EntityKeyValueTypeMismatch, typeof(TKey), propertyInfo.PropertyType));
+        }
+
         #endregion
 
         #region Implementation of ICanAggregate<TEntity>
@@ -424,6 +434,8 @@ public TEntity Get(TKey key)
             if (key == null)
                 throw new ArgumentNullException(nameof(key));
 
+            ThrowIfEntityKeyValueTypeMismatch();
+
             return GetEntity(key);
         }
 
@@ -438,6 +450,8 @@ public TEntity Get(TKey key, IFetchStrategy<TEntity> fetchStrategy)
             if (key == null)
                 throw new ArgumentNullException(nameof(key));
 
+            ThrowIfEntityKeyValueTypeMismatch();
+
             return GetEntity(key, fetchStrategy);
         }
 
@@ -455,6 +469,8 @@ public TResult Get<TResult>(TKey key, Expression<Func<TEntity, TResult>> selecto
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));
 
+            ThrowIfEntityKeyValueTypeMismatch();
+
             return Get(key, selector, (IFetchStrategy<TEntity>)null);
         }
 
@@ -473,6 +489,8 @@ public TResult Get<TResult>(TKey key, Expression<Func<TEntity, TResult>> selecto
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));
 
+            ThrowIfEntityKeyValueTypeMismatch();
+
             var result = GetEntity(key, fetchStrategy);
             var selectFunc = selector.Compile();
             var selectedResult = result == null