Refactored repository and fixed issue in InMemoryProvider

linkdotnet · Nov 18, 2021 · 740c4a9 · 740c4a9
1 parent 49dcf1b
commit 740c4a9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/LinkDotNet.Blog.Infrastructure/Persistence/InMemory/Repository.cs b/LinkDotNet.Blog.Infrastructure/Persistence/InMemory/Repository.cs
@@ -34,15 +34,12 @@ public Task<IPagedList<TEntity>> GetAllAsync(
 
         if (orderBy != null)
         {
-            if (descending)
-            {
-                return Task.FromResult(result.OrderByDescending(orderBy.Compile()).ToPagedList(page, pageSize));
-            }
-
-            return Task.FromResult(result.OrderBy(orderBy.Compile()).ToPagedList(page, pageSize));
+            result = descending
+                ? result.OrderByDescending(orderBy.Compile())
+                : result.OrderBy(orderBy.Compile());
         }
 
-        return Task.FromResult(entities.ToPagedList(page, pageSize));
+        return Task.FromResult(result.ToPagedList(page, pageSize));
     }
 
     public Task StoreAsync(TEntity entity)

diff --git a/LinkDotNet.Blog.Infrastructure/Persistence/RavenDb/Repository.cs b/LinkDotNet.Blog.Infrastructure/Persistence/RavenDb/Repository.cs
@@ -41,12 +41,9 @@ public async Task<IPagedList<TEntity>> GetAllAsync(
 
         if (orderBy != null)
         {
-            if (descending)
-            {
-                return await query.OrderByDescending(orderBy).ToPagedListAsync(page, pageSize);
-            }
-
-            return await query.OrderBy(orderBy).ToPagedListAsync(page, pageSize);
+            query = descending
+                ? query.OrderByDescending(orderBy)
+                : query.OrderBy(orderBy);
         }
 
         return await query.ToPagedListAsync(page, pageSize);

diff --git a/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Repository.cs b/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Repository.cs
@@ -39,12 +39,9 @@ public async Task<IPagedList<TEntity>> GetAllAsync(
 
         if (orderBy != null)
         {
-            if (descending)
-            {
-                return await entity.OrderByDescending(orderBy).ToPagedListAsync(page, pageSize);
-            }
-
-            return await entity.OrderBy(orderBy).ToPagedListAsync(page, pageSize);
+            entity = descending
+                ? entity.OrderByDescending(orderBy)
+                : entity.OrderBy(orderBy);
         }
 
         return await entity.ToPagedListAsync(page, pageSize);

diff --git a/LinkDotNet.Blog.Web/Shared/AccessControl.razor b/LinkDotNet.Blog.Web/Shared/AccessControl.razor
@@ -16,7 +16,7 @@
                 <li><h6 class="dropdown-header">Others</h6></li>
                 <li><a class="dropdown-item" href="Sitemap">Sitemap</a></li>
                 <li><hr class="dropdown-divider"></li>
-                <li><a class="dropdown-item" href="https://github.com/linkdotnet/Blog/releases">Version 2.5</a></li>
+                <li><a class="dropdown-item" href="https://github.com/linkdotnet/Blog/releases">Version 2.6</a></li>
             </ul>
         </li>
         <li class="nav-item"><a class="nav-link" href="logout">Log out</a></li>