Merge pull request #508 from github/fixes/add-usage-track-for-pr-creation

Ooops we weren't tracking PR creation

Author: shana

src/GitHub.App/Services/PullRequestService.cs

@@ -27,13 +27,15 @@ public class PullRequestService : IPullRequestService
         readonly IGitClient gitClient;
         readonly IGitService gitService;
         readonly IOperatingSystem os;
+        readonly IUsageTracker usageTracker;
 
         [ImportingConstructor]
-        public PullRequestService(IGitClient gitClient, IGitService gitService, IOperatingSystem os)
+        public PullRequestService(IGitClient gitClient, IGitService gitService, IOperatingSystem os, IUsageTracker usageTracker)
         {
             this.gitClient = gitClient;
             this.gitService = gitService;
             this.os = os;
+            this.usageTracker = usageTracker;
         }
 
         public IObservable<IPullRequestModel> CreatePullRequest(IRepositoryHost host,
@@ -88,7 +90,9 @@ async Task<IPullRequestModel> PushAndCreatePR(IRepositoryHost host,
             if (!Splat.ModeDetector.Current.InUnitTestRunner().GetValueOrDefault())
                 await Task.Delay(TimeSpan.FromSeconds(5));
 
-            return await host.ModelService.CreatePullRequest(sourceRepository, targetRepository, sourceBranch, targetBranch, title, body);
+            var ret = await host.ModelService.CreatePullRequest(sourceRepository, targetRepository, sourceBranch, targetBranch, title, body);
+            usageTracker.IncrementUpstreamPullRequestCount();
+            return ret;
         }
 
     }

src/GitHub.Exports/Services/UsageTracker.cs

@@ -122,7 +122,7 @@ public void IncrementCreateGistCount()
         public void IncrementUpstreamPullRequestCount()
         {
             var usage = LoadUsage();
-            ++usage.Model.NumberOfClones;
+            ++usage.Model.NumberOfUpstreamPullRequests;
             SaveUsage(usage);
         }
 

src/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs

@@ -13,7 +13,7 @@ public class PullRequestServiceTests : TestBaseClass
     public void CreatePullRequestAllArgsMandatory()
     {
         var serviceProvider = Substitutes.ServiceProvider;
-        var service = new PullRequestService(Substitute.For<IGitClient>(), serviceProvider.GetGitService(), serviceProvider.GetOperatingSystem());
+        var service = new PullRequestService(Substitute.For<IGitClient>(), serviceProvider.GetGitService(), serviceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
 
         IRepositoryHost host = null;
         ISimpleRepositoryModel sourceRepo = null;

src/UnitTests/GitHub.App/ViewModels/PullRequestCreationViewModelTests.cs

@@ -115,7 +115,7 @@ static TestData PrepareTestData(
     public void TargetBranchDisplayNameIncludesRepoOwnerWhenFork()
     {
         var data = PrepareTestData("octokit.net", "shana", "master", "octokit", "master", "origin", true, true);
-        var prservice = new PullRequestService(data.GitClient, data.GitService, data.ServiceProvider.GetOperatingSystem());
+        var prservice = new PullRequestService(data.GitClient, data.GitService, data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
         prservice.GetPullRequestTemplate(data.ActiveRepo).Returns(Observable.Empty<string>());
         var vm = new PullRequestCreationViewModel(data.RepositoryHost, data.ActiveRepo, prservice, data.NotificationService);
         Assert.Equal("octokit/master", vm.TargetBranch.DisplayName);
@@ -150,7 +150,7 @@ public async Task CreatingPRs(int testId,
         var targetBranch = data.TargetBranch;
         var ms = data.ModelService;
 
-        var prservice = new PullRequestService(data.GitClient, data.GitService, data.ServiceProvider.GetOperatingSystem());
+        var prservice = new PullRequestService(data.GitClient, data.GitService, data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
         var vm = new PullRequestCreationViewModel(data.RepositoryHost, data.ActiveRepo, prservice, data.NotificationService);
 
         vm.Initialize();