From b928e0fec92a339c11aa4b929cda83d7305dc54b Mon Sep 17 00:00:00 2001
From: Mikhail Shabanov <dr.mboga@yahoo.com>
Date: Sun, 16 May 2021 22:04:42 +0200
Subject: [PATCH] feature: Server error provider added, client notification
 service added

---
 .../TestContextBase.cs                        |  4 ++
 .../Model/NotificationType.cs                 |  9 ++++
 .../Pages/SearchDialog.razor                  |  6 +--
 .../Pages/SearchDialogTypeBase.cs             |  2 -
 WotBlitzStatisticsPro.Blazor/Program.cs       |  2 +
 .../Services/GraphQlBackendService.cs         | 44 +++++++++++++++-
 .../Services/INotificationsService.cs         | 19 +++++++
 .../Services/NotificationsService.cs          | 42 ++++++++++++++++
 .../Shared/MainLayout.razor                   |  1 +
 .../Shared/MainLayoutBase.cs                  | 50 +++++++++++++++++--
 .../WotBlitzStatisticsPro.Blazor.csproj       |  1 +
 .../GraphQlErrorFilter.cs                     | 22 ++++++++
 WotBlitzStatisticsPro.GraphQl/Startup.cs      |  7 ++-
 .../WotBlitzStatisticsPro.GraphQl.csproj      |  2 +-
 14 files changed, 200 insertions(+), 11 deletions(-)
 create mode 100644 WotBlitzStatisticsPro.Blazor/Model/NotificationType.cs
 create mode 100644 WotBlitzStatisticsPro.Blazor/Services/INotificationsService.cs
 create mode 100644 WotBlitzStatisticsPro.Blazor/Services/NotificationsService.cs
 create mode 100644 WotBlitzStatisticsPro.GraphQl/GraphQlErrorFilter.cs

