GetEntityType throws EntityTypeNotFoundException instead of ArgumentException

Author: PawelGerr

src/Thinktecture.EntityFrameworkCore.Relational/EntityFrameworkCore/EntityTypeNotFoundException.cs

@@ -0,0 +1,48 @@
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+namespace Thinktecture.EntityFrameworkCore;
+
+/// <summary>
+/// Entity with provided name and/or type is not part of current <see cref="DbContext"/>.
+/// </summary>
+public class EntityTypeNotFoundException : ArgumentException
+{
+   /// <summary>
+   /// Initializes new instance of <see cref="EntityTypeNotFoundException"/>.
+   /// </summary>
+   /// <param name="entityName">Entity name not found in the model of current <see cref="DbContext"/>.</param>
+   /// <param name="paramName">The name of the parameter.</param>
+   public EntityTypeNotFoundException(
+      string entityName,
+      [CallerArgumentExpression("entityName")] string? paramName = null)
+      : base($"The provided name '{entityName}' is not part of the provided Entity Framework model.", paramName)
+   {
+   }
+
+   /// <summary>
+   /// Initializes new instance of <see cref="EntityTypeNotFoundException"/>.
+   /// </summary>
+   /// <param name="entityType">The type of the entity not found in the model of current <see cref="DbContext"/>.</param>
+   /// <param name="paramName">The name of the parameter.</param>
+   public EntityTypeNotFoundException(
+      Type entityType,
+      [CallerArgumentExpression("entityType")] string? paramName = null)
+      : base($"The provided type '{entityType.ShortDisplayName()}' is not part of the provided Entity Framework model.", paramName)
+   {
+   }
+
+   /// <summary>
+   /// Initializes new instance of <see cref="EntityTypeNotFoundException"/>.
+   /// </summary>
+   /// <param name="entityName">Entity name not found in the model of current <see cref="DbContext"/>.</param>
+   /// <param name="entityType">The type of the entity not found in the model of current <see cref="DbContext"/>.</param>
+   /// <param name="entityNameParamName">The name of the parameter.</param>
+   public EntityTypeNotFoundException(
+      string entityName,
+      Type entityType,
+      [CallerArgumentExpression("entityName")] string? entityNameParamName = null)
+      : base($"The provided name '{entityName}' and the type '{entityType.ShortDisplayName()}' were not part of the provided Entity Framework model.", entityNameParamName)
+   {
+   }
+}

src/Thinktecture.EntityFrameworkCore.Relational/Extensions/RelationalModelExtensions.cs

@@ -1,7 +1,6 @@
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
+using Thinktecture.EntityFrameworkCore;
 
-// ReSharper disable once CheckNamespace
 namespace Thinktecture;
 
 /// <summary>
@@ -29,7 +28,7 @@ public static IEntityType GetEntityType(this IModel model, Type type)
       var entityType = model.FindEntityType(type);
 
       if (entityType == null)
-         throw new ArgumentException($"The provided type '{type.ShortDisplayName()}' is not part of the provided Entity Framework model.", nameof(type));
+         throw new EntityTypeNotFoundException(type);
 
       return entityType;
    }
@@ -61,8 +60,8 @@ public static IEntityType GetEntityType(this IModel model, string name, Type? fa
          return entityType;
 
       if (fallbackEntityType is not null)
-         throw new ArgumentException($"The provided name '{name}' and the type '{fallbackEntityType.ShortDisplayName()}' were not part of the provided Entity Framework model.", nameof(name));
+         throw new EntityTypeNotFoundException(name, fallbackEntityType);
 
-      throw new ArgumentException($"The provided name '{name}' is not part of the provided Entity Framework model.", nameof(name));
+      throw new EntityTypeNotFoundException(name);
    }
 }