Minor refactoring of BalzorUtils

Author: yfranz

src/Client/Client.Services/CRUDService.cs

@@ -3,14 +3,15 @@
 using DevInstance.BlazorUtils.Services;
 using DevInstance.DevCoreApp.Shared.Services;
 using DevInstance.BlazorUtils.Services.Wasm;
+using DevInstance.LogScope;
 
 namespace DevInstance.DevCoreApp.Client.Services;
 
-public class CRUDService<T> : ServiceBase, ICRUDService<T> where T : ModelItem
+public class CRUDService<T> : BaseService, ICRUDService<T> where T : ModelItem
 {
     IApiContext<T> Api { get; set; }
 
-    public CRUDService(IApiContext<T> api) 
+    public CRUDService(IApiContext<T> api)
     {
         Api = api;
     }
@@ -19,63 +20,75 @@ public CRUDService(IApiContext<T> api)
 
     public async Task<ServiceActionResult<T?>> GetAsync(string id)
     {
-        return await HandleWebApiCallAsync(
-            async () =>
-            {
-                var api = Api.Get(id);
+        using (var log = Log.TraceScope())
+        {
+            return await ServiceUtils.HandleWebApiCallAsync(log,
+                async (l) =>
+                {
+                    var api = Api.Get(id);
 
-                return await api.ExecuteAsync();
-            }
-        );
+                    return await api.ExecuteAsync();
+                }
+            );
+        }
     }
 
     public void SetDataUpdate(T item)
     {
         OnDataUpdate?.Invoke(item);
     }
-    
+
     public async Task<ServiceActionResult<T?>> AddNewAsync(T item)
     {
-        return await HandleWebApiCallAsync(
-            async () =>
-            {
-                var response = await Api.Post(item).ExecuteAsync();
-                if (response != null)
+        using (var log = Log.TraceScope())
+        {
+            return await ServiceUtils.HandleWebApiCallAsync(log,
+                async (l) =>
                 {
-                    OnDataUpdate?.Invoke(response);
+                    var response = await Api.Post(item).ExecuteAsync();
+                    if (response != null)
+                    {
+                        OnDataUpdate?.Invoke(response);
+                    }
+                    return response;
                 }
-                return response;
-            }
-        );
+            );
+        }
     }
 
     public async Task<ServiceActionResult<T?>> UpdateAsync(T item)
     {
-        return await HandleWebApiCallAsync(
-            async () =>
-            {
-                var response = await Api.Put(item.Id, item).ExecuteAsync();
-                if (response != null)
+        using (var log = Log.TraceScope())
+        {
+            return await ServiceUtils.HandleWebApiCallAsync(log,
+                async (l) =>
                 {
-                    OnDataUpdate?.Invoke(response);
+                    var response = await Api.Put(item.Id, item).ExecuteAsync();
+                    if (response != null)
+                    {
+                        OnDataUpdate?.Invoke(response);
+                    }
+                    return response;
                 }
-                return response;
-            }
-        );
+            );
+        }
     }
 
     public async Task<ServiceActionResult<bool>> RemoveAsync(T item)
     {
-        return await HandleWebApiCallAsync(
-            async () =>
-            {
-                var response = await Api.Delete(item.Id).ExecuteAsync();
-                if (response != null)
+        using (var log = Log.TraceScope())
+        {
+            return await ServiceUtils.HandleWebApiCallAsync(log,
+                async (l) =>
                 {
-                    OnDataUpdate?.Invoke(default(T));
+                    var response = await Api.Delete(item.Id).ExecuteAsync();
+                    if (response != null)
+                    {
+                        OnDataUpdate?.Invoke(default(T));
+                    }
+                    return true;
                 }
-                return true;
-            }
-        );
+            );
+        }
     }
 }

src/Client/Client.Services/ServiceBase.cs

@@ -0,0 +1,12 @@
+using DevInstance.LogScope;
+using System.Net;
+
+namespace DevInstance.DevCoreApp.Client.Services;
+
+public delegate void ResultHandler<T>(T result);
+
+public class BaseService
+{
+    public IScopeLog? Log { get; protected set; } = null;
+
+}

