claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2026-07-08 17:57:08 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Add pagination support for document retrieval by letter and year

Browse Source 
- Introduced CountRequestBuilder for counting documents by letter and year.
- Updated WithCItemRequestBuilder and WithYearItemRequestBuilder to include Count property.
- Modified DocumentsRequestBuilder to support pagination with skip and take query parameters.
- Enhanced DocumentsController to handle pagination in GetDocumentsByLetterAsync and GetDocumentsByYearAsync methods.
- Updated Search.razor and Search.razor.cs to implement infinite scrolling and display total document counts.
- Refactored DocumentsService to support pagination and counting for document retrieval methods.
This commit is contained in:
Natalia Portillo
2026-05-09 13:43:23 +01:00
parent 6970447be8
commit b3f08ab47b
10 changed files with 564 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
Marechai.ApiClient/Documents/ByLetter/Item/Count/CountRequestBuilder.cs Normal file
View File

@@ -0,0 +1,91 @@
// <auto-generated/>
#pragma warning disable CS0618
using Marechai.ApiClient.Models;
using Microsoft.Kiota.Abstractions.Extensions;
using Microsoft.Kiota.Abstractions.Serialization;
using Microsoft.Kiota.Abstractions;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System;
namespace Marechai.ApiClient.Documents.ByLetter.Item.Count
{
/// <summary>
/// Builds and executes requests for operations under \documents\by-letter\{c}\count
/// </summary>
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class CountRequestBuilder : BaseRequestBuilder
{
/// <summary>
/// Instantiates a new <see cref="global::Marechai.ApiClient.Documents.ByLetter.Item.Count.CountRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="pathParameters">Path parameters for the request</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public CountRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-letter/{c}/count", pathParameters)
{
}
/// <summary>
/// Instantiates a new <see cref="global::Marechai.ApiClient.Documents.ByLetter.Item.Count.CountRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public CountRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-letter/{c}/count", rawUrl)
{
}
/// <returns>A <see cref="int"/></returns>
/// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
/// <exception cref="global::Marechai.ApiClient.Models.ProblemDetails">When receiving a 400 status code</exception>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
{
#nullable restore
#else
public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
{
#endif
var requestInfo = ToGetRequestInformation(requestConfiguration);
var errorMapping = new Dictionary<string, ParsableFactory<IParsable>>
{
{ "400", global::Marechai.ApiClient.Models.ProblemDetails.CreateFromDiscriminatorValue },
};
return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
}
/// <returns>A <see cref="RequestInformation"/></returns>
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default)
{
#nullable restore
#else
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default)
{
#endif
var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
requestInfo.Configure(requestConfiguration);
requestInfo.Headers.TryAdd("Accept", "text/plain;q=0.9");
return requestInfo;
}
/// <summary>
/// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
/// </summary>
/// <returns>A <see cref="global::Marechai.ApiClient.Documents.ByLetter.Item.Count.CountRequestBuilder"/></returns>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
public global::Marechai.ApiClient.Documents.ByLetter.Item.Count.CountRequestBuilder WithUrl(string rawUrl)
{
return new global::Marechai.ApiClient.Documents.ByLetter.Item.Count.CountRequestBuilder(rawUrl, RequestAdapter);
}
/// <summary>
/// Configuration for the request such as headers, query parameters, and middleware options.
/// </summary>
[Obsolete("This class is deprecated. Please use the generic RequestConfiguration class generated by the generator.")]
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class CountRequestBuilderGetRequestConfiguration : RequestConfiguration<DefaultQueryParameters>
{
}
}
}
#pragma warning restore CS0618

30
Marechai.ApiClient/Documents/ByLetter/Item/WithCItemRequestBuilder.cs
View File