diff --git a/WotBlitzStatisticsPro.Blazor.Tests/TestContextBase.cs b/WotBlitzStatisticsPro.Blazor.Tests/TestContextBase.cs
index 0853458..8b62163 100644
--- a/WotBlitzStatisticsPro.Blazor.Tests/TestContextBase.cs
+++ b/WotBlitzStatisticsPro.Blazor.Tests/TestContextBase.cs
@@ -13,6 +13,7 @@ namespace WotBlitzStatisticsPro.Blazor.Tests
     {
         protected Mock<IMediator> MediatorMock;
         protected Mock<ISearchDialogService> SearchServiceMock;
+        protected Mock<INotificationsService> NotificationsServiceMock;
         protected MockNavigationManager NavigationManagerMock;
 
         [SetUp]
@@ -21,13 +22,16 @@ namespace WotBlitzStatisticsPro.Blazor.Tests
             MediatorMock = new();
             SearchServiceMock = new();
             NavigationManagerMock = new();
+            NotificationsServiceMock = new ();
 
             TestContext = new Bunit.TestContext();
             TestContext.Services.AddSingleton(MediatorMock.Object);
             TestContext.Services.AddLocalization();
 
             TestContext.Services.AddSingleton<DialogService>();
+            TestContext.Services.AddSingleton<NotificationService>();
             TestContext.Services.AddSingleton(SearchServiceMock.Object);
+            TestContext.Services.AddSingleton(NotificationsServiceMock.Object);
 
 
             TestContext.Services.AddSingleton<NavigationManager>(NavigationManagerMock);
diff --git a/WotBlitzStatisticsPro.Blazor/Model/NotificationType.cs b/WotBlitzStatisticsPro.Blazor/Model/NotificationType.cs
new file mode 100644
index 0000000..718bb15
--- /dev/null
+++ b/WotBlitzStatisticsPro.Blazor/Model/NotificationType.cs
@@ -0,0 +1,9 @@
+namespace WotBlitzStatisticsPro.Blazor.Model
+{
+    public enum NotificationType
+    {
+        Info,
+        Warning,
+        Error
+    }
+}
\ No newline at end of file
diff --git a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor
index cbda9d4..54ba0b3 100644
--- a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor
+++ b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialog.razor
@@ -1,7 +1,7 @@
 @using WotBlitzStatisticsPro.Blazor.Model
 @inherits SearchDialogTypeBase
 <div class="row">
-    <div class="col-md-4">
+    <div class="col-md-4 col-4">
         <RadzenDropDown @bind-Value=@CurrentRealmType
                          Data=@Realms
                          ValueProperty="RealmType"
@@ -11,7 +11,7 @@
             </Template>
         </RadzenDropDown>
     </div>
-    <div class="col-md-8">
+    <div class="col-md-8 col-8">
         <RadzenTextBox Placeholder=@($"{Localizer["Search"]}...") Change=@OnSearchTextChange Disabled="@ComponentBusy" Style="width: 150px;"/>
     </div>
 </div>
@@ -21,7 +21,7 @@
     <RadzenListBox @bind-Value=@CurrentValue
                    Data=@FilteredList
                    ValueProperty="ItemId"
-                   Style="height:335px; width: 100%; margin-top: 10px;"
+                   Style="height:330px; width: 100%; margin-top: 10px;"
                    Visible="@(!ComponentBusy)">
         <Template>
             <!--ToDo: Create new component that will show nick[clan] {WinRate with color}, {battles count with translatable word "battles"}. And another component for Clans-->
diff --git a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs
index 832ba50..c396067 100644
--- a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs
+++ b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs
@@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 using Radzen;
 using WotBlitzStatisticsPro.Blazor.GraphQl;
-//using WotBlitzStatisticsPro.Blazor.GraphQl;
 using WotBlitzStatisticsPro.Blazor.Messages;
 using WotBlitzStatisticsPro.Blazor.Model;
 using WotBlitzStatisticsPro.Blazor.Services;
@@ -63,7 +62,6 @@ namespace WotBlitzStatisticsPro.Blazor.Pages
             ComponentBusy = true;
             await InvokeAsync(StateHasChanged);
 
-            // ToDo: Move this call to a service
             var accounts =
                 await GraphQlBackendService.FindPlayers(value, CurrentRealmType);
 
diff --git a/WotBlitzStatisticsPro.Blazor/Program.cs b/WotBlitzStatisticsPro.Blazor/Program.cs
index b633b48..b3a0860 100644
--- a/WotBlitzStatisticsPro.Blazor/Program.cs
+++ b/WotBlitzStatisticsPro.Blazor/Program.cs
@@ -24,12 +24,14 @@ namespace WotBlitzStatisticsPro.Blazor
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
             builder.Services.AddScoped<DialogService>();
+            builder.Services.AddScoped<NotificationService>();
             builder.Services.AddScoped<ISearchDialogService, SearchDialogService>();
 
             builder.Services.AddMediatR(typeof(Program));
 
             builder.Services.AddSingleton<NavigationMessagesInterceptor>();
             builder.Services.AddScoped<ILocalStorageService, LocalStorageService>();
+            builder.Services.AddSingleton<INotificationsService, NotificationsService>();
 
             // StrawberryShake GraphQL Client
             builder.Services
diff --git a/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs b/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs
index f11eb7f..caf8469 100644
--- a/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs
+++ b/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using StrawberryShake;
 using WotBlitzStatisticsPro.Blazor.GraphQl;
 
 namespace WotBlitzStatisticsPro.Blazor.Services
@@ -8,10 +10,14 @@ namespace WotBlitzStatisticsPro.Blazor.Services
     public class GraphQlBackendService: IGraphQlBackendService
     {
         private readonly WotBlitzStatisticsProClient _client;
+        private readonly INotificationsService _notificationsService;
 
-        public GraphQlBackendService(WotBlitzStatisticsProClient client)
+        public GraphQlBackendService(
+            WotBlitzStatisticsProClient client,
+            INotificationsService notificationsService)
         {
             _client = client;
+            _notificationsService = notificationsService;
         }
 
         public async Task<IReadOnlyList<IFindPlayers_Players>?> FindPlayers(string accountNick, RealmType realmType)
@@ -19,6 +25,7 @@ namespace WotBlitzStatisticsPro.Blazor.Services
             var accounts =
                 await _client.FindPlayers.ExecuteAsync(accountNick, realmType, GetLanguage());
 
+            CheckErrors(accounts.Errors);
             return accounts.Data?.Players;
         }
 
@@ -27,6 +34,7 @@ namespace WotBlitzStatisticsPro.Blazor.Services
             var clans =
                 await _client.FindClans.ExecuteAsync(clanNameOrTag, realmType, GetLanguage());
 
+            CheckErrors(clans.Errors);
             return clans.Data?.Clans;
         }
 
@@ -45,5 +53,39 @@ namespace WotBlitzStatisticsPro.Blazor.Services
             }
         }
 
