diff --git a/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs b/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs index 82918c79..a4f04baf 100644 --- a/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs +++ b/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs @@ -26,12 +26,12 @@ public static class CountHistoryQueryExtensions /// /// /// - public static async Task AnyHistoryAsync(this ISender sender, string uuid, EnvelopeStatusQuery statuses, CancellationToken cancel = default) + public static async Task AnyHistoryAsync(this ISender sender, string uuid, IEnumerable statuses, CancellationToken cancel) { var count = await sender.Send(new CountHistoryQuery { Envelope = new() { Uuid = uuid }, - Statuses = statuses + Statuses = new() { Include = statuses } }, cancel); return count > 0; } @@ -89,7 +89,7 @@ public class CountHistoryQueryHandler : IRequestHandler if (status.Max is not null) query = query.Where(er => er.Envelope!.Status <= status.Max); - if (status.Include?.Length > 0) + if (status.Include?.Count() > 0) query = query.Where(er => status.Include.Contains(er.Envelope!.Status)); if (status.Ignore is not null) diff --git a/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs b/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs index ba3de6e4..8b9c1f57 100644 --- a/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs +++ b/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs @@ -51,10 +51,10 @@ public record EnvelopeStatusQuery /// /// Eine Liste von Statuswerten, die einbezogen werden. /// - public EnvelopeStatus[]? Include { get; init; } + public IEnumerable? Include { get; init; } /// /// Eine Liste von Statuswerten, die ignoriert werden werden. /// - public EnvelopeStatus[]? Ignore { get; init; } + public IEnumerable? Ignore { get; init; } } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs index 99cb4fc3..20b2c221 100644 --- a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs +++ b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs @@ -76,7 +76,7 @@ public class ReadHistoryQueryHandler : IRequestHandler er.Envelope!.Status <= status.Max); - if (status.Include?.Length > 0) + if (status.Include?.Count() > 0) query = query.Where(er => status.Include.Contains(er.Envelope!.Status)); if (status.Ignore is not null)