From 5824eda6cbf25a66e84a103b26aa4bdcdf6ba8ea Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Thu, 30 Jul 2026 14:27:45 +0330
Subject: [PATCH] refactor and add using constants instead of hard coded
 strings ...

---
 Constants/XAiModelsConstants.cs |  6 ++++++
 DI/XDIHelperExtension.cs        | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Constants/XAiModelsConstants.cs b/Constants/XAiModelsConstants.cs
index 6caa072..d5b880e 100644
--- a/Constants/XAiModelsConstants.cs
+++ b/Constants/XAiModelsConstants.cs
@@ -38,5 +38,11 @@ namespace xAiModels.Constants
         public const string XAiProjectTitleIdentifier = "AiPrjT";
         public const string XAiProjectDescriptionIdentifier = "AiPrjD";
         public const string XAiConversationTitleIdentifier = "AiCnvrT";
+
+        //
+        // EF Repositories Helper Extensions ...
+        public const string GetXAiMessageEFRepositoryDescriptor = "GetXAiMessageEFRepositoryDescriptor";
+        public const string GetXAiProjectEFRepositoryDescriptor = "GetXAiProjectEFRepositoryDescriptor";
+        public const string GetXAiConversationEFRepositoryDescriptor = "GetXAiConversationEFRepositoryDescriptor";        
     }
 }
\ No newline at end of file
diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs
index 7bb9f6b..6919e24 100644
--- a/DI/XDIHelperExtension.cs
+++ b/DI/XDIHelperExtension.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using xAiModels.Providers.Dtos;
@@ -84,11 +83,6 @@ namespace xAiModels.DI
             //
             var pushHelper = new XPushServiceHelper();
 
-            //
-            // XAiConversation ...
-            pushHelper.AddHub<XAiConversationDtoHub>(XAiModelsConstants.XAiConversationDtoHub);
-            pushHelper.AddHub<XAiConversationEntityHub>(XAiModelsConstants.XAiConversationEntityHub);
-
             //
             // XAiMessage ...
             pushHelper.AddHub<XAiMessageDtoHub>(XAiModelsConstants.XAiMessageDtoHub);
@@ -99,6 +93,11 @@ namespace xAiModels.DI
             pushHelper.AddHub<XAiProjectDtoHub>(XAiModelsConstants.XAiProjectDtoHub);
             pushHelper.AddHub<XAiProjectEntityHub>(XAiModelsConstants.XAiProjectEntityHub);
 
+            //
+            // XAiConversation ...
+            pushHelper.AddHub<XAiConversationDtoHub>(XAiModelsConstants.XAiConversationDtoHub);
+            pushHelper.AddHub<XAiConversationEntityHub>(XAiModelsConstants.XAiConversationEntityHub);
+
             //
             app.UseXPushService(pushHelper);
             #endregion
@@ -325,27 +324,27 @@ namespace xAiModels.DI
                     // XAiMessage ...
                     aiMessageDescriptor = typeof(XAiModelsHelper)
                         .InvokeGenericMethod<XRepositoryDescriptor>(
-                            methodName: "GetXAiMessageEFRepositoryDescriptor",
+                            args: null,
                             runtimeType: contextType,
-                            args: null
+                            methodName: XAiModelsConstants.GetXAiMessageEFRepositoryDescriptor
                     );
 
                     //
                     // XAiProject ...
                     aiProjectDescriptor = typeof(XAiModelsHelper)
                         .InvokeGenericMethod<XRepositoryDescriptor>(
-                            methodName: "GetXAiProjectEFRepositoryDescriptor",
+                            args: null,
                             runtimeType: contextType,
-                            args: null
+                            methodName: XAiModelsConstants.GetXAiProjectEFRepositoryDescriptor
                     );
 
                     //
                     // XAiConversation ...
                     aiConversationDescriptor = typeof(XAiModelsHelper)
                         .InvokeGenericMethod<XRepositoryDescriptor>(
-                            methodName: "GetXAiConversationEFRepositoryDescriptor",
+                            args: null,
                             runtimeType: contextType,
-                            args: null
+                            methodName: XAiModelsConstants.GetXAiConversationEFRepositoryDescriptor
                     );
                     break;