start module output
This commit is contained in:
@@ -28,11 +28,15 @@ namespace zero.Core.Api
|
||||
/// <summary>
|
||||
/// Get revision list for an entity
|
||||
/// </summary>
|
||||
public async Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 30, bool includeContent = false) where T : IZeroEntity
|
||||
public async Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 10, bool includeContent = false) where T : IZeroEntity
|
||||
{
|
||||
using IAsyncDocumentSession session = Raven.OpenAsyncSession();
|
||||
|
||||
List<T> items = await session.Advanced.Revisions.GetForAsync<T>(id, pageNumber - 1, pageSize);
|
||||
|
||||
List<T> continuedItems = await session.Advanced.Revisions.GetForAsync<T>(id, pageNumber, 1);
|
||||
bool hasMore = continuedItems.Count > 0;
|
||||
|
||||
List<Revision> revisions = new List<Revision>();
|
||||
|
||||
string[] userIds = items.Select(x => x.LastModifiedById).Distinct().ToArray();
|
||||
@@ -62,7 +66,7 @@ namespace zero.Core.Api
|
||||
revisions.Add(revision);
|
||||
}
|
||||
|
||||
return new ListResult<Revision>(revisions, revisions.Count, pageNumber, pageSize);
|
||||
return new ListResult<Revision>(revisions, hasMore ? revisions.Count + 1 : revisions.Count, pageNumber, pageSize);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,6 +76,6 @@ namespace zero.Core.Api
|
||||
/// <summary>
|
||||
/// Get revision list (without content JSON) for an entity
|
||||
/// </summary>
|
||||
Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 30, bool includeContent = false) where T : IZeroEntity;
|
||||
Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 10, bool includeContent = false) where T : IZeroEntity;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace zero.Core.Api
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public bool Verify(IZeroEntity entity, string token)
|
||||
public bool Verify(IZeroIdEntity entity, string token)
|
||||
{
|
||||
return Verify(entity?.Id, token);
|
||||
}
|
||||
@@ -53,7 +53,7 @@ namespace zero.Core.Api
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public string Get(IZeroEntity entity)
|
||||
public string Get(IZeroIdEntity entity)
|
||||
{
|
||||
return Get(entity?.Id);
|
||||
}
|
||||
@@ -90,7 +90,7 @@ namespace zero.Core.Api
|
||||
/// <summary>
|
||||
/// Verifies if the change token is valid for the entity
|
||||
/// </summary>
|
||||
bool Verify(IZeroEntity entity, string token);
|
||||
bool Verify(IZeroIdEntity entity, string token);
|
||||
|
||||
/// <summary>
|
||||
/// Verifies if the change token is valid for the entity
|
||||
@@ -100,7 +100,7 @@ namespace zero.Core.Api
|
||||
/// <summary>
|
||||
/// Get a new change token for the entity
|
||||
/// </summary>
|
||||
string Get(IZeroEntity entity);
|
||||
string Get(IZeroIdEntity entity);
|
||||
|
||||
/// <summary>
|
||||
/// Get a new change token for the entity
|
||||
|
||||
@@ -23,6 +23,8 @@ namespace zero.Core.Entities
|
||||
{
|
||||
TotalPages = 1;
|
||||
}
|
||||
|
||||
HasMore = TotalPages > Page;
|
||||
}
|
||||
|
||||
public ListResult(IList<T> items, long totalItems, long pageNumber, long pageSize) : this(totalItems, pageNumber, pageSize)
|
||||
@@ -46,6 +48,8 @@ namespace zero.Core.Entities
|
||||
|
||||
public long TotalItems { get; private set; }
|
||||
|
||||
public bool HasMore { get; private set; }
|
||||
|
||||
public IList<T> Items { get; set; }
|
||||
|
||||
public List<PagedResultStatistic> Statistics { get; set; } = new List<PagedResultStatistic>();
|
||||
|
||||
Reference in New Issue
Block a user