(#35) Completed service client with OData LINQ queries. (#54)

* Complete service client for talking to the datasync service.
* Complete LINQ query coverage.
* Tests with 100% coverage.

Author: adrianhall

Datasync.Toolkit.sln

@@ -24,8 +24,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.Server.LiteDb", "src\CommunityToolkit.Datasync.Server.LiteDb\CommunityToolkit.Datasync.Server.LiteDb.csproj", "{66A40624-ADF3-4469-A1D5-E5BD854CFA94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.Common.Test", "tests\CommunityToolkit.Datasync.Common.Test\CommunityToolkit.Datasync.Common.Test.csproj", "{89BB94FD-0B89-4AE9-B2CF-9FB891E0B641}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.Server.Automapper.Test", "tests\CommunityToolkit.Datasync.Server.Automapper.Test\CommunityToolkit.Datasync.Server.Automapper.Test.csproj", "{E322C30C-F40C-4594-86ED-DAA90E2F5611}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.Server.EntityFrameworkCore.Test", "tests\CommunityToolkit.Datasync.Server.EntityFrameworkCore.Test\CommunityToolkit.Datasync.Server.EntityFrameworkCore.Test.csproj", "{B616A68F-F8B6-49C3-AB14-4718F09F2082}"
@@ -44,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.TestCommon", "tests\CommunityToolkit.Datasync.TestCommon\CommunityToolkit.Datasync.TestCommon.csproj", "{AC514FCF-C0D8-438F-A12C-A259CEB7B43D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.Common", "src\CommunityToolkit.Datasync.Common\CommunityToolkit.Datasync.Common.csproj", "{E1AC26CF-5C5C-400C-97F6-416D6FCF5BC7}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2D2A6EFC-015D-4258-96D4-24C78F8C59F9}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\SignedPackageFileList.txt = .github\workflows\SignedPackageFileList.txt
@@ -90,10 +86,6 @@ Global
 		{66A40624-ADF3-4469-A1D5-E5BD854CFA94}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{66A40624-ADF3-4469-A1D5-E5BD854CFA94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66A40624-ADF3-4469-A1D5-E5BD854CFA94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89BB94FD-0B89-4AE9-B2CF-9FB891E0B641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89BB94FD-0B89-4AE9-B2CF-9FB891E0B641}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89BB94FD-0B89-4AE9-B2CF-9FB891E0B641}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89BB94FD-0B89-4AE9-B2CF-9FB891E0B641}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E322C30C-F40C-4594-86ED-DAA90E2F5611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E322C30C-F40C-4594-86ED-DAA90E2F5611}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E322C30C-F40C-4594-86ED-DAA90E2F5611}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -130,10 +122,6 @@ Global
 		{AC514FCF-C0D8-438F-A12C-A259CEB7B43D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC514FCF-C0D8-438F-A12C-A259CEB7B43D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC514FCF-C0D8-438F-A12C-A259CEB7B43D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1AC26CF-5C5C-400C-97F6-416D6FCF5BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1AC26CF-5C5C-400C-97F6-416D6FCF5BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1AC26CF-5C5C-400C-97F6-416D6FCF5BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1AC26CF-5C5C-400C-97F6-416D6FCF5BC7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C56A5630-03D7-43EF-BC09-69CA97152CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C56A5630-03D7-43EF-BC09-69CA97152CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C56A5630-03D7-43EF-BC09-69CA97152CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -168,7 +156,6 @@ Global
 		{1C3C2B80-ECE3-4442-8183-C2AD7F735D8E} = {84AD662A-4B9E-4E64-834D-72529FB7FCE5}
 		{343D137B-FE42-4D56-85E8-AAEA2486CBDB} = {84AD662A-4B9E-4E64-834D-72529FB7FCE5}
 		{66A40624-ADF3-4469-A1D5-E5BD854CFA94} = {84AD662A-4B9E-4E64-834D-72529FB7FCE5}
-		{89BB94FD-0B89-4AE9-B2CF-9FB891E0B641} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
 		{E322C30C-F40C-4594-86ED-DAA90E2F5611} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
 		{B616A68F-F8B6-49C3-AB14-4718F09F2082} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
 		{8255CE7F-B549-4477-A0AC-E66B3A9C12C4} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
@@ -178,7 +165,6 @@ Global
 		{0F17CC55-9DC8-4CCA-9C64-D1EFB6134D32} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
 		{1A3EE020-7299-4F00-A11F-06DD241EC6EA} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
 		{AC514FCF-C0D8-438F-A12C-A259CEB7B43D} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
-		{E1AC26CF-5C5C-400C-97F6-416D6FCF5BC7} = {84AD662A-4B9E-4E64-834D-72529FB7FCE5}
 		{C56A5630-03D7-43EF-BC09-69CA97152CFC} = {84AD662A-4B9E-4E64-834D-72529FB7FCE5}
 		{983FB40E-BA00-4055-9A8A-24E1A351FB5B} = {D59F1489-5D74-4F52-B78B-88037EAB2838}
 		{F578EC54-454F-4114-AC37-C83A7831E783} = {D59F1489-5D74-4F52-B78B-88037EAB2838}

src/CommunityToolkit.Datasync.Client/CommunityToolkit.Datasync.Client.csproj

@@ -6,13 +6,10 @@
   <ItemGroup>
     <InternalsVisibleTo Include="CommunityToolkit.Datasync.Client.Test" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-  </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CommunityToolkit.Datasync.Common\CommunityToolkit.Datasync.Common.csproj" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Azure.Core.Spatial" Version="1.1.0" />
   </ItemGroup>
-
 </Project>

src/CommunityToolkit.Datasync.Client/DatasyncClient.cs

@@ -2,57 +2,28 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
+using CommunityToolkit.Datasync.Client.Service;
 
 namespace CommunityToolkit.Datasync.Client;
 
 /// <summary>
-/// An exception used by the Datasync client library to report server conflict errors.
+/// An exception that represents a conflict between the client and server.
 /// </summary>
-/// <typeparam name="T">The type of entity in conflict</typeparam>
-public class ConflictException<T> : DatasyncHttpException where T : notnull
+/// <typeparam name="TEntity">The type of entity being transmitted to the server.</typeparam>
+/// <remarks>
+/// Creates a new <see cref="ConflictException{TEntity}"/> based on a client entity and server response.
+/// </remarks>
+/// <param name="clientEntity">The client entity that was sent to the server.</param>
+/// <param name="serviceResponse">The response from the server.</param>
+public class ConflictException<TEntity>(TEntity? clientEntity, ServiceResponse<TEntity> serviceResponse) : DatasyncHttpException(serviceResponse)
 {
-    /// <inheritdoc />
-    public ConflictException(string? message) : base(message)
-    {
-    }
-
-    /// <inheritdoc />
-    [ExcludeFromCodeCoverage(Justification = "Standard exception constructor")]
-    public ConflictException(string? message, Exception? innerException) : base(message, innerException)
-    {
-    }
-
     /// <summary>
-    /// The parsed server-side entity (or null).
+    /// The client entity that was sent to the server.
     /// </summary>
-    public T? ServerEntity { get; set; } = default;
+    public TEntity? ClientEntity { get; } = clientEntity;
 
     /// <summary>
-    /// Creates a new <see cref="ConflictException{T}"/> for the response.
+    /// The entity that is stored on the server.
     /// </summary>
-    /// <param name="responseMessage">The <see cref="HttpResponseMessage"/> that is creating the exception.</param>
-    /// <param name="serializerOptions">The JSON serializer options to use for deserializing content.</param>
-    /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
-    /// <returns></returns>
-    public static async Task<ConflictException<T>> CreateAsync(HttpResponseMessage responseMessage, JsonSerializerOptions serializerOptions, CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            string mediaType = responseMessage.Content.Headers.ContentType?.MediaType ?? string.Empty;
-            string content = await responseMessage.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            return new ConflictException<T>(responseMessage.ReasonPhrase)
-            {
-                StatusCode = responseMessage.StatusCode,
-                ContentType = mediaType,
-                Payload = content,
-                ServerEntity = JsonSerializer.Deserialize<T>(content, serializerOptions)
-            };
-        }
-        catch (JsonException ex)
-        {
-            throw new DatasyncException("Invalid JSON content received from server", ex);
-        }
-    }
+    public TEntity? ServerEntity { get; } = serviceResponse.Value;
 }