+        private void CheckErrors(IReadOnlyCollection<IClientError> errors)
+        {
+            var messages = new List<string>();
+
+            if (errors.Count > 0)
+            {
+                foreach (var error in errors)
+                {
+                    if (error.Extensions != null)
+                    {
+                        foreach (var errorExt in error.Extensions)
+                        {
+                            var serializedError = errorExt.Value;
+                            if (serializedError is string realError)
+                            {
+                                var jObject = JObject.Parse(realError);
+                                var firstErrorInfo = jObject["errors"]?[0];
+                                var message = firstErrorInfo?["extensions"]?["message"];
+                                if (message != null)
+                                {
+                                    messages.Add(message.ToString());
+                                }
+                            }
+                        }
+                    }   
+                }
+            }
+
+            if (messages.Count > 0)
+            {
+                _notificationsService.ReportError("Backend error",string.Join(";", messages));
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/WotBlitzStatisticsPro.Blazor/Services/INotificationsService.cs b/WotBlitzStatisticsPro.Blazor/Services/INotificationsService.cs
new file mode 100644
index 0000000..54cfceb
--- /dev/null
+++ b/WotBlitzStatisticsPro.Blazor/Services/INotificationsService.cs
@@ -0,0 +1,19 @@
+using System;
+using WotBlitzStatisticsPro.Blazor.Model;
+
+namespace WotBlitzStatisticsPro.Blazor.Services
+{
+    public interface INotificationsService
+    {
+        NotificationType Type { get; }
+
+        string Summary { get; }
+        string Message { get; }
+
+        event Action MessageArrived;
+
+        void ReportInfo(string summary, string message);
+        void ReportWarning(string summary, string message);
+        void ReportError(string summary, string message);
+    }
+}
\ No newline at end of file
diff --git a/WotBlitzStatisticsPro.Blazor/Services/NotificationsService.cs b/WotBlitzStatisticsPro.Blazor/Services/NotificationsService.cs
new file mode 100644
index 0000000..b24a072
--- /dev/null
+++ b/WotBlitzStatisticsPro.Blazor/Services/NotificationsService.cs
@@ -0,0 +1,42 @@
+using System;
+using WotBlitzStatisticsPro.Blazor.Model;
+
+namespace WotBlitzStatisticsPro.Blazor.Services
+{
+    public class NotificationsService: INotificationsService
+    {
+        // ToDo: Add JSInterop console.log
+
+        public NotificationType Type { get; private set; } = NotificationType.Info;
+        
+        public string Message { get; private set; } = string.Empty;
+
+        public string Summary { get; private set; }
+
+        public event Action MessageArrived;
+
+        public void ReportInfo(string summary, string message)
+        {
+            Type = NotificationType.Info;
+            Message = message;
+            Summary = summary;
+            MessageArrived?.Invoke();
+        }
+
+        public void ReportWarning(string summary, string message)
+        {
+            Type = NotificationType.Warning;
+            Message = message;
+            Summary = summary;
+            MessageArrived?.Invoke();
+        }
+
+        public void ReportError(string summary, string message)
+        {
+            Type = NotificationType.Error;
+            Message = message;
+            Summary = summary;
+            MessageArrived?.Invoke();
+        }
+    }
+}
\ No newline at end of file
diff --git a/WotBlitzStatisticsPro.Blazor/Shared/MainLayout.razor b/WotBlitzStatisticsPro.Blazor/Shared/MainLayout.razor
index 837dc9e..ad4cfc6 100644
--- a/WotBlitzStatisticsPro.Blazor/Shared/MainLayout.razor
+++ b/WotBlitzStatisticsPro.Blazor/Shared/MainLayout.razor
@@ -1,6 +1,7 @@
 @inherits MainLayoutBase
 
 <RadzenDialog />
+<RadzenNotification />
 
 <RadzenHeader>
     <ChildContent>
diff --git a/WotBlitzStatisticsPro.Blazor/Shared/MainLayoutBase.cs b/WotBlitzStatisticsPro.Blazor/Shared/MainLayoutBase.cs
index 9008eb6..c86e6c2 100644
--- a/WotBlitzStatisticsPro.Blazor/Shared/MainLayoutBase.cs
+++ b/WotBlitzStatisticsPro.Blazor/Shared/MainLayoutBase.cs
@@ -1,18 +1,27 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Globalization;
 using MediatR;
 using Microsoft.AspNetCore.Components;
 using Radzen;
 using Radzen.Blazor;
 using WotBlitzStatisticsPro.Blazor.Messages;
+using WotBlitzStatisticsPro.Blazor.Model;
+using WotBlitzStatisticsPro.Blazor.Services;
 
 namespace WotBlitzStatisticsPro.Blazor.Shared
 {
-    public class MainLayoutBase: LayoutComponentBase
+    public class MainLayoutBase: LayoutComponentBase, IDisposable
     {
         [Inject]
         private IMediator Mediator { get; set; }
 
+        [Inject]
+        private INotificationsService NotificationsService { get; set; }
+
+        [Inject]
+        NotificationService RadzenNotificationService { get; set; }
+
         public RadzenSidebar Sidebar0;
         public RadzenBody Body0;
         public bool SidebarExpanded { get; set; } = false;
@@ -52,7 +61,37 @@ namespace WotBlitzStatisticsPro.Blazor.Shared
             //        }
             //    }
             //}
-            
+
+            NotificationsService.MessageArrived += NotificationsService_MessageArrived;
+        }
+
+        private void NotificationsService_MessageArrived()
+        {
+            NotificationSeverity severity;
+            switch (NotificationsService.Type)
+            {
+                case NotificationType.Info:
+                    severity = NotificationSeverity.Info;
+                    break;
+                case NotificationType.Warning:
+                    severity = NotificationSeverity.Warning;
+                    break;
+                case NotificationType.Error:
+                    severity = NotificationSeverity.Error;
+                    break;
+                default:
+                    severity = NotificationSeverity.Success;
+                    break;
+            }
+
+            var message = new NotificationMessage
+            {
+                Severity = severity,
+                Summary = NotificationsService.Summary, 
+                Detail = NotificationsService.Message, 
+                Duration = 40000
+            };
+            RadzenNotificationService.Notify(message);
         }
 
         public void InvertSideBar()
@@ -68,5 +107,10 @@ namespace WotBlitzStatisticsPro.Blazor.Shared
                 CurrentCultureInfo = CultureInfos[item.Value];
             }
         }
+
+        public void Dispose()
+        {
+            NotificationsService.MessageArrived -= NotificationsService_MessageArrived;
+        }
     }
 }
