From 7487f5c5b480cb9885b59699256a509244e89b36 Mon Sep 17 00:00:00 2001
From: Luka Grabarevic <lgrabarevic@artiso.com>
Date: Thu, 17 May 2018 16:55:33 +0200
Subject: [PATCH] fix issue with notification title differ from build status
 when using group by pullrequest

---
 .../BuildsAppReborn.Access.UI.csproj          |  1 +
 .../DefaultNotificationProvider.cs            |  7 ++--
 .../Notifications/NotificationHelper.cs       | 10 +++++-
 .../Notifications/NotificationProviderBase.cs | 32 +++++++++++++++++++
 .../Windows10NotificationProvider.cs          | 13 ++++++--
 BuildsAppReborn.Client/Cache/BuildCache.cs    | 10 +++---
 .../GlobalSettingsContainer.cs                |  1 +
 .../Models/GeneralSettings.cs                 |  2 ++
 8 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 BuildsAppReborn.Access.UI/Notifications/NotificationProviderBase.cs

diff --git a/BuildsAppReborn.Access.UI/BuildsAppReborn.Access.UI.csproj b/BuildsAppReborn.Access.UI/BuildsAppReborn.Access.UI.csproj
index 5463a7d..94d8376 100644
--- a/BuildsAppReborn.Access.UI/BuildsAppReborn.Access.UI.csproj
+++ b/BuildsAppReborn.Access.UI/BuildsAppReborn.Access.UI.csproj
@@ -62,6 +62,7 @@
     </Compile>
     <Compile Include="Base\View\BuildProviderViewBase.cs" />
     <Compile Include="Notifications\NotificationHelper.cs" />
+    <Compile Include="Notifications\NotificationProviderBase.cs" />
     <Compile Include="Notifications\Windows10NotificationProvider.cs" />
     <Compile Include="Notifications\DefaultNotificationProvider.cs" />
     <Compile Include="Resources\Resource.Designer.cs">