src/Client/Client.Services/SettingsService.cs

@@ -5,7 +5,7 @@
 
 namespace DevInstance.DevCoreApp.Client.Services;
 
-public class SettingsService : ServiceBase, ISettingsService
+public class SettingsService : BaseService, ISettingsService
 {
     SettingsLanguageItem[] supportedLanguages;
 

src/Client/Client.Services/WeatherForecastService.cs

@@ -3,6 +3,7 @@
 using DevInstance.LogScope;
 using DevInstance.DevCoreApp.Client.Services.Net.Api;
 using DevInstance.DevCoreApp.Shared.Services;
+using DevInstance.BlazorUtils.Services.Wasm;
 
 namespace DevInstance.DevCoreApp.Client.Services;
 
@@ -19,25 +20,28 @@ public WeatherForecastService(INetApiRepository api, IScopeManager lp)
 
     public async Task<ServiceActionResult<ModelList<WeatherForecastItem>?>> GetItemsAsync(int? top, int? page, WeatherForecastFields? sortBy, bool? isAsc, string? search)
     {
-        return await HandleWebApiCallAsync(
-            async () =>
-            {
-                var api = Api.GetWeatherForecastApi().Get();
-                if(top.HasValue)
+        using (var log = Log.TraceScope())
+        {
+            return await ServiceUtils.HandleWebApiCallAsync(log,
+                async (l) =>
                 {
-                    api = api.Top(top.Value);
-                }
-                if (page.HasValue)
-                {
-                    api = api.Page(page.Value);
-                }
-                if (sortBy.HasValue)
-                {
-                    api = api.Sort(sortBy.Value.ToString(), isAsc ?? true);
-                }
+                    var api = Api.GetWeatherForecastApi().Get();
+                    if (top.HasValue)
+                    {
+                        api = api.Top(top.Value);
+                    }
+                    if (page.HasValue)
+                    {
+                        api = api.Page(page.Value);
+                    }
+                    if (sortBy.HasValue)
+                    {
+                        api = api.Sort(sortBy.Value.ToString(), isAsc ?? true);
+                    }
 
-                return await api.ListAsync();
-            }
-        );
+                    return await api.ListAsync();
+                }
+            );
+        }
     }
 }

…BlazorUtils/Services/Wasm/ServiceBase.cs …lazorUtils/Services/Wasm/ServiceUtils.cssrc/Client/DevInstance.BlazorUtils/Services/Wasm/ServiceBase.cs renamed to src/Client/DevInstance.BlazorUtils/Services/Wasm/ServiceUtils.cs src/Client/DevInstance.BlazorUtils/Services/Wasm/ServiceBase.cs renamed to src/Client/DevInstance.BlazorUtils/Services/Wasm/ServiceUtils.cs

@@ -5,21 +5,20 @@ namespace DevInstance.BlazorUtils.Services.Wasm;
 
 public delegate void ResultHandler<T>(T result);
 
-public class ServiceBase
+//TODO: make it utils as for server. move the base service to the client project
+public static class ServiceUtils
 {
-    public IScopeLog? Log { get; protected set; } = null;
+    public delegate Task<T> WebApiHandlerAsync<T>(IScopeLog log);
 
-    public delegate Task<T> WebApiHandlerAsync<T>();
-
-    protected async Task<ServiceActionResult<T>> HandleWebApiCallAsync<T>(WebApiHandlerAsync<T> handler)
+    public static async Task<ServiceActionResult<T>> HandleWebApiCallAsync<T>(IScopeLog log, WebApiHandlerAsync<T> handler)
     {
-        using (var l = Log.TraceScope("ServiceBase").TraceScope())
+        using (var l = log.TraceScope("ServiceUtils").TraceScope())
         {
             try
             {
                 return new ServiceActionResult<T>
                 {
-                    Result = await handler(),
+                    Result = await handler(l),
                     Success = true,
                     IsAuthorized = true,
                 };