UserFriendlyException

src/Hotline.Api/Controllers/TestController.cs

@@ -11,6 +11,7 @@ using NewRock.Sdk;
 using NewRock.Sdk.Security;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
+using XF.Domain.Exceptions;
 
 namespace Hotline.Api.Controllers
 {
@@ -93,13 +94,7 @@ namespace Hotline.Api.Controllers
         {
             //var answer = await _ivrDomainService.GetVoiceEndAnswerAsync("3", HttpContext.RequestAborted);
             //Console.WriteLine(answer.Content);
-
-            _logger.LogInformation("info");
-            _logger.LogCritical("critical");
-            _logger.LogDebug("debug");
-            _logger.LogError("error");
-            _logger.LogTrace("trace");
-            _logger.LogWarning("warning");
+            throw new UserFriendlyException(2001, "test");
         }
     }
 }

src/Hotline.Api/Filters/UserFriendlyExceptionFilter.cs

@@ -36,15 +36,15 @@ namespace Hotline.Api.Filters
                 action = context.HttpContext.Request.GetDisplayUrl();
             }
 
-            if (context.Exception is UserFriendlyException userFriendlyException)
+            if (context.Exception is UserFriendlyException ex)
             {
-                code = userFriendlyException.Code;
-                statusCode = userFriendlyException.Code;
-                error = userFriendlyException.Message;
-                //message = userFriendlyException.Message;
+                code = ex.Code;
+                statusCode = ex.Code;
+                if (!string.IsNullOrEmpty(ex.FriendlyMessage))
+                    message = ex.FriendlyMessage;
             }
 
-            if (code == 500)
+            if (code >= 400)
             {
                 _logger.LogError(context.Exception, action);
             }

src/Hotline.Api/Program.cs

@@ -13,7 +13,6 @@ try
 
     builder.Host.UseSerilog((ctx, lc) => lc
         //.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
-        //.WriteTo.Exceptionless()
         .Enrich.FromLogContext()
         .ReadFrom.Configuration(ctx.Configuration))
         ;

src/Hotline.Api/StartupExtensions.cs

@@ -179,7 +179,6 @@ internal static class StartupExtensions
         })
             .AddValidatorsFromAssembly(typeof(AppContractsStartupExtensions).Assembly);
 
-        //services.AddExceptionless("zrSsxjdFC1Uv2WBckZn3RYxjpKKdxfYAN50aFiuV");
         services.AddExceptionless(configuration);
 
         return builder.Build();

src/Hotline.Api/appsettings.Development.json

@@ -65,7 +65,7 @@
     "RestCategory": "08daa5f5-ac7a-4ced-8295-1c78baa15f9e"
   },
   "Exceptionless": {
-    "ServerUrl": "http://192.168.100.217:5000",
-    "ApiKey": "zrSsxjdFC1Uv2WBckZn3RYxjpKKdxfYAN50aFiuV"
+    "ServerUrl": "http://log.fw.com",
+    "ApiKey": "lOrLM87GirnokXWilYixwJ0zxUzhlC2sc7v3ggp4"
   }
 }

src/Hotline.Api/appsettings.json

@@ -71,5 +71,9 @@
     "WorkDay": [ 1, 2, 3, 4, 5, 0, 6 ],
     "WorkCategory": "08da9b9f-a35d-4ade-8ea7-55e8abbcdefd",
     "RestCategory": "08daa5f5-ac7a-4ced-8295-1c78baa15f9e"
+  },
+  "Exceptionless": {
+    "ServerUrl": "http://log.fw.com",
+    "ApiKey": "zrSsxjdFC1Uv2WBckZn3RYxjpKKdxfYAN50aFiuV"
   }
 }