diff --git a/BuildsAppReborn.Access.UI/Notifications/DefaultNotificationProvider.cs b/BuildsAppReborn.Access.UI/Notifications/DefaultNotificationProvider.cs
index 6576c85..0dc518e 100644
--- a/BuildsAppReborn.Access.UI/Notifications/DefaultNotificationProvider.cs
+++ b/BuildsAppReborn.Access.UI/Notifications/DefaultNotificationProvider.cs
@@ -15,11 +15,12 @@ namespace BuildsAppReborn.Access.UI.Notifications
 {
     [PriorityExport(typeof(INotificationProvider), -1)]
     [PartCreationPolicy(CreationPolicy.Shared)]
-    internal class DefaultNotificationProvider : INotificationProvider
+    internal class DefaultNotificationProvider : NotificationProviderBase, INotificationProvider
     {
         #region Constructors
 
-        public DefaultNotificationProvider()
+        [ImportingConstructor]
+        public DefaultNotificationProvider(GeneralSettings generalSettings) : base(generalSettings)
         {
             this.notifier = new Notifier(cfg =>
                                          {
@@ -38,7 +39,7 @@ public void ShowBuild(IBuild build, Func<IBuild, String> iconProvider, Action<IB
             if (build == null) return;
 
             var sb = new StringBuilder();
-            sb.AppendLine(build.GenerateTitle());
+            sb.AppendLine(GetTitle(build));
             sb.AppendLine(build.GenerateStatus());
             sb.AppendLine(build.GenerateUsername());
             var displayOptions = new MessageOptions
diff --git a/BuildsAppReborn.Access.UI/Notifications/NotificationHelper.cs b/BuildsAppReborn.Access.UI/Notifications/NotificationHelper.cs
index 8096c0e..4c6ecfb 100644
--- a/BuildsAppReborn.Access.UI/Notifications/NotificationHelper.cs
+++ b/BuildsAppReborn.Access.UI/Notifications/NotificationHelper.cs
@@ -12,8 +12,16 @@ public static String GenerateStatus(this IBuild build)
             return build.Status.ToString();
         }
 
-        public static String GenerateTitle(this IBuild build)
+        public static String GenerateTitle(this IBuild build, BuildViewStyle viewStyle)
         {
+            if (viewStyle == BuildViewStyle.GroupByPullRequest)
+            {
+                if (build.PullRequest != null)
+                {
+                    return $"{build.Definition.Project.Name} - {build.PullRequest.Title} - {build.BuildNumber}";
+                }
+            }
+
             return $"{build.Definition.Project.Name} - {build.Definition.Name} - {build.BuildNumber}";
         }
 
diff --git a/BuildsAppReborn.Access.UI/Notifications/NotificationProviderBase.cs b/BuildsAppReborn.Access.UI/Notifications/NotificationProviderBase.cs
new file mode 100644
index 0000000..5edec06
--- /dev/null
+++ b/BuildsAppReborn.Access.UI/Notifications/NotificationProviderBase.cs
@@ -0,0 +1,32 @@
+using System;
+using BuildsAppReborn.Contracts.Models;
+
+namespace BuildsAppReborn.Access.UI.Notifications
+{
+    internal abstract class NotificationProviderBase
+    {
+        #region Constructors
+
+        protected NotificationProviderBase(GeneralSettings generalSettings)
+        {
+            this.generalSettings = generalSettings;
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        public virtual String GetTitle(IBuild build)
+        {
+            return build.GenerateTitle(this.generalSettings.ViewStyle);
+        }
+
+        #endregion
+
+        #region Private Fields
+
+        private GeneralSettings generalSettings;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/BuildsAppReborn.Access.UI/Notifications/Windows10NotificationProvider.cs b/BuildsAppReborn.Access.UI/Notifications/Windows10NotificationProvider.cs
index fc1304f..76efdd3 100644
--- a/BuildsAppReborn.Access.UI/Notifications/Windows10NotificationProvider.cs
+++ b/BuildsAppReborn.Access.UI/Notifications/Windows10NotificationProvider.cs
@@ -10,8 +10,17 @@ namespace BuildsAppReborn.Access.UI.Notifications
 {
     [PriorityExport(typeof(INotificationProvider), 100)]
     [PartCreationPolicy(CreationPolicy.Shared)]
-    internal class Windows10NotificationProvider : INotificationProvider
+    internal class Windows10NotificationProvider : NotificationProviderBase, INotificationProvider
     {
+        #region Constructors
+
+        [ImportingConstructor]
+        public Windows10NotificationProvider(GeneralSettings generalSettings) : base(generalSettings)
+        {
+        }
+
+        #endregion
+
         #region Implementation of INotificationProvider
 
         public void ShowBuild(IBuild build, Func<IBuild, String> iconProvider, Action<IBuild> notificationClickAction)
@@ -22,7 +31,7 @@ public void ShowBuild(IBuild build, Func<IBuild, String> iconProvider, Action<IB
             // Fill in the text elements
             var stringElements = toastXml.GetElementsByTagName("text");
 
-            stringElements[0].AppendChild(toastXml.CreateTextNode(build.GenerateTitle()));
+            stringElements[0].AppendChild(toastXml.CreateTextNode(GetTitle(build)));
             stringElements[1].AppendChild(toastXml.CreateTextNode(build.GenerateStatus()));
             stringElements[2].AppendChild(toastXml.CreateTextNode(build.GenerateUsername()));
 
diff --git a/BuildsAppReborn.Client/Cache/BuildCache.cs b/BuildsAppReborn.Client/Cache/BuildCache.cs
index cfbf0a0..3ee0df1 100644
--- a/BuildsAppReborn.Client/Cache/BuildCache.cs
+++ b/BuildsAppReborn.Client/Cache/BuildCache.cs
@@ -19,12 +19,12 @@ public class BuildCache : ViewModelBase
         #region Constructors
 
         [ImportingConstructor]
-        internal BuildCache(IBuildMonitorBasic buildMonitor, IEqualityComparer<IBuildDefinition> buildDefinitionEqualityComparer, IEqualityComparer<IPullRequest> pullRequstEqualityComparer, GlobalSettingsContainer globalSettingsContainer)
+        internal BuildCache(IBuildMonitorBasic buildMonitor, IEqualityComparer<IBuildDefinition> buildDefinitionEqualityComparer, IEqualityComparer<IPullRequest> pullRequstEqualityComparer, GeneralSettings generalSettings)
         {
             BuildsStatus = new RangeObservableCollection<BuildStatusGroup>();
             this.buildDefinitionEqualityComparer = buildDefinitionEqualityComparer;
             this.pullRequstEqualityComparer = pullRequstEqualityComparer;
-            this.globalSettingsContainer = globalSettingsContainer;
+            this.generalSettings = generalSettings;
             buildMonitor.BuildsUpdated += OnBuildsUpdated;
             buildMonitor.MonitorStopped += (sender, args) => CacheStatus = BuildCacheStatus.NotConfigured;
             buildMonitor.MonitorStarted += (sender, args) => CacheStatus = BuildCacheStatus.Loading;
@@ -137,11 +137,11 @@ private void OnBuildsUpdated(ICollection<IBuild> builds)
 
             var buildStatusGroups = new List<BuildStatusGroup>();
 
-            if (this.globalSettingsContainer.GeneralSettings.ViewStyle == BuildViewStyle.GroupByBuildDefinition)
+            if (this.generalSettings.ViewStyle == BuildViewStyle.GroupByBuildDefinition)
             {
                 buildStatusGroups.AddRange(GroupBuildsByDefinition(builds, BuildsStatus));
             }
-            else if (this.globalSettingsContainer.GeneralSettings.ViewStyle == BuildViewStyle.GroupByPullRequest)
+            else if (this.generalSettings.ViewStyle == BuildViewStyle.GroupByPullRequest)
             {
                 var prBuilds = builds.Where(a => a.PullRequest != null).ToList();
 
@@ -214,8 +214,8 @@ private void UpdateCurrentIcon()
         private readonly IEqualityComparer<IBuildDefinition> buildDefinitionEqualityComparer;
         private BuildCacheStatus cacheStatus;
         private String currentIcon;
-        private readonly GlobalSettingsContainer globalSettingsContainer;
         private readonly IEqualityComparer<IPullRequest> pullRequstEqualityComparer;
+        private readonly GeneralSettings generalSettings;
 
         #endregion
 
diff --git a/BuildsAppReborn.Client/GlobalSettingsContainer.cs b/BuildsAppReborn.Client/GlobalSettingsContainer.cs
index 52964a4..6ade988 100644
--- a/BuildsAppReborn.Client/GlobalSettingsContainer.cs
+++ b/BuildsAppReborn.Client/GlobalSettingsContainer.cs
@@ -31,6 +31,7 @@ public GlobalSettingsContainer()
         /// <value>
         /// The general settings.
         /// </value>
+        [Export]
         public GeneralSettings GeneralSettings
         {
             get
diff --git a/BuildsAppReborn.Contracts/Models/GeneralSettings.cs b/BuildsAppReborn.Contracts/Models/GeneralSettings.cs
index f3a9032..2a9169b 100644
--- a/BuildsAppReborn.Contracts/Models/GeneralSettings.cs
+++ b/BuildsAppReborn.Contracts/Models/GeneralSettings.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.Composition;
 
 namespace BuildsAppReborn.Contracts.Models
 {
+    [PartCreationPolicy(CreationPolicy.Shared)]
     public class GeneralSettings
     {
         #region Constructors