From 0bfd7b78b5f1599639e5cda9c6022195c0923a56 Mon Sep 17 00:00:00 2001 From: Fati Iseni Date: Sun, 22 Sep 2024 14:10:25 +0300 Subject: [PATCH] Renamed default pagination to Empty. --- .../QuerySpecification.EntityFrameworkCore.csproj | 4 ++-- .../RepositoryBase.cs | 7 +++---- src/QuerySpecification/Paging/Pagination.cs | 2 +- src/QuerySpecification/QuerySpecification.csproj | 4 ++-- tests/QuerySpecification.Tests/Paging/PaginationTests.cs | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/QuerySpecification.EntityFrameworkCore/QuerySpecification.EntityFrameworkCore.csproj b/src/QuerySpecification.EntityFrameworkCore/QuerySpecification.EntityFrameworkCore.csproj index 7c947de..613c95e 100644 --- a/src/QuerySpecification.EntityFrameworkCore/QuerySpecification.EntityFrameworkCore.csproj +++ b/src/QuerySpecification.EntityFrameworkCore/QuerySpecification.EntityFrameworkCore.csproj @@ -7,8 +7,8 @@ EntityFrameworkCore plugin to Pozitron.QuerySpecification containing EF evaluators. EntityFrameworkCore plugin to Pozitron.QuerySpecification containing EF evaluators. - 10.0.0 - pozitron query specification efcore + 10.1.0 + fiseni pozitron query specification efcore - Dropped support for old TFMs. Support only .NET 8. - Dropped support for old plugin packages. Support only EntityFrameworkCore 8. diff --git a/src/QuerySpecification.EntityFrameworkCore/RepositoryBase.cs b/src/QuerySpecification.EntityFrameworkCore/RepositoryBase.cs index 280cfdf..a622224 100644 --- a/src/QuerySpecification.EntityFrameworkCore/RepositoryBase.cs +++ b/src/QuerySpecification.EntityFrameworkCore/RepositoryBase.cs @@ -73,12 +73,12 @@ public virtual async Task SaveChangesAsync(CancellationToken cancellationTo public virtual async Task FirstAsync(Specification specification, CancellationToken cancellationToken = default) { var result = await ApplySpecification(specification).FirstOrDefaultAsync(cancellationToken); - return result is null ? throw new EntityNotFoundException(typeof(T).Name) : result; + return result ?? throw new EntityNotFoundException(typeof(T).Name); } public virtual async Task FirstAsync(Specification specification, CancellationToken cancellationToken = default) { var result = await ApplySpecification(specification).FirstOrDefaultAsync(cancellationToken); - return result is null ? throw new EntityNotFoundException(typeof(T).Name) : result; + return result ?? throw new EntityNotFoundException(typeof(T).Name); } public virtual async Task FirstOrDefaultAsync(Specification specification, CancellationToken cancellationToken = default) { @@ -145,7 +145,7 @@ public virtual async Task ProjectToFirstAsync(Specification var result = await projectedQuery.FirstOrDefaultAsync(cancellationToken); - return result is null ? throw new EntityNotFoundException(typeof(T).Name) : result; + return result ?? throw new EntityNotFoundException(typeof(T).Name); } public virtual async Task ProjectToFirstOrDefaultAsync(Specification specification, CancellationToken cancellationToken = default) { @@ -231,4 +231,3 @@ private ref struct SpecPaging(int skip, int take) public int Take = take; } } - diff --git a/src/QuerySpecification/Paging/Pagination.cs b/src/QuerySpecification/Paging/Pagination.cs index ff74fac..1067453 100644 --- a/src/QuerySpecification/Paging/Pagination.cs +++ b/src/QuerySpecification/Paging/Pagination.cs @@ -35,7 +35,7 @@ public Pagination(int totalItems, int totalPages, int pageSize, int page, int st HasNext = hasNext; } - public static Pagination Default { get; } = new Pagination(PaginationSettings.Default, 0, null, null); + public static Pagination Empty { get; } = new Pagination(PaginationSettings.Default, 0, null, null); public Pagination(int itemsCount, PagingFilter filter) : this(PaginationSettings.Default, itemsCount, filter.PageSize, filter.Page) diff --git a/src/QuerySpecification/QuerySpecification.csproj b/src/QuerySpecification/QuerySpecification.csproj index eda7940..d1d442e 100644 --- a/src/QuerySpecification/QuerySpecification.csproj +++ b/src/QuerySpecification/QuerySpecification.csproj @@ -7,8 +7,8 @@ Abstract package for building query specifications. Abstract package for building query specifications. - 10.0.0 - pozitron query specification + 10.1.0 + fiseni pozitron query specification - Dropped support for old TFMs. Support only .NET 8. - Dropped support for old plugin packages. Support only EntityFrameworkCore 8. diff --git a/tests/QuerySpecification.Tests/Paging/PaginationTests.cs b/tests/QuerySpecification.Tests/Paging/PaginationTests.cs index 293c56e..012df0b 100644 --- a/tests/QuerySpecification.Tests/Paging/PaginationTests.cs +++ b/tests/QuerySpecification.Tests/Paging/PaginationTests.cs @@ -76,9 +76,9 @@ public void CalculatesValues_GivenJsonConstructor(int totalItems, int totalPages } [Fact] - public void DefaultPagination_SetsDefaultValues() + public void EmptyPagination_SetsDefaultValues() { - var pagination = Pagination.Default; + var pagination = Pagination.Empty; var pageSize = PaginationSettings.Default.DefaultPageSize; AssertPaginationValues(pagination, new Expected(0, 1, pageSize, 1, 0, 0, false, false, pageSize, 0)); }