Skip to content

Commit 740c4a9

Browse files
committed
Refactored repository and fixed issue in InMemoryProvider
1 parent 49dcf1b commit 740c4a9

File tree

4 files changed

+11
-20
lines changed

4 files changed

+11
-20
lines changed

LinkDotNet.Blog.Infrastructure/Persistence/InMemory/Repository.cs

+4-7
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,12 @@ public Task<IPagedList<TEntity>> GetAllAsync(
3434

3535
if (orderBy != null)
3636
{
37-
if (descending)
38-
{
39-
return Task.FromResult(result.OrderByDescending(orderBy.Compile()).ToPagedList(page, pageSize));
40-
}
41-
42-
return Task.FromResult(result.OrderBy(orderBy.Compile()).ToPagedList(page, pageSize));
37+
result = descending
38+
? result.OrderByDescending(orderBy.Compile())
39+
: result.OrderBy(orderBy.Compile());
4340
}
4441

45-
return Task.FromResult(entities.ToPagedList(page, pageSize));
42+
return Task.FromResult(result.ToPagedList(page, pageSize));
4643
}
4744

4845
public Task StoreAsync(TEntity entity)

LinkDotNet.Blog.Infrastructure/Persistence/RavenDb/Repository.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@ public async Task<IPagedList<TEntity>> GetAllAsync(
4141

4242
if (orderBy != null)
4343
{
44-
if (descending)
45-
{
46-
return await query.OrderByDescending(orderBy).ToPagedListAsync(page, pageSize);
47-
}
48-
49-
return await query.OrderBy(orderBy).ToPagedListAsync(page, pageSize);
44+
query = descending
45+
? query.OrderByDescending(orderBy)
46+
: query.OrderBy(orderBy);
5047
}
5148

5249
return await query.ToPagedListAsync(page, pageSize);

LinkDotNet.Blog.Infrastructure/Persistence/Sql/Repository.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,9 @@ public async Task<IPagedList<TEntity>> GetAllAsync(
3939

4040
if (orderBy != null)
4141
{
42-
if (descending)
43-
{
44-
return await entity.OrderByDescending(orderBy).ToPagedListAsync(page, pageSize);
45-
}
46-
47-
return await entity.OrderBy(orderBy).ToPagedListAsync(page, pageSize);
42+
entity = descending
43+
? entity.OrderByDescending(orderBy)
44+
: entity.OrderBy(orderBy);
4845
}
4946

5047
return await entity.ToPagedListAsync(page, pageSize);

LinkDotNet.Blog.Web/Shared/AccessControl.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<li><h6 class="dropdown-header">Others</h6></li>
1717
<li><a class="dropdown-item" href="Sitemap">Sitemap</a></li>
1818
<li><hr class="dropdown-divider"></li>
19-
<li><a class="dropdown-item" href="https://github.com/linkdotnet/Blog/releases">Version 2.5</a></li>
19+
<li><a class="dropdown-item" href="https://github.com/linkdotnet/Blog/releases">Version 2.6</a></li>
2020
</ul>
2121
</li>
2222
<li class="nav-item"><a class="nav-link" href="logout">Log out</a></li>

0 commit comments

Comments
 (0)