Add more Query to SingleEntityNotFoundException and FirstEntityNotFoundException

Author: SimonCropp

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU5104;CS1573;CS9107;NU1608;NU1109</NoWarn>
-    <Version>32.2.0</Version>
+    <Version>32.3.0</Version>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>

src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_First.cs

@@ -217,7 +217,7 @@ await fieldContext.Filters.ShouldInclude(context.UserContext, fieldContext.DbCon
                     }
                 }
 
-                return ReturnNullable();
+                return ReturnNullable(query);
             })
         };
 
@@ -228,7 +228,7 @@ await fieldContext.Filters.ShouldInclude(context.UserContext, fieldContext.DbCon
 
         return type;
 
-        TReturn? ReturnNullable() =>
-            nullable ? null : throw new FirstEntityNotFoundException();
+        TReturn? ReturnNullable(IQueryable<TReturn>? query = null) =>
+            nullable ? null : throw new FirstEntityNotFoundException(query?.ToQueryString());
     }
 }

src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_Single.cs

@@ -218,7 +218,7 @@ await fieldContext.Filters.ShouldInclude(context.UserContext, fieldContext.DbCon
                         }
                     }
 
-                    return ReturnNullable();
+                    return ReturnNullable(query);
                 })
         };
 
@@ -229,7 +229,7 @@ await fieldContext.Filters.ShouldInclude(context.UserContext, fieldContext.DbCon
 
         return type;
 
-        TReturn? ReturnNullable() =>
-            nullable ? null : throw new SingleEntityNotFoundException();
+        TReturn? ReturnNullable(IQueryable<TReturn>? query = null) =>
+            nullable ? null : throw new SingleEntityNotFoundException(query?.ToQueryString());
     }
 }

src/GraphQL.EntityFramework/GraphApi/FirstEntityNotFoundException.cs

@@ -0,0 +1,24 @@
+namespace GraphQL.EntityFramework;
+
+public class FirstEntityNotFoundException(string? query = null) :
+    Exception
+{
+    public override string Message
+    {
+        get
+        {
+            if (Query == null)
+            {
+                return "Not found";
+            }
+
+            return $"""
+                    Not found.
+                    Query:
+                    {Query}
+                    """;
+        }
+    }
+
+    public string? Query { get; } = query;
+}

src/GraphQL.EntityFramework/GraphApi/SingleEntityNotFoundException.cs

@@ -1,12 +1,24 @@
 namespace GraphQL.EntityFramework;
 
-public class SingleEntityNotFoundException :
+public class SingleEntityNotFoundException(string? query = null) :
     Exception
 {
-    public override string Message => "Not found";
-}
-public class FirstEntityNotFoundException :
-    Exception
-{
-    public override string Message => "Not found";
+    public override string Message
+    {
+        get
+        {
+            if (Query == null)
+            {
+                return "Not found";
+            }
+
+            return $"""
+                    Not found.
+                    Query:
+                    {Query}
+                    """;
+        }
+    }
+
+    public string? Query { get; } = query;
 }

src/SampleWeb.Tests/GraphQlControllerTests.Single_not_found.verified.txt

@@ -1,4 +1,13 @@
 {
   Type: SingleEntityNotFoundException,
-  Message: Not found
+  Message:
+Not found.
+Query:
+SELECT [c].[Id], [c].[Content]
+FROM [Companies] AS [c]
+WHERE [c].[Id] = 99,
+  Query:
+SELECT [c].[Id], [c].[Content]
+FROM [Companies] AS [c]
+WHERE [c].[Id] = 99
 }

src/Tests/IntegrationTests/IntegrationTests.First_NotFound.verified.txt

@@ -1,7 +1,16 @@
 {
   target: {
     Type: FirstEntityNotFoundException,
-    Message: Not found
+    Message:
+Not found.
+Query:
+SELECT [p].[Id], [p].[Property]
+FROM [ParentEntities] AS [p]
+WHERE [p].[Id] = '00000000-0000-0000-0000-000000000001',
+    Query:
+SELECT [p].[Id], [p].[Property]
+FROM [ParentEntities] AS [p]
+WHERE [p].[Id] = '00000000-0000-0000-0000-000000000001'
   },
   sql: {
     Text:

src/Tests/IntegrationTests/IntegrationTests.Single_NotFound.verified.txt

@@ -1,7 +1,16 @@
 {
   target: {
     Type: SingleEntityNotFoundException,
-    Message: Not found
+    Message:
+Not found.
+Query:
+SELECT [p].[Id], [p].[Property]
+FROM [ParentEntities] AS [p]
+WHERE [p].[Id] = '00000000-0000-0000-0000-000000000001',
+    Query:
+SELECT [p].[Id], [p].[Property]
+FROM [ParentEntities] AS [p]
+WHERE [p].[Id] = '00000000-0000-0000-0000-000000000001'
   },
   sql: {
     Text: