From 5dc93c6f7cfda50f742916dbdd6854ce29386a30 Mon Sep 17 00:00:00 2001
From: Allan Ritchie <allan.ritchie@gmail.com>
Date: Fri, 10 May 2024 21:36:23 -0400
Subject: [PATCH] Minor

---
 .../Contracts/Pagination.cs                   | 25 -----------------
 .../QueryableExtensions.cs                    | 27 +++++++++++++++++--
 .../Contracts/Address.cs                      |  0
 .../Contracts/ContactMethod.cs                |  0
 .../Contracts/Geo.cs                          |  0
 .../Contracts/Name.cs                         |  0
 .../Contracts/Ranges.cs                       |  0
 .../GlobalUsings.cs                           |  4 +++
 8 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 src/Shiny.Extensions.EntityFramework/Contracts/Pagination.cs
 rename src/{Shiny.Extensions.EntityFramework => Shiny.Extensions.WebHosting}/Contracts/Address.cs (100%)
 rename src/{Shiny.Extensions.EntityFramework => Shiny.Extensions.WebHosting}/Contracts/ContactMethod.cs (100%)
 rename src/{Shiny.Extensions.EntityFramework => Shiny.Extensions.WebHosting}/Contracts/Geo.cs (100%)
 rename src/{Shiny.Extensions.EntityFramework => Shiny.Extensions.WebHosting}/Contracts/Name.cs (100%)
 rename src/{Shiny.Extensions.EntityFramework => Shiny.Extensions.WebHosting}/Contracts/Ranges.cs (100%)
 create mode 100644 src/Shiny.Extensions.WebHosting/GlobalUsings.cs

diff --git a/src/Shiny.Extensions.EntityFramework/Contracts/Pagination.cs b/src/Shiny.Extensions.EntityFramework/Contracts/Pagination.cs
deleted file mode 100644
index 0a7c388..0000000
--- a/src/Shiny.Extensions.EntityFramework/Contracts/Pagination.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace Shiny.Contracts;
-
-public record PagedDataRequest(
-    int Page,
-    int Size,
-    OrderBy[]? Ordering = null,
-    bool IncludeTotalCount = true
-);
-
-public record OrderBy(
-    string Property,
-    bool Asc = true
-);
-
-
-public record PagedDataList<T>(
-    IList<T> Results,
-    int CurrentPage,
-    int TotalCount,
-    int TotalPages
-)
-{
-    public bool HasPrevious => this.CurrentPage > 1;
-    public bool HasNext => this.TotalPages > this.CurrentPage;
-};
\ No newline at end of file
diff --git a/src/Shiny.Extensions.EntityFramework/QueryableExtensions.cs b/src/Shiny.Extensions.EntityFramework/QueryableExtensions.cs
index a5abf89..2944c2b 100644
--- a/src/Shiny.Extensions.EntityFramework/QueryableExtensions.cs
+++ b/src/Shiny.Extensions.EntityFramework/QueryableExtensions.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
-using Shiny.Contracts;
 
 namespace Shiny;
 
@@ -76,4 +75,28 @@ public static async Task<List<T>> ToListAsync<T>(this IAsyncEnumerable<T> source
         }
         return list;
     }
-}
\ No newline at end of file
+}
+
+public record PagedDataRequest(
+    int Page,
+    int Size,
+    OrderBy[]? Ordering = null,
+    bool IncludeTotalCount = true
+);
+
+public record OrderBy(
+    string Property,
+    bool Asc = true
+);
+
+
+public record PagedDataList<T>(
+    IList<T> Results,
+    int CurrentPage,
+    int TotalCount,
+    int TotalPages
+)
+{
+    public bool HasPrevious => this.CurrentPage > 1;
+    public bool HasNext => this.TotalPages > this.CurrentPage;
+};
\ No newline at end of file
diff --git a/src/Shiny.Extensions.EntityFramework/Contracts/Address.cs b/src/Shiny.Extensions.WebHosting/Contracts/Address.cs
similarity index 100%
rename from src/Shiny.Extensions.EntityFramework/Contracts/Address.cs
rename to src/Shiny.Extensions.WebHosting/Contracts/Address.cs
diff --git a/src/Shiny.Extensions.EntityFramework/Contracts/ContactMethod.cs b/src/Shiny.Extensions.WebHosting/Contracts/ContactMethod.cs
similarity index 100%
rename from src/Shiny.Extensions.EntityFramework/Contracts/ContactMethod.cs
rename to src/Shiny.Extensions.WebHosting/Contracts/ContactMethod.cs
diff --git a/src/Shiny.Extensions.EntityFramework/Contracts/Geo.cs b/src/Shiny.Extensions.WebHosting/Contracts/Geo.cs
similarity index 100%
rename from src/Shiny.Extensions.EntityFramework/Contracts/Geo.cs
rename to src/Shiny.Extensions.WebHosting/Contracts/Geo.cs
diff --git a/src/Shiny.Extensions.EntityFramework/Contracts/Name.cs b/src/Shiny.Extensions.WebHosting/Contracts/Name.cs
similarity index 100%
rename from src/Shiny.Extensions.EntityFramework/Contracts/Name.cs
rename to src/Shiny.Extensions.WebHosting/Contracts/Name.cs
diff --git a/src/Shiny.Extensions.EntityFramework/Contracts/Ranges.cs b/src/Shiny.Extensions.WebHosting/Contracts/Ranges.cs
similarity index 100%
rename from src/Shiny.Extensions.EntityFramework/Contracts/Ranges.cs
rename to src/Shiny.Extensions.WebHosting/Contracts/Ranges.cs
diff --git a/src/Shiny.Extensions.WebHosting/GlobalUsings.cs b/src/Shiny.Extensions.WebHosting/GlobalUsings.cs
new file mode 100644
index 0000000..7d1f6a8
--- /dev/null
+++ b/src/Shiny.Extensions.WebHosting/GlobalUsings.cs
@@ -0,0 +1,4 @@
+global using System;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using System.Collections.Generic;
\ No newline at end of file