@@ -1,5 +1,6 @@
// <auto-generated/>
#pragma warning disable CS0618
using Marechai.ApiClient.Documents.ByLetter.Item.Count;
using Marechai.ApiClient.Models;
using Microsoft.Kiota.Abstractions.Extensions;
using Microsoft.Kiota.Abstractions.Serialization;
@@ -17,12 +18,17 @@ namespace Marechai.ApiClient.Documents.ByLetter.Item
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class WithCItemRequestBuilder : BaseRequestBuilder
{
/// <summary>The count property</summary>
public global::Marechai.ApiClient.Documents.ByLetter.Item.Count.CountRequestBuilder Count
{
get => new global::Marechai.ApiClient.Documents.ByLetter.Item.Count.CountRequestBuilder(PathParameters, RequestAdapter);
}
/// <summary>
/// Instantiates a new <see cref="global::Marechai.ApiClient.Documents.ByLetter.Item.WithCItemRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="pathParameters">Path parameters for the request</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public WithCItemRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-letter/{c}", pathParameters)
public WithCItemRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-letter/{c}{?skip*,take*}", pathParameters)
{
}
/// <summary>
@@ -30,7 +36,7 @@ namespace Marechai.ApiClient.Documents.ByLetter.Item
/// </summary>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public WithCItemRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-letter/{c}", rawUrl)
public WithCItemRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-letter/{c}{?skip*,take*}", rawUrl)
{
}
/// <returns>A List&lt;global::Marechai.ApiClient.Models.DocumentDto&gt;</returns>
@@ -39,11 +45,11 @@ namespace Marechai.ApiClient.Documents.ByLetter.Item
/// <exception cref="global::Marechai.ApiClient.Models.ProblemDetails">When receiving a 400 status code</exception>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>?> GetAsync(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByLetter.Item.WithCItemRequestBuilder.WithCItemRequestBuilderGetQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
{
#nullable restore
#else
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>> GetAsync(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByLetter.Item.WithCItemRequestBuilder.WithCItemRequestBuilderGetQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
{
#endif
var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -58,11 +64,11 @@ namespace Marechai.ApiClient.Documents.ByLetter.Item
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default)
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByLetter.Item.WithCItemRequestBuilder.WithCItemRequestBuilderGetQueryParameters>>? requestConfiguration = default)
{
#nullable restore
#else
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default)
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByLetter.Item.WithCItemRequestBuilder.WithCItemRequestBuilderGetQueryParameters>> requestConfiguration = default)
{
#endif
var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
@@ -79,12 +85,22 @@ namespace Marechai.ApiClient.Documents.ByLetter.Item
{
return new global::Marechai.ApiClient.Documents.ByLetter.Item.WithCItemRequestBuilder(rawUrl, RequestAdapter);
}
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
#pragma warning disable CS1591
public partial class WithCItemRequestBuilderGetQueryParameters
#pragma warning restore CS1591
{
[QueryParameter("skip")]
public int? Skip { get; set; }
[QueryParameter("take")]
public int? Take { get; set; }
}
/// <summary>
/// Configuration for the request such as headers, query parameters, and middleware options.
/// </summary>
[Obsolete("This class is deprecated. Please use the generic RequestConfiguration class generated by the generator.")]
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class WithCItemRequestBuilderGetRequestConfiguration : RequestConfiguration<DefaultQueryParameters>
public partial class WithCItemRequestBuilderGetRequestConfiguration : RequestConfiguration<global::Marechai.ApiClient.Documents.ByLetter.Item.WithCItemRequestBuilder.WithCItemRequestBuilderGetQueryParameters>
{
}
}

91
Marechai.ApiClient/Documents/ByYear/Item/Count/CountRequestBuilder.cs Normal file
View File

@@ -0,0 +1,91 @@
// <auto-generated/>
#pragma warning disable CS0618
using Marechai.ApiClient.Models;
using Microsoft.Kiota.Abstractions.Extensions;
using Microsoft.Kiota.Abstractions.Serialization;
using Microsoft.Kiota.Abstractions;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System;
namespace Marechai.ApiClient.Documents.ByYear.Item.Count
{
/// <summary>
/// Builds and executes requests for operations under \documents\by-year\{year}\count
/// </summary>
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class CountRequestBuilder : BaseRequestBuilder
{
/// <summary>
/// Instantiates a new <see cref="global::Marechai.ApiClient.Documents.ByYear.Item.Count.CountRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="pathParameters">Path parameters for the request</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public CountRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-year/{year}/count", pathParameters)
{
}
/// <summary>
/// Instantiates a new <see cref="global::Marechai.ApiClient.Documents.ByYear.Item.Count.CountRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public CountRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-year/{year}/count", rawUrl)
{
}
/// <returns>A <see cref="int"/></returns>
/// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
/// <exception cref="global::Marechai.ApiClient.Models.ProblemDetails">When receiving a 400 status code</exception>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
{
#nullable restore
#else
public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
{
#endif
var requestInfo = ToGetRequestInformation(requestConfiguration);
var errorMapping = new Dictionary<string, ParsableFactory<IParsable>>
{
{ "400", global::Marechai.ApiClient.Models.ProblemDetails.CreateFromDiscriminatorValue },
};
return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
}
/// <returns>A <see cref="RequestInformation"/></returns>
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default)
{
#nullable restore
#else
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default)
{
#endif
var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
requestInfo.Configure(requestConfiguration);
requestInfo.Headers.TryAdd("Accept", "text/plain;q=0.9");
return requestInfo;
}
/// <summary>
/// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
/// </summary>
/// <returns>A <see cref="global::Marechai.ApiClient.Documents.ByYear.Item.Count.CountRequestBuilder"/></returns>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
public global::Marechai.ApiClient.Documents.ByYear.Item.Count.CountRequestBuilder WithUrl(string rawUrl)
{
return new global::Marechai.ApiClient.Documents.ByYear.Item.Count.CountRequestBuilder(rawUrl, RequestAdapter);
}
/// <summary>
/// Configuration for the request such as headers, query parameters, and middleware options.
/// </summary>
[Obsolete("This class is deprecated. Please use the generic RequestConfiguration class generated by the generator.")]
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class CountRequestBuilderGetRequestConfiguration : RequestConfiguration<DefaultQueryParameters>
{
}
}
}
#pragma warning restore CS0618

30
Marechai.ApiClient/Documents/ByYear/Item/WithYearItemRequestBuilder.cs
View File

@@ -1,5 +1,6 @@
// <auto-generated/>
#pragma warning disable CS0618
using Marechai.ApiClient.Documents.ByYear.Item.Count;
using Marechai.ApiClient.Models;
using Microsoft.Kiota.Abstractions.Extensions;
using Microsoft.Kiota.Abstractions.Serialization;
@@ -17,12 +18,17 @@ namespace Marechai.ApiClient.Documents.ByYear.Item
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class WithYearItemRequestBuilder : BaseRequestBuilder
{
/// <summary>The count property</summary>
public global::Marechai.ApiClient.Documents.ByYear.Item.Count.CountRequestBuilder Count
{
get => new global::Marechai.ApiClient.Documents.ByYear.Item.Count.CountRequestBuilder(PathParameters, RequestAdapter);
}
/// <summary>
/// Instantiates a new <see cref="global::Marechai.ApiClient.Documents.ByYear.Item.WithYearItemRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="pathParameters">Path parameters for the request</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public WithYearItemRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-year/{year}", pathParameters)
public WithYearItemRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-year/{year}{?skip*,take*}", pathParameters)
{
}
/// <summary>
@@ -30,7 +36,7 @@ namespace Marechai.ApiClient.Documents.ByYear.Item
/// </summary>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public WithYearItemRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-year/{year}", rawUrl)
public WithYearItemRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents/by-year/{year}{?skip*,take*}", rawUrl)
{
}
/// <returns>A List&lt;global::Marechai.ApiClient.Models.DocumentDto&gt;</returns>
@@ -39,11 +45,11 @@ namespace Marechai.ApiClient.Documents.ByYear.Item
/// <exception cref="global::Marechai.ApiClient.Models.ProblemDetails">When receiving a 400 status code</exception>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>?> GetAsync(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByYear.Item.WithYearItemRequestBuilder.WithYearItemRequestBuilderGetQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
{
#nullable restore
#else
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>> GetAsync(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByYear.Item.WithYearItemRequestBuilder.WithYearItemRequestBuilderGetQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
{
#endif
var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -58,11 +64,11 @@ namespace Marechai.ApiClient.Documents.ByYear.Item
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default)
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByYear.Item.WithYearItemRequestBuilder.WithYearItemRequestBuilderGetQueryParameters>>? requestConfiguration = default)
{
#nullable restore
#else
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default)
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.ByYear.Item.WithYearItemRequestBuilder.WithYearItemRequestBuilderGetQueryParameters>> requestConfiguration = default)
{
#endif
var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
@@ -79,12 +85,22 @@ namespace Marechai.ApiClient.Documents.ByYear.Item
{
return new global::Marechai.ApiClient.Documents.ByYear.Item.WithYearItemRequestBuilder(rawUrl, RequestAdapter);
}
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
#pragma warning disable CS1591
public partial class WithYearItemRequestBuilderGetQueryParameters
#pragma warning restore CS1591
{
[QueryParameter("skip")]
public int? Skip { get; set; }
[QueryParameter("take")]
public int? Take { get; set; }
}
/// <summary>
/// Configuration for the request such as headers, query parameters, and middleware options.
/// </summary>
[Obsolete("This class is deprecated. Please use the generic RequestConfiguration class generated by the generator.")]
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class WithYearItemRequestBuilderGetRequestConfiguration : RequestConfiguration<DefaultQueryParameters>
public partial class WithYearItemRequestBuilderGetRequestConfiguration : RequestConfiguration<global::Marechai.ApiClient.Documents.ByYear.Item.WithYearItemRequestBuilder.WithYearItemRequestBuilderGetQueryParameters>
{
}
}

24
Marechai.ApiClient/Documents/DocumentsRequestBuilder.cs
View File

@@ -96,7 +96,7 @@ namespace Marechai.ApiClient.Documents
/// </summary>
/// <param name="pathParameters">Path parameters for the request</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public DocumentsRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents", pathParameters)
public DocumentsRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents{?skip*,take*}", pathParameters)
{
}
/// <summary>
@@ -104,7 +104,7 @@ namespace Marechai.ApiClient.Documents
/// </summary>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public DocumentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents", rawUrl)
public DocumentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/documents{?skip*,take*}", rawUrl)
{
}
/// <returns>A List&lt;global::Marechai.ApiClient.Models.DocumentDto&gt;</returns>
@@ -113,11 +113,11 @@ namespace Marechai.ApiClient.Documents
/// <exception cref="global::Marechai.ApiClient.Models.ProblemDetails">When receiving a 400 status code</exception>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>?> GetAsync(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.DocumentsRequestBuilder.DocumentsRequestBuilderGetQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
{
#nullable restore
#else
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
public async Task<List<global::Marechai.ApiClient.Models.DocumentDto>> GetAsync(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.DocumentsRequestBuilder.DocumentsRequestBuilderGetQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
{
#endif
var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -156,11 +156,11 @@ namespace Marechai.ApiClient.Documents
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default)
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.DocumentsRequestBuilder.DocumentsRequestBuilderGetQueryParameters>>? requestConfiguration = default)
{
#nullable restore
#else
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default)
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<global::Marechai.ApiClient.Documents.DocumentsRequestBuilder.DocumentsRequestBuilderGetQueryParameters>> requestConfiguration = default)
{
#endif
var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
@@ -196,12 +196,22 @@ namespace Marechai.ApiClient.Documents
{
return new global::Marechai.ApiClient.Documents.DocumentsRequestBuilder(rawUrl, RequestAdapter);
}
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
#pragma warning disable CS1591
public partial class DocumentsRequestBuilderGetQueryParameters
#pragma warning restore CS1591
{
[QueryParameter("skip")]
public int? Skip { get; set; }
[QueryParameter("take")]
public int? Take { get; set; }
}
/// <summary>
/// Configuration for the request such as headers, query parameters, and middleware options.
/// </summary>
[Obsolete("This class is deprecated. Please use the generic RequestConfiguration class generated by the generator.")]
[global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
public partial class DocumentsRequestBuilderGetRequestConfiguration : RequestConfiguration<DefaultQueryParameters>
public partial class DocumentsRequestBuilderGetRequestConfiguration : RequestConfiguration<global::Marechai.ApiClient.Documents.DocumentsRequestBuilder.DocumentsRequestBuilderGetQueryParameters>
{
}
/// <summary>

2
Marechai.ApiClient/kiota-lock.json
View File

@@ -1,5 +1,5 @@
{
"descriptionHash": "05BE48FD51F874E189911DDDA45748ED43817287B4B417F7FF40DC1B78731E8B001029682B5D38DB20AE5381D0936FBD8DC9B0AD3BFBF5B27C95367171A72346",
"descriptionHash": "88FC8B79411530BB81782CD42A511DADF507AC58B4C0B94B56BCE73F5702466A5E2F08BA5F1B9D11E0E9F640718165360D81522DE7EE2CCC65FDD75987BF30F4",
"descriptionLocation": "../../../../../tmp/openapi.json",
"lockFileVersion": "1.0.0",
"kiotaVersion": "1.31.1",

149
Marechai.Server/Controllers/DocumentsController.cs
View File

@@ -27,6 +27,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
@@ -108,67 +109,113 @@ public class DocumentsController(MarechaiContext context) : ControllerBase
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public Task<List<DocumentDto>> GetDocumentsByLetterAsync(char c) => context.Documents
.Where(d =>
(d.SortTitle != null && EF.Functions.Like(d.SortTitle, $"{c}%")) ||
(d.SortTitle == null && EF.Functions.Like(d.Title, $"{c}%")))
.OrderBy(d => MarechaiContext.NaturalSortKey(d.SortTitle))
.ThenBy(d => MarechaiContext.NaturalSortKey(d.Title))
.ThenBy(d => d.Published)
.Select(d => new DocumentDto
{
Id = d.Id,
Title = d.Title,
NativeTitle = d.NativeTitle,
SortTitle = d.SortTitle,
Published = d.Published,
PublishedPrecision = d.PublishedPrecision,
CountryId = d.CountryId,
Country = d.Country.Name
})
.ToListAsync();
public Task<List<DocumentDto>> GetDocumentsByLetterAsync(char c, [FromQuery] int? skip = null,
[FromQuery] int? take = null,
CancellationToken cancellationToken = default)
{
IQueryable<Document> ordered = context.Documents
.Where(d =>
(d.SortTitle != null && EF.Functions.Like(d.SortTitle, $"{c}%")) ||
(d.SortTitle == null && EF.Functions.Like(d.Title, $"{c}%")))
.OrderBy(d => MarechaiContext.NaturalSortKey(d.SortTitle))
.ThenBy(d => MarechaiContext.NaturalSortKey(d.Title))
.ThenBy(d => d.Published);
if(skip.HasValue) ordered = ordered.Skip(skip.Value);
if(take.HasValue) ordered = ordered.Take(take.Value);
return ordered.Select(d => new DocumentDto
{
Id = d.Id,
Title = d.Title,
NativeTitle = d.NativeTitle,
SortTitle = d.SortTitle,
Published = d.Published,
PublishedPrecision = d.PublishedPrecision,
CountryId = d.CountryId,
Country = d.Country.Name
})
.ToListAsync(cancellationToken);
}
[HttpGet("by-letter/{c}/count")]
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public Task<int> GetDocumentsByLetterCountAsync(char c, CancellationToken cancellationToken = default) =>
context.Documents
.Where(d =>
(d.SortTitle != null && EF.Functions.Like(d.SortTitle, $"{c}%")) ||
(d.SortTitle == null && EF.Functions.Like(d.Title, $"{c}%")))
.CountAsync(cancellationToken);
[HttpGet("by-year/{year:int}")]
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public Task<List<DocumentDto>> GetDocumentsByYearAsync(int year) => context.Documents
.Where(d => d.Published != null && d.Published.Value.Year == year)
.OrderBy(d => MarechaiContext.NaturalSortKey(d.SortTitle))
.ThenBy(d => MarechaiContext.NaturalSortKey(d.Title))
.ThenBy(d => d.Published)
.Select(d => new DocumentDto
{
Id = d.Id,
Title = d.Title,
NativeTitle = d.NativeTitle,
SortTitle = d.SortTitle,
Published = d.Published,
PublishedPrecision = d.PublishedPrecision,
CountryId = d.CountryId,
Country = d.Country.Name
})
.ToListAsync();
public Task<List<DocumentDto>> GetDocumentsByYearAsync(int year, [FromQuery] int? skip = null,
[FromQuery] int? take = null,
CancellationToken cancellationToken = default)
{
IQueryable<Document> ordered = context.Documents
.Where(d => d.Published != null && d.Published.Value.Year == year)
.OrderBy(d => MarechaiContext.NaturalSortKey(d.SortTitle))
.ThenBy(d => MarechaiContext.NaturalSortKey(d.Title))
.ThenBy(d => d.Published);
if(skip.HasValue) ordered = ordered.Skip(skip.Value);
if(take.HasValue) ordered = ordered.Take(take.Value);
return ordered.Select(d => new DocumentDto
{
Id = d.Id,
Title = d.Title,
NativeTitle = d.NativeTitle,
SortTitle = d.SortTitle,
Published = d.Published,
PublishedPrecision = d.PublishedPrecision,
CountryId = d.CountryId,
Country = d.Country.Name
})
.ToListAsync(cancellationToken);
}
[HttpGet("by-year/{year:int}/count")]
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public Task<int> GetDocumentsByYearCountAsync(int year, CancellationToken cancellationToken = default) =>
context.Documents.Where(d => d.Published != null && d.Published.Value.Year == year)
.CountAsync(cancellationToken);
[HttpGet]
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public Task<List<DocumentDto>> GetAsync() => context.Documents.OrderBy(b => MarechaiContext.NaturalSortKey(b.SortTitle))
.ThenBy(b => b.Published)
.ThenBy(b => MarechaiContext.NaturalSortKey(b.Title))
.Select(b => new DocumentDto
{
Id = b.Id,
Title = b.Title,
NativeTitle = b.NativeTitle,
SortTitle = b.SortTitle,
Published = b.Published,
PublishedPrecision = b.PublishedPrecision,
CountryId = b.CountryId,
Country = b.Country.Name
})
.ToListAsync();
public Task<List<DocumentDto>> GetAsync([FromQuery] int? skip = null, [FromQuery] int? take = null,
CancellationToken cancellationToken = default)
{
IQueryable<Document> ordered = context.Documents
.OrderBy(b => MarechaiContext.NaturalSortKey(b.SortTitle))
.ThenBy(b => b.Published)
.ThenBy(b => MarechaiContext.NaturalSortKey(b.Title));
if(skip.HasValue) ordered = ordered.Skip(skip.Value);
if(take.HasValue) ordered = ordered.Take(take.Value);
return ordered.Select(b => new DocumentDto
{
Id = b.Id,
Title = b.Title,
NativeTitle = b.NativeTitle,
SortTitle = b.SortTitle,
Published = b.Published,
PublishedPrecision = b.PublishedPrecision,
CountryId = b.CountryId,
Country = b.Country.Name
})
.ToListAsync(cancellationToken);
}
[HttpGet("{id:long}")]
[AllowAnonymous]

38
Marechai/Pages/Documents/Search.razor
View File

@@ -32,7 +32,7 @@
@inherits OwningComponentBase<DocumentsService>
@inject IStringLocalizer<DocumentsService> L
@if(_documents is null)
@if(!_initialized)
{
<div class="d-flex justify-center pa-8">
<MudProgressCircular Color="Color.Primary" Indeterminate="true"/>
@@ -53,23 +53,31 @@
}
</MudPaper>
@if(_documents?.Count > 0)
@if(_total > 0)
{
<MudText Typo="Typo.body2" Class="mb-2">@string.Format(L["{0} documents found in the database."], _documents.Count)</MudText>
<MudList T="DocumentDto" Dense="true">
@foreach(DocumentDto document in _documents)
<MudText Typo="Typo.body2" Class="mb-2">@string.Format(L["{0} documents found in the database."], _total)</MudText>
<div id="@_scrollerId" style="height: calc(100dvh - 220px); min-height: 360px; overflow-y: auto;">
<MudList T="DocumentDto" Dense="true">
<Virtualize Items="_documents" Context="document" ItemSize="64">
<MudListItem T="DocumentDto" Href="@($"/document/{document.Id}")" Icon="@Icons.Material.Filled.Article">
<div>
<MudText Typo="Typo.body1">@document.Title</MudText>
@if(document.Published.HasValue)
{
<MudText Typo="Typo.caption" Color="Color.Secondary">@document.Published.Value.Year</MudText>
}
</div>
</MudListItem>
</Virtualize>
</MudList>
<div id="@_sentinelId" style="height: 1px;"></div>
@if(_loadingMore)
{
<MudListItem T="DocumentDto" Href="@($"/document/{document.Id}")" Icon="@Icons.Material.Filled.Article">
<div>
<MudText Typo="Typo.body1">@document.Title</MudText>
@if(document.Published.HasValue)
{
<MudText Typo="Typo.caption" Color="Color.Secondary">@document.Published.Value.Year</MudText>
}
</div>
</MudListItem>
<div class="d-flex justify-center pa-3">
<MudProgressCircular Color="Color.Primary" Size="Size.Small" Indeterminate="true"/>
</div>
}
</MudList>
</div>
}
else
{

168
Marechai/Pages/Documents/Search.razor.cs
View File

@@ -23,20 +23,57 @@
// Copyright © 2003-2026 Natalia Portillo
*******************************************************************************/
/******************************************************************************
// MARECHAI: Master repository of computing history artifacts information
// ----------------------------------------------------------------------------
//
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2003-2026 Natalia Portillo
*******************************************************************************/
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Marechai.ApiClient.Models;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
namespace Marechai.Pages.Documents;
public partial class Search
public partial class Search : IAsyncDisposable
{
char? _character;
List<DocumentDto> _documents;
bool _loaded;
string _lastStartingCharacter;
int? _lastYear;
const int _pageSize = 100;
readonly string _sentinelId = $"documents-search-sentinel-{Guid.NewGuid():N}";
readonly string _scrollerId = $"documents-search-scroll-{Guid.NewGuid():N}";
readonly List<DocumentDto> _documents = [];
char? _character;
bool _initialized;
bool _loadingMore;
bool _observerRegistered;
string _lastStartingCharacter;
int? _lastYear;
int _total;
DotNetObjectReference<Search> _selfRef;
[Inject]
IJSRuntime JS { get; set; }
[Parameter]
public int? Year { get; set; }
@@ -44,38 +81,127 @@ public partial class Search
[Parameter]
public string StartingCharacter { get; set; }
bool HasMore => _documents.Count < _total;
protected override void OnParametersSet()
{
if(Year == _lastYear && StartingCharacter == _lastStartingCharacter) return;
_lastYear = Year;
_lastStartingCharacter = StartingCharacter;
_loaded = false;
_initialized = false;
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if(_loaded) return;
_character = null;
if(!string.IsNullOrWhiteSpace(StartingCharacter) && StartingCharacter.Length == 1)
if(!_initialized)
{
_character = StartingCharacter[0];
await UnobserveAsync();
// ToUpper()
if(_character >= 'a' && _character <= 'z') _character -= (char)32;
_character = null;
_total = 0;
_documents.Clear();
// Check if not letter or number
if(_character < '0' || _character > '9' && _character < 'A' || _character > 'Z') _character = null;
if(!string.IsNullOrWhiteSpace(StartingCharacter) && StartingCharacter.Length == 1)
{
_character = StartingCharacter[0];
// ToUpper()
if(_character >= 'a' && _character <= 'z') _character -= (char)32;
// Check if not letter or number
if(_character < '0' || _character > '9' && _character < 'A' || _character > 'Z') _character = null;
}
Task<int> countTask = GetCurrentCountAsync();
Task<List<DocumentDto>> firstPageTask = FetchBatchAsync(0, _pageSize);
await Task.WhenAll(countTask, firstPageTask);
_total = countTask.Result;
_documents.AddRange(firstPageTask.Result);
_initialized = true;
StateHasChanged();
return;
}
if(_character.HasValue) _documents = await Service.GetDocumentsByLetterAsync(_character.Value);
if(!_observerRegistered && HasMore)
{
_selfRef ??= DotNetObjectReference.Create(this);
if(Year.HasValue && _documents is null) _documents = await Service.GetDocumentsByYearAsync(Year.Value);
try
{
await JS.InvokeVoidAsync("marechaiInfiniteScroll.observe", _sentinelId, _selfRef, $"#{_scrollerId}",
"200px");
_observerRegistered = true;
}
catch(JSDisconnectedException)
{
// Circuit gone — nothing to do.
}
}
}
_documents ??= await Service.GetDocumentsAsync();
_loaded = true;
[JSInvokable]
public async Task OnSentinelVisibleAsync()
{
if(_loadingMore || !HasMore) return;
_loadingMore = true;
StateHasChanged();
try
{
List<DocumentDto> next = await FetchBatchAsync(_documents.Count, _pageSize);
_documents.AddRange(next);
if(!HasMore) await UnobserveAsync();
}
finally
{
_loadingMore = false;
StateHasChanged();
}
}
Task<int> GetCurrentCountAsync()
{
if(_character.HasValue) return Service.GetDocumentsByLetterCountAsync(_character.Value);
if(Year.HasValue) return Service.GetDocumentsByYearCountAsync(Year.Value);
return Service.GetDocumentsCountAsync();
}
Task<List<DocumentDto>> FetchBatchAsync(int skip, int take)
{
if(_character.HasValue) return Service.GetDocumentsByLetterAsync(_character.Value, skip, take);
if(Year.HasValue) return Service.GetDocumentsByYearAsync(Year.Value, skip, take);
return Service.GetDocumentsAsync(skip, take);
}
async Task UnobserveAsync()
{
if(!_observerRegistered) return;
try
{
await JS.InvokeVoidAsync("marechaiInfiniteScroll.unobserve", _sentinelId);
}
catch(JSDisconnectedException)
{
// Circuit gone; nothing to do.
}
_observerRegistered = false;
}
public async ValueTask DisposeAsync()
{
await UnobserveAsync();
_selfRef?.Dispose();
}
}

56
Marechai/Services/DocumentsService.cs
View File

@@ -25,6 +25,7 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Marechai.ApiClient.Models;
using Microsoft.Kiota.Abstractions;
@@ -103,11 +104,16 @@ public class DocumentsService(Marechai.ApiClient.Client client)
}
}
public async Task<List<DocumentDto>> GetDocumentsByLetterAsync(char c)
public async Task<List<DocumentDto>> GetDocumentsByLetterAsync(char c, int? skip = null, int? take = null,
CancellationToken cancellationToken = default)
{
try
{
List<DocumentDto> documents = await client.Documents.ByLetter[c.ToString()].GetAsync();
List<DocumentDto> documents = await client.Documents.ByLetter[c.ToString()].GetAsync(rc =>
{
if(skip.HasValue) rc.QueryParameters.Skip = skip.Value;
if(take.HasValue) rc.QueryParameters.Take = take.Value;
}, cancellationToken);
return documents ?? [];
}
@@ -117,11 +123,30 @@ public class DocumentsService(Marechai.ApiClient.Client client)
}
}
public async Task<List<DocumentDto>> GetDocumentsByYearAsync(int year)
public async Task<int> GetDocumentsByLetterCountAsync(char c, CancellationToken cancellationToken = default)
{
try
{
List<DocumentDto> documents = await client.Documents.ByYear[year].GetAsync();
int? count = await client.Documents.ByLetter[c.ToString()].Count.GetAsync(cancellationToken: cancellationToken);
return count ?? 0;
}
catch
{
return 0;
}
}
public async Task<List<DocumentDto>> GetDocumentsByYearAsync(int year, int? skip = null, int? take = null,
CancellationToken cancellationToken = default)
{
try
{
List<DocumentDto> documents = await client.Documents.ByYear[year].GetAsync(rc =>
{
if(skip.HasValue) rc.QueryParameters.Skip = skip.Value;
if(take.HasValue) rc.QueryParameters.Take = take.Value;
}, cancellationToken);
return documents ?? [];
}
@@ -131,11 +156,30 @@ public class DocumentsService(Marechai.ApiClient.Client client)
}
}
public async Task<List<DocumentDto>> GetDocumentsAsync()
public async Task<int> GetDocumentsByYearCountAsync(int year, CancellationToken cancellationToken = default)
{
try
{
List<DocumentDto> documents = await client.Documents.GetAsync();
int? count = await client.Documents.ByYear[year].Count.GetAsync(cancellationToken: cancellationToken);
return count ?? 0;
}
catch
{
return 0;
}
}
public async Task<List<DocumentDto>> GetDocumentsAsync(int? skip = null, int? take = null,
CancellationToken cancellationToken = default)
{
try
{
List<DocumentDto> documents = await client.Documents.GetAsync(rc =>
{
if(skip.HasValue) rc.QueryParameters.Skip = skip.Value;
if(take.HasValue) rc.QueryParameters.Take = take.Value;
}, cancellationToken);
return documents ?? [];
}