From e457adaf94aa02fda4fe8f65b71105088b933b5d Mon Sep 17 00:00:00 2001
From: Yuriy Durov <u.a.durov@gmail.com>
Date: Mon, 11 Sep 2023 17:30:32 +0400
Subject: [PATCH] Make Key object nullable in GetIdEndpoint

---
 ...CommunicatorRestEntityBuilderExtensions.cs | 20 +++++++++++++++++--
 .../Models/CommunicatorRestEntityContext.cs   |  8 ++++----
 .../Models/CommunicatorRestEntityOptions.cs   |  8 ++++----
 .../Interfaces/ICommunicationContext.cs       |  4 ++--
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/BitzArt.Communicator.REST/Extensions/ICommunicatorRestEntityBuilderExtensions.cs b/src/BitzArt.Communicator.REST/Extensions/ICommunicatorRestEntityBuilderExtensions.cs
index 5401ba1..f2d7a1e 100644
--- a/src/BitzArt.Communicator.REST/Extensions/ICommunicatorRestEntityBuilderExtensions.cs
+++ b/src/BitzArt.Communicator.REST/Extensions/ICommunicatorRestEntityBuilderExtensions.cs
@@ -18,6 +18,22 @@ public static ICommunicatorRestEntityBuilder<TEntity, TKey> WithEndpoint<TEntity
         return builder;
     }
 
+    public static ICommunicatorRestEntityBuilder<TEntity> WithIdEndpoint<TEntity>(this ICommunicatorRestEntityBuilder<TEntity> builder, string endpoint)
+        where TEntity : class
+    {
+        builder.EntityOptions.GetIdEndpointAction = (key) => endpoint;
+
+        return builder;
+    }
+
+    public static ICommunicatorRestEntityBuilder<TEntity, TKey> WithIdEndpoint<TEntity, TKey>(this ICommunicatorRestEntityBuilder<TEntity, TKey> builder, string endpoint)
+        where TEntity : class
+    {
+        builder.EntityOptions.GetIdEndpointAction = (key) => endpoint;
+
+        return builder;
+    }
+
     public static ICommunicatorRestEntityBuilder<TEntity> WithIdEndpoint<TEntity>(this ICommunicatorRestEntityBuilder<TEntity> builder, Func<string> getEndpoint)
         where TEntity : class
     {
@@ -34,7 +50,7 @@ public static ICommunicatorRestEntityBuilder<TEntity, TKey> WithIdEndpoint<TEnti
         return builder;
     }
 