\ No newline at end of file
diff --git a/WotBlitzStatisticsPro.Blazor/WotBlitzStatisticsPro.Blazor.csproj b/WotBlitzStatisticsPro.Blazor/WotBlitzStatisticsPro.Blazor.csproj
index 3dab03a..d8258e3 100644
--- a/WotBlitzStatisticsPro.Blazor/WotBlitzStatisticsPro.Blazor.csproj
+++ b/WotBlitzStatisticsPro.Blazor/WotBlitzStatisticsPro.Blazor.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Radzen.Blazor" Version="3.2.0" />
     <PackageReference Include="StrawberryShake.CodeGeneration.CSharp.Analyzers" Version="11.2.2" />
     <PackageReference Include="StrawberryShake.Transport.Http" Version="11.2.2" />
diff --git a/WotBlitzStatisticsPro.GraphQl/GraphQlErrorFilter.cs b/WotBlitzStatisticsPro.GraphQl/GraphQlErrorFilter.cs
new file mode 100644
index 0000000..d96c894
--- /dev/null
+++ b/WotBlitzStatisticsPro.GraphQl/GraphQlErrorFilter.cs
@@ -0,0 +1,22 @@
+using HotChocolate;
+using Microsoft.Extensions.Logging;
+
+namespace WotBlitzStatisticsPro.GraphQl
+{
+    public class GraphQlErrorFilter: IErrorFilter
+    {
+        private readonly ILogger<GraphQlErrorFilter> _logger;
+
+        public GraphQlErrorFilter(ILogger<GraphQlErrorFilter> logger)
+        {
+            _logger = logger;
+        }
+
+        public IError OnError(IError error)
+        {
+            _logger.LogError(error.Exception, $"Operation {error.Path}");
+
+            return error;
+        }
+    }
+}
\ No newline at end of file
diff --git a/WotBlitzStatisticsPro.GraphQl/Startup.cs b/WotBlitzStatisticsPro.GraphQl/Startup.cs
index ddb038b..5840c00 100644
--- a/WotBlitzStatisticsPro.GraphQl/Startup.cs
+++ b/WotBlitzStatisticsPro.GraphQl/Startup.cs
@@ -2,6 +2,7 @@ using System;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
+using HotChocolate;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -11,6 +12,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using WotBlitzStatisticsPro.Common;
 using WotBlitzStatisticsPro.Common.Model;
@@ -77,7 +79,6 @@ namespace WotBlitzStatisticsPro.GraphQl
                     };
                 });
 
-
             // Add GraphQL Services
             services.AddGraphQLServer()
                 .AddQueryType(d => d.Name("Query"))
@@ -107,6 +108,10 @@ namespace WotBlitzStatisticsPro.GraphQl
 
                         return ValueTask.CompletedTask;
                     })
+                .ModifyRequestOptions(opt => opt.IncludeExceptionDetails = true)
+                .AddErrorFilter(sp =>
+                    new GraphQlErrorFilter
+                        (sp.GetApplicationService<ILogger<GraphQlErrorFilter>>()))
                 ;
 
             // Blazor
diff --git a/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj b/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj
index c70155d..94b5034 100644
--- a/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj
+++ b/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.4" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.10.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.10.0" />
   </ItemGroup>