Moved NumberOfShowCurrentPullRequest tracking into command

Author: jcansdale

src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.ComponentModel.Composition;
@@ -10,7 +9,6 @@
 using GitHub.Services;
 using GitHub.Models;
 using GitHub.Logging;
-using GitHub.Extensions;
 using Serilog;
 using ReactiveUI;
 
@@ -71,8 +69,7 @@ void RefreshCurrentSession()
 
         PullRequestStatusViewModel CreatePullRequestStatusViewModel(IPullRequestModel pullRequest)
         {
-            var trackingCommand = new UsageTrackingCommand(showCurrentPullRequestCommand, usageTracker);
-            var pullRequestStatusViewModel = new PullRequestStatusViewModel(trackingCommand);
+            var pullRequestStatusViewModel = new PullRequestStatusViewModel(showCurrentPullRequestCommand);
             pullRequestStatusViewModel.Number = pullRequest.Number;
             pullRequestStatusViewModel.Title = pullRequest.Title;
             return pullRequestStatusViewModel;
@@ -116,41 +113,5 @@ StatusBar FindSccStatusBar(Window mainWindow)
             var contentControl = mainWindow?.Template?.FindName(StatusBarPartName, mainWindow) as ContentControl;
             return contentControl?.Content as StatusBar;
         }
-
-        class UsageTrackingCommand : ICommand
-        {
-            readonly ICommand command;
-            readonly IUsageTracker usageTracker;
-
-            internal UsageTrackingCommand(ICommand command, IUsageTracker usageTracker)
-            {
-                this.command = command;
-                this.usageTracker = usageTracker;
-            }
-
-            public event EventHandler CanExecuteChanged
-            {
-                add
-                {
-                    command.CanExecuteChanged += value;
-                }
-
-                remove
-                {
-                    command.CanExecuteChanged -= value;
-                }
-            }
-
-            public bool CanExecute(object parameter)
-            {
-                return command.CanExecute(parameter);
-            }
-
-            public void Execute(object parameter)
-            {
-                command.Execute(parameter);
-                usageTracker.IncrementCounter(x => x.NumberOfShowCurrentPullRequest).Forget();
-            }
-        }
     }
 }

src/GitHub.VisualStudio/Commands/ShowCurrentPullRequestCommand.cs

@@ -4,6 +4,7 @@
 using GitHub.Commands;
 using GitHub.Logging;
 using GitHub.Services;
+using GitHub.Extensions;
 using GitHub.Services.Vssdk.Commands;
 using Serilog;
 
@@ -20,12 +21,14 @@ public class ShowCurrentPullRequestCommand : VsCommand, IShowCurrentPullRequestC
     {
         static readonly ILogger log = LogManager.ForContext<ShowCurrentPullRequestCommand>();
         readonly IGitHubServiceProvider serviceProvider;
+        readonly Lazy<IUsageTracker> usageTracker;
 
         [ImportingConstructor]
-        protected ShowCurrentPullRequestCommand(IGitHubServiceProvider serviceProvider)
+        protected ShowCurrentPullRequestCommand(IGitHubServiceProvider serviceProvider, Lazy<IUsageTracker> usageTracker)
             : base(CommandSet, CommandId)
         {
             this.serviceProvider = serviceProvider;
+            this.usageTracker = usageTracker;
         }
 
         /// <summary>
@@ -58,6 +61,8 @@ public override async Task Execute()
                 var manager = serviceProvider.TryGetService<IGitHubToolWindowManager>();
                 var host = await manager.ShowGitHubPane();
                 await host.ShowPullRequest(session.RepositoryOwner, host.LocalRepository.Name, pullRequest.Number);
+
+                usageTracker.Value.IncrementCounter(x => x.NumberOfShowCurrentPullRequest).Forget();
             }
             catch (Exception ex)
             {