-    public static ICommunicatorRestEntityBuilder<TEntity> WithIdEndpoint<TEntity>(this ICommunicatorRestEntityBuilder<TEntity> builder, Func<object, string> getEndpoint)
+    public static ICommunicatorRestEntityBuilder<TEntity> WithIdEndpoint<TEntity>(this ICommunicatorRestEntityBuilder<TEntity> builder, Func<object?, string> getEndpoint)
         where TEntity : class
     {
         builder.EntityOptions.GetIdEndpointAction = getEndpoint;
@@ -42,7 +58,7 @@ public static ICommunicatorRestEntityBuilder<TEntity> WithIdEndpoint<TEntity>(th
         return builder;
     }
 
-    public static ICommunicatorRestEntityBuilder<TEntity, TKey> WithIdEndpoint<TEntity, TKey>(this ICommunicatorRestEntityBuilder<TEntity, TKey> builder, Func<TKey, string> getEndpoint)
+    public static ICommunicatorRestEntityBuilder<TEntity, TKey> WithIdEndpoint<TEntity, TKey>(this ICommunicatorRestEntityBuilder<TEntity, TKey> builder, Func<TKey?, string> getEndpoint)
         where TEntity : class
     {
         builder.EntityOptions.GetIdEndpointAction = getEndpoint;
diff --git a/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityContext.cs b/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityContext.cs
index c897aba..e9f7081 100644
--- a/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityContext.cs
+++ b/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityContext.cs
@@ -99,13 +99,13 @@ public virtual async Task<PageResult<TEntity>> GetPageAsync(PageRequest pageRequ
         return result;
     }
 
-    public virtual async Task<TEntity> GetAsync(object id)
+    public virtual async Task<TEntity> GetAsync(object? id)
     {
         if (EntityOptions.GetIdEndpointAction is null) throw new KeyNotFoundException();
 
         var idEndpoint = EntityOptions.GetIdEndpointAction(id);
         var route = GetFullPath(idEndpoint);
-        _logger.LogInformation("Get {type}[{id}]: {route}", typeof(TEntity).Name, id.ToString(), route);
+        _logger.LogInformation("Get {type}[{id}]: {route}", typeof(TEntity).Name, id is not null ? id.ToString() : "_", route);
 
         var message = new HttpRequestMessage(HttpMethod.Get, route);
         var result = await HandleRequestAsync<TEntity>(message);
@@ -132,9 +132,9 @@ public CommunicatorRestEntityContext(HttpClient httpClient, CommunicatorRestServ
         EntityOptions = entityOptions;
     }
 
-    public override Task<TEntity> GetAsync(object id) => GetAsync((TKey)id);
+    public override Task<TEntity> GetAsync(object? id) => GetAsync((TKey?)id);
 
-    public async Task<TEntity> GetAsync(TKey id)
+    public async Task<TEntity> GetAsync(TKey? id)
     {
         string idEndpoint;
 
diff --git a/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityOptions.cs b/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityOptions.cs
index c94146f..1696d78 100644
--- a/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityOptions.cs
+++ b/src/BitzArt.Communicator.REST/Models/CommunicatorRestEntityOptions.cs
@@ -4,8 +4,8 @@ public class CommunicatorRestEntityOptions<TEntity>
 	where TEntity : class
 {
 	public string? Endpoint { get; set; }
-	protected Func<object, string>? _getIdEndpointAction;
-    public Func<object, string>? GetIdEndpointAction
+	protected Func<object?, string>? _getIdEndpointAction;
+    public Func<object?, string>? GetIdEndpointAction
 	{
 		get => _getIdEndpointAction;
 		set => _getIdEndpointAction = value;
@@ -20,7 +20,7 @@ public CommunicatorRestEntityOptions()
 public class CommunicatorRestEntityOptions<TEntity, TKey> : CommunicatorRestEntityOptions<TEntity>
     where TEntity : class
 {
-	public new Func<TKey, string>? GetIdEndpointAction
+	public new Func<TKey?, string>? GetIdEndpointAction
 	{
 		get
 		{
@@ -34,7 +34,7 @@ public class CommunicatorRestEntityOptions<TEntity, TKey> : CommunicatorRestEnti
                 _getIdEndpointAction = null;
 				return;
             }
-            _getIdEndpointAction = (key) => value!((TKey)key);
+            _getIdEndpointAction = (key) => value!((TKey?)key);
 		}
     }
 
diff --git a/src/BitzArt.Communicator/Interfaces/ICommunicationContext.cs b/src/BitzArt.Communicator/Interfaces/ICommunicationContext.cs
index 80bb5f1..3bf8f8b 100644
--- a/src/BitzArt.Communicator/Interfaces/ICommunicationContext.cs
+++ b/src/BitzArt.Communicator/Interfaces/ICommunicationContext.cs
@@ -14,11 +14,11 @@ public interface ICommunicationContext<TEntity>
     public Task<IEnumerable<TEntity>> GetAllAsync();
     public Task<PageResult<TEntity>> GetPageAsync(int offset, int limit);
     public Task<PageResult<TEntity>> GetPageAsync(PageRequest pageRequest);
-    public Task<TEntity> GetAsync(object id);
+    public Task<TEntity> GetAsync(object? id);
 }
 
 public interface ICommunicationContext<TEntity, TKey> : ICommunicationContext<TEntity>
     where TEntity : class
 {
-    public Task<TEntity> GetAsync(TKey id);
+    public Task<TEntity> GetAsync(TKey? id);
 }
\ No newline at end of file