Merge pull request #79 from Hayotbahrom/dev

pagination logic optimized and UserChannelController renamed to UserChannelsController #78
dotnetgoo · Oct 25, 2023 · 9e14258 · 9e14258
2 parents f547e27 + df32920
commit 9e14258
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/src/Shamsheer.Messenger.Api/Controllers/UserChannels/UserChannelController.cs b/src/Shamsheer.Messenger.Api/Controllers/UserChannels/UserChannelController.cs
@@ -4,11 +4,11 @@
 
 namespace Shamsheer.Messenger.Api.Controllers.UserChannels;
 
-public class UserChannelController : BaseController
+public class UserChannelsController : BaseController
 {
     private readonly IUserChannelService _userChannelService;
 
-    public UserChannelController(IUserChannelService userChannelService)
+    public UserChannelsController(IUserChannelService userChannelService)
     {
         _userChannelService = userChannelService;
     }

diff --git a/src/Shamsheer.Messenger.Api/appsettings.json b/src/Shamsheer.Messenger.Api/appsettings.json
@@ -7,6 +7,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Server=localhost; Port=5432; Database=ShamsheerDb; User Id=postgres; Password=Dilafruz10;"
+    "DefaultConnection": "Server=localhost; Port=5432; Database=ShamsheerDb; User Id=postgres; Password=2002;"
   }
 }
diff --git a/...nger.Api/wwwroot/Media/Files/deer_grass_leaves_autumn_trees_59721_1920x1080.jpg b/...nger.Api/wwwroot/Media/Files/deer_grass_leaves_autumn_trees_59721_1920x1080.jpg
diff --git a/src/Shamsheer.Service/Extensions/CollectionExtensions.cs b/src/Shamsheer.Service/Extensions/CollectionExtensions.cs
@@ -21,13 +21,7 @@ public static IQueryable<TEntity> ToPagedList<TEntity>(this IQueryable<TEntity>
                 throw new ArgumentOutOfRangeException(nameof(@params.PageSize), "The page size must be greater than or equal to 1.");
             }
 
-            // Skip the specified number of pages.
-            source = source.Skip((@params.PageIndex - 1) * @params.PageSize);
-
-            // Take the specified number of items from the sequence.
-            source = source.Take(@params.PageSize);
-
-            return source;
+            return source.Take((@params.PageSize * (@params.PageIndex - 1))..(@params.PageSize * (@params.PageIndex - 1) + @params.PageSize));
         }
 
         public static IEnumerable<TEntity> ToPagedList<TEntity>(this IEnumerable<TEntity> source, PaginationParams @params)
@@ -42,13 +36,7 @@ public static IEnumerable<TEntity> ToPagedList<TEntity>(this IEnumerable<TEntity
                 throw new ArgumentOutOfRangeException(nameof(@params.PageSize), "The page size must be greater than or equal to 1.");
             }
 
-            // Skip the specified number of pages.
-            source = source.Skip((@params.PageIndex - 1) * @params.PageSize);
-
-            // Take the specified number of items from the sequence.
-            source = source.Take(@params.PageSize);
-
-            return source;
+            return source.Take((@params.PageSize * (@params.PageIndex - 1))..(@params.PageSize * (@params.PageIndex - 1) + @params.PageSize));
         }
 
     }