src/Hotline.Application/Handlers/CallState/AlertExtToOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/AlertExtToOuterNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class AlertExtToOuterNotificationHandler:INotificationHandler<AlertExtToOuterNotification>
     {

src/Hotline.Application/Handlers/CallState/AlertMenuToOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/AlertMenuToOuterNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class AlertMenuToOuterNotificationHandler:INotificationHandler<AlertMenuToOuterNotification>
     {

src/Hotline.Application/Handlers/CallState/AlertVisitorToExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/AlertVisitorToExtNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class AlertVisitorToExtNotificationHandler: INotificationHandler<AlertVisitorToExtNotification>
     {

src/Hotline.Application/Handlers/CallState/DtmfNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/DtmfNotificationHandler.cs

@@ -7,7 +7,7 @@ using MediatR;
 using Microsoft.Extensions.Options;
 using NewRock.Sdk;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class DtmfNotificationHandler : BaseHandler, INotificationHandler<DtmfNotification>
     {

src/Hotline.Application/Handlers/CallState/FailedNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/FailedNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class FailedNotificationHandler:INotificationHandler<FailedNotification>
     {

src/Hotline.Application/Handlers/CallState/RingExtToOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/RingExtToOuterNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class RingExtToOuterNotificationHandler:INotificationHandler<RingExtToOuterNotification>
     {

src/Hotline.Application/Handlers/CallState/RingMenuToExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/RingMenuToExtNotificationHandler.cs

@@ -1,7 +1,7 @@
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class RingMenuToExtNotificationHandler:INotificationHandler<RingMenuToExtNotification>
     {

src/Hotline.Application/Handlers/CallState/RingVisitorToExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/CallState/RingVisitorToExtNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.CallState
+namespace Hotline.Application.Handlers.CallCenter.CallState
 {
     public class RingVisitorToExtNotificationHandler:INotificationHandler<RingVisitorToExtNotification>
     {

src/Hotline.Application/Handlers/ExtState/BusyNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/ExtState/BusyNotificationHandler.cs

@@ -4,7 +4,7 @@ using Hotline.Share.Notifications;
 using MediatR;
 using XF.Domain.Cache;
 
-namespace Hotline.Application.Handlers.ExtState
+namespace Hotline.Application.Handlers.CallCenter.ExtState
 {
     public class BusyNotificationHandler:INotificationHandler<BusyNotification>
     {

src/Hotline.Application/Handlers/ExtState/IdleNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/ExtState/IdleNotificationHandler.cs

@@ -4,7 +4,7 @@ using Hotline.Share.Notifications;
 using MediatR;
 using XF.Domain.Cache;
 
-namespace Hotline.Application.Handlers.ExtState
+namespace Hotline.Application.Handlers.CallCenter.ExtState
 {
     public class IdleNotificationHandler:INotificationHandler<IdleNotification>
     {

src/Hotline.Application/Handlers/ExtState/OfflineNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/ExtState/OfflineNotificationHandler.cs

@@ -4,7 +4,7 @@ using Hotline.Share.Notifications;
 using MediatR;
 using XF.Domain.Cache;
 
-namespace Hotline.Application.Handlers.ExtState
+namespace Hotline.Application.Handlers.CallCenter.ExtState
 {
     public class OfflineNotificationHandler: INotificationHandler<OfflineNotification>
     {

src/Hotline.Application/Handlers/ExtState/OnlineNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/ExtState/OnlineNotificationHandler.cs

@@ -4,7 +4,7 @@ using Hotline.Share.Notifications;
 using MediatR;
 using XF.Domain.Cache;
 
-namespace Hotline.Application.Handlers.ExtState
+namespace Hotline.Application.Handlers.CallCenter.ExtState
 {
     public class OnlineNotificationHandler : INotificationHandler<OnlineNotification>
     {

src/Hotline.Application/Handlers/FlowControl/AnswerExtToOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerExtToOuterNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class AnswerExtToOuterNotificationHandler:INotificationHandler<AnswerExtToOuterNotification>
     {

src/Hotline.Application/Handlers/FlowControl/AnswerViisitorToExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerViisitorToExtNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class AnswerViisitorToExtNotificationHandler:INotificationHandler<AnswerViisitorToExtNotification>
     {

src/Hotline.Application/Handlers/FlowControl/AnsweredExtToOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToOuterNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class AnsweredExtToOuterNotificationHandler:INotificationHandler<AnsweredExtToOuterNotification>
     {

src/Hotline.Application/Handlers/FlowControl/AnsweredExtToOuterToExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToOuterToExtNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class AnsweredExtToOuterToExtNotificationHandler:INotificationHandler<AnsweredExtToOuterToExtNotification>
     {

src/Hotline.Application/Handlers/FlowControl/AnsweredVisitorToExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredVisitorToExtNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class AnsweredVisitorToExtNotificationHandler:INotificationHandler<AnsweredVisitorToExtNotification>
     {

src/Hotline.Application/Handlers/FlowControl/ByeExtAndOuterOneNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndOuterOneNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class ByeExtAndOuterOneNotificationHandler:INotificationHandler<ByeExtAndOuterOneNotification>
     {

src/Hotline.Application/Handlers/FlowControl/ByeExtAndOuterTwoNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndOuterTwoNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class ByeExtAndOuterTwoNotificationHandler : INotificationHandler<ByeExtAndOuterTwoNotification>
     {

src/Hotline.Application/Handlers/FlowControl/ByeOuterAndOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeOuterAndOuterNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class ByeOuterAndOuterNotificationHandler:INotificationHandler<ByeOuterAndOuterNotification>
     {

src/Hotline.Application/Handlers/FlowControl/ByeVisitorAndExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndExtNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class ByeVisitorAndExtNotificationHandler:INotificationHandler<ByeVisitorAndExtNotification>
     {

src/Hotline.Application/Handlers/FlowControl/ByeVisitorAndOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndOuterNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class ByeVisitorAndOuterNotificationHandler:INotificationHandler<ByeVisitorAndOuterNotification>
     {

src/Hotline.Application/Handlers/FlowControl/ByeVisitorOffNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorOffNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class ByeVisitorOffNotificationHandler:INotificationHandler<ByeVisitorOffNotification>
     {

src/Hotline.Application/Handlers/FlowControl/CdrNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/CdrNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class CdrNotificationHandler:INotificationHandler<CdrNotification>
     {

src/Hotline.Application/Handlers/FlowControl/DivertVisitorToExtNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/DivertVisitorToExtNotificationHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class DivertVisitorToExtNotificationHandler:INotificationHandler<DivertVisitorToExtNotification>
     {

src/Hotline.Application/Handlers/FlowControl/EndOfAnnOuterToMenuNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/EndOfAnnOuterToMenuNotificationHandler.cs

@@ -7,7 +7,7 @@ using MediatR;
 using Microsoft.Extensions.Options;
 using NewRock.Sdk;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class EndOfAnnOuterToMenuNotificationHandler:BaseHandler,INotificationHandler<EndOfAnnOuterToMenuNotification>
     {

src/Hotline.Application/Handlers/FlowControl/EndOfAnnVisitorToMenuNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/EndOfAnnVisitorToMenuNotificationHandler.cs

@@ -7,7 +7,7 @@ using MediatR;
 using Microsoft.Extensions.Options;
 using NewRock.Sdk;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
 
     public class EndOfAnnVisitorToMenuNotificationHandler:BaseHandler,INotificationHandler<EndOfAnnVisitorToMenuNotification>

src/Hotline.Application/Handlers/FlowControl/IncomingNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/IncomingNotificationHandler.cs

@@ -13,7 +13,7 @@ using NewRock.Sdk.Transfer.Connect.Request;
 using XF.Domain.Cache;
 using XF.Domain.Constants;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class IncomingNotificationHandler : INotificationHandler<IncomingNotification>
     {

src/Hotline.Application/Handlers/FlowControl/InviteNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/InviteNotificationHandler.cs

@@ -12,7 +12,7 @@ using NewRock.Sdk;
 using NewRock.Sdk.Accept.Request;
 using NewRock.Sdk.Control.Request;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class InviteNotificationHandler : INotificationHandler<InviteNotification>
     {

src/Hotline.Application/Handlers/FlowControl/QueueVisitorToGroupBusyNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/FlowControl/QueueVisitorToGroupBusyNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.FlowControl
+namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
     public class QueueVisitorToGroupBusyNotificationHandler:INotificationHandler<QueueVisitorToGroupBusyNotification>
     {

src/Hotline.Application/Handlers/System/BootupNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/System/BootupNotificationHandler.cs

@@ -5,7 +5,7 @@ using Hotline.CallCenter.Tels;
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.System
+namespace Hotline.Application.Handlers.CallCenter.System
 {
     public class BootupNotificationHandler : INotificationHandler<BootupNotification>
     {

src/Hotline.Application/Handlers/Transient/TransientOuterNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/Transient/TransientOuterNotificationHandler.cs

@@ -5,7 +5,7 @@ using Hotline.Share.Notifications;
 using Hotline.Tools;
 using MediatR;
 
-namespace Hotline.Application.Handlers.Transient
+namespace Hotline.Application.Handlers.CallCenter.Transient
 {
     public class TransientOuterNotificationHandler:INotificationHandler<TransientOuterNotification>
     {

src/Hotline.Application/Handlers/Transient/TransinetVisitorNotificationHandler.cs → src/Hotline.Application/Handlers/CallCenter/Transient/TransinetVisitorNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.Share.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Handlers.Transient
+namespace Hotline.Application.Handlers.CallCenter.Transient
 {
     public class TransinetVisitorNotificationHandler:INotificationHandler<TransientVisitorNotification>
     {

src/XF.Domain/Exceptions/UserFriendlyException.cs

@@ -10,25 +10,44 @@ namespace XF.Domain.Exceptions
     public class UserFriendlyException : Exception
     {
         public int Code { get; set; }
+        public string FriendlyMessage { get; set; }
 
         public UserFriendlyException()
         {
+            Code = 500;
+        }
+
+        public UserFriendlyException(string error) : base(error)
+        {
+            Code = 500;
+        }
 
+        public UserFriendlyException(int code, string error) : base(error)
+        {
+            Code = code;
+        }
+
+        public UserFriendlyException(int code, string error, Exception inner) : base(error, inner)
+        {
+            Code = code;
         }
 
-        public UserFriendlyException(string message) : base(message)
+        public UserFriendlyException(string error, string friendlyMessage) : base(error)
         {
             Code = 500;
+            FriendlyMessage = friendlyMessage;
         }
 
-        public UserFriendlyException(int code, string message) : base(message)
+        public UserFriendlyException(int code, string error, string friendlyMessage) : base(error)
         {
             Code = code;
+            FriendlyMessage = friendlyMessage;
         }
 
-        public UserFriendlyException(int code, string message, Exception inner) : base(message, inner)
+        public UserFriendlyException(int code, string error, string friendlyMessage, Exception inner) : base(error, inner)
         {
             Code = code;
+            FriendlyMessage = friendlyMessage;
         }
 
         protected UserFriendlyException(