From 612cee7e7f8b690e0d8e93c482f18c25415cb458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20N=C3=A9meth?= <krisztian.nemeth@lombiq.com>
Date: Tue, 1 Oct 2024 11:57:06 +0200
Subject: [PATCH 1/4] Should be using ControllerBase from now on.

---
 .../Users/AuthorizationServiceExtensions.cs                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs
index cea5c50c..c430253e 100644
--- a/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs
+++ b/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs
@@ -51,7 +51,7 @@ public static Task<bool> AuthorizeCurrentUserAsync(
     /// <typeparam name="TResult">The final outcome.</typeparam>
     public static async Task<IActionResult> AuthorizeForCurrentUserValidateAndExecuteAsync<TData, TResult>(
         this IAuthorizationService service,
-        Controller controller,
+        ControllerBase controller,
         IEnumerable<Permission> permissions,
         Func<Task<(bool IsSuccess, TData Data)>> validateAsync,
         Func<TData, Task<TResult>> executeAsync,
@@ -82,7 +82,7 @@ public static async Task<IActionResult> AuthorizeForCurrentUserValidateAndExecut
     /// <inheritdoc cref="AuthorizeForCurrentUserValidateAndExecuteAsync{TData,TResult}"/>
     public static Task<IActionResult> AuthorizeForCurrentUserAndExecuteAsync<TResult>(
         this IAuthorizationService service,
-        Controller controller,
+        ControllerBase controller,
         IEnumerable<Permission> permissions,
         Func<Task<TResult>> executeAsync,
         string authenticationScheme = "Api",
@@ -98,7 +98,7 @@ public static Task<IActionResult> AuthorizeForCurrentUserAndExecuteAsync<TResult
     /// <inheritdoc cref="AuthorizeForCurrentUserValidateAndExecuteAsync{TData,TResult}"/>
     public static Task<IActionResult> AuthorizeForCurrentUserValidateNotNullAndExecuteAsync<TData, TResult>(
         this IAuthorizationService service,
-        Controller controller,
+        ControllerBase controller,
         IEnumerable<Permission> permissions,
         Func<Task<TData>> validateAsync,
         Func<TData, Task<TResult>> executeAsync,

From 5cdb1d1476672d3045c27b6d42f4277dc0bd7525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20N=C3=A9meth?= <krisztian.nemeth@lombiq.com>
Date: Fri, 4 Oct 2024 13:29:39 +0200
Subject: [PATCH 2/4] Json ignore IShape

---
 Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
index 13c59fe9..b8cfa973 100644
--- a/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
+++ b/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using YesSql.Indexes;
 
@@ -195,4 +196,4 @@ public static Task<GetPageAndPagerViewModel<T>> GetPageAndPagerAsync<T>(
     }
 }
 
-public record GetPageAndPagerViewModel<T>(IList<T> Items, IShape Pager, int Total, int PageSize, int PageIndex);
+public record GetPageAndPagerViewModel<T>(IList<T> Items, [property: JsonIgnore] IShape Pager, int Total, int PageSize, int PageIndex);

From e25833bb7c3a6029a9a2a4db60a327491962458e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20N=C3=A9meth?= <krisztian.nemeth@lombiq.com>
Date: Fri, 4 Oct 2024 14:11:07 +0200
Subject: [PATCH 3/4] Moving comment to ensure code formatting

---
 Lombiq.HelpfulLibraries.Common/Utilities/Union.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs b/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs
index a4d73c7f..9eb54fdd 100644
--- a/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs
+++ b/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs
@@ -27,7 +27,7 @@ internal Union(T1 left, T2 right, bool leftIsSet)
 
 public static class Union
 {
+    // The value of leftIsSet doesn't matter.
     public static Union<T1, T2> Neither<T1, T2>() =>
-        // The value of leftIsSet doesn't matter.
         new(default, default, leftIsSet: true);
 }

From 5b1a6e8f31ec5fc8aa6b37b0b5ca86f1b0036f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20N=C3=A9meth?= <nkrisz5@gmail.com>
Date: Tue, 8 Oct 2024 16:18:16 +0200
Subject: [PATCH 4/4] Update
 Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sára El-Saig <sara.el-saig@lombiq.com>
---
 .../Data/QueryExtensions.cs                                | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
index b8cfa973..d755b4f0 100644
--- a/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
+++ b/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
@@ -196,4 +196,9 @@ public static Task<GetPageAndPagerViewModel<T>> GetPageAndPagerAsync<T>(
     }
 }
 
-public record GetPageAndPagerViewModel<T>(IList<T> Items, [property: JsonIgnore] IShape Pager, int Total, int PageSize, int PageIndex);
+public record GetPageAndPagerViewModel<T>(
+    IList<T> Items,
+    [property: JsonIgnore] IShape Pager,
+    int Total,
+    int PageSize,
+    int PageIndex);