From b4d8484f4ce875637d0a6f7d985f5a782cf30c9d Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Mon, 1 Jun 2026 15:49:03 +0330
Subject: [PATCH] apply fix on GraphQL ...

---
 Helpers/XDataServiceHelper.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Helpers/XDataServiceHelper.cs b/Helpers/XDataServiceHelper.cs
index 9e86b3a..423e8b0 100644
--- a/Helpers/XDataServiceHelper.cs
+++ b/Helpers/XDataServiceHelper.cs
@@ -1476,7 +1476,7 @@ namespace xDataService.Helpers
             // Register Graph Type ...
             source.Add(
                 new ServiceDescriptor(
-                    lifetime: ServiceLifetime.Singleton,
+                    lifetime: lifetime, // ServiceLifetime.Singleton,
                     serviceType: repositoryDescriptor.GraphType,
                     implementationType: repositoryDescriptor.GraphType
                 )
@@ -1486,7 +1486,7 @@ namespace xDataService.Helpers
             // Register Graph Events ...
             source.Add(
                 new ServiceDescriptor(
-                    lifetime: ServiceLifetime.Singleton,
+                    lifetime: lifetime, // ServiceLifetime.Singleton,
                     serviceType: typeof(XBaseGraphQLEventType<TEntity, TKey, TGraph>),
                     implementationType: typeof(XBaseGraphQLEventType<TEntity, TKey, TGraph>)
                 )
@@ -1516,14 +1516,14 @@ namespace xDataService.Helpers
             // Register Graph Schema ...
             source.Add(
                 new ServiceDescriptor(
+                    lifetime: lifetime,
                     serviceType: repositoryDescriptor.GraphSchema,
-                    implementationType: repositoryDescriptor.GraphSchema,
-                    lifetime: lifetime
+                    implementationType: repositoryDescriptor.GraphSchema
                 )
             );
 
             //
-            source.AddSingleton<IDocumentExecuter, DocumentExecuter>();
+            source.AddScoped<IDocumentExecuter, DocumentExecuter>();
 
             //
             // Register Graph Type Schema ...
@@ -1544,9 +1544,12 @@ namespace xDataService.Helpers
                     .AddNewtonsoftJson(deserializerSettings => { }, serializerSettings => { })
                     .AddWebSockets()
                     .AddDataLoader()
-                    .AddGraphTypes();
+                    .AddGraphTypes(lifetime);
             }
-            builder.AddGraphTypes(repositoryDescriptor.GraphSchema);
+            builder.AddGraphTypes(
+                serviceLifetime: lifetime,
+                typeFromAssembly: repositoryDescriptor.GraphSchema
+            );
         }
         #endregion
     }