From 937f6d13271cf90ba4ff70b21479b48d0de42c12 Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Mon, 21 Jul 2025 00:39:16 +0330
Subject: [PATCH] apply some fix on XBase models ...

---
 Dtos/XBaseIndexedDto.cs        | 7 ++++---
 Extensions/XModelExtensions.cs | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dtos/XBaseIndexedDto.cs b/Dtos/XBaseIndexedDto.cs
index a815522..9508aa3 100644
--- a/Dtos/XBaseIndexedDto.cs
+++ b/Dtos/XBaseIndexedDto.cs
@@ -2,11 +2,12 @@ using xModels.Base;
 
 namespace xModels.Dtos
 {
-    public class XBaseIndexedDto<T, TIndex> : XBaseDto
+    public class XBaseIndexedDto<T, TKey, TIndex> : XBaseDto
     {
-        public TIndex Index { get; set; }
         public T Item { get; set; }
+        public TKey Key { get; set; }
+        public TIndex Index { get; set; }
     }
 
-    public class XBaseIntIndexedDto<T> : XBaseIndexedDto<T, int> { }
+    public class XBaseIntIndexedDto<T> : XBaseIndexedDto<T, string, int> { }
 }
\ No newline at end of file
diff --git a/Extensions/XModelExtensions.cs b/Extensions/XModelExtensions.cs
index 6a1ef15..76ee455 100644
--- a/Extensions/XModelExtensions.cs
+++ b/Extensions/XModelExtensions.cs
@@ -34,8 +34,8 @@ namespace xModels.Extensions
             return isSame;
         }
 
-        public static IEnumerable<T> AsEnumerable<T, TIndex>(
-            this IEnumerable<XBaseIndexedDto<T, TIndex>> source
+        public static IEnumerable<T> AsEnumerable<T, TKey, TIndex>(
+            this IEnumerable<XBaseIndexedDto<T, TKey, TIndex>> source
         )
         {
             return source.Select(i => i.Item);