Merge pull request #353 from github/feature/pr/creation

Pull Request Creation

Author: shana

GitHubVS.sln

@@ -52,7 +52,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Script", "Script", "{7B6C5F
 		script\Require-CleanWorkTree.ps1 = script\Require-CleanWorkTree.ps1
 		script\Run-NUnit.ps1 = script\Run-NUnit.ps1
 		script\Run-XUnit.ps1 = script\Run-XUnit.ps1
-		script\SolutionInfo.cs = script\SolutionInfo.cs
 		script\Upload-DirectoryToS3.ps1 = script\Upload-DirectoryToS3.ps1
 	EndProjectSection
 EndProject

src/GitHub.App/Api/ApiClient.cs

@@ -237,9 +237,20 @@ public IObservable<PullRequest> GetPullRequestsForRepository(string owner, strin
                     SortDirection = SortDirection.Descending
                 });
         }
+
+        public IObservable<PullRequest> CreatePullRequest(NewPullRequest pullRequest, string owner, string repo)
+        {
+            return gitHubClient.PullRequest.Create(owner, repo, pullRequest);
+        }
+
         public IObservable<Repository> GetRepositories()
         {
             return gitHubClient.Repository.GetAllForCurrent();
         }
+
+        public IObservable<Branch> GetBranches(string owner, string repo)
+        {
+            return gitHubClient.Repository.GetAllBranches(owner, repo);
+        }
     }
 }

src/GitHub.App/Controllers/UIController.cs

@@ -105,7 +105,6 @@ internal enum Trigger
         readonly IUIFactory factory;
         readonly IUIProvider uiProvider;
         readonly IRepositoryHosts hosts;
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         readonly IConnectionManager connectionManager;
 
         readonly CompositeDisposable disposables = new CompositeDisposable();
@@ -333,7 +332,8 @@ void ConfigureUIHandlingStates()
                 .OnEntryFrom(triggers[Trigger.PRDetail], (arg, tr) => RunView(UIViewType.PRDetail, CalculateDirection(tr), arg))
                 .PermitDynamic(Trigger.Next, () => Go(Trigger.Next))
                 .PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
-                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
+                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish))
+                .OnExit(() => DisposeView(activeFlow, UIViewType.PRDetail));
 
             uiStateMachine.Configure(UIViewType.PRCreation)
                 .OnEntry(tr => RunView(UIViewType.PRCreation, CalculateDirection(tr)))
@@ -622,6 +622,17 @@ void DisposeFlow(UIControllerFlow flow)
             list.Clear();
         }
 
+        void DisposeView(UIControllerFlow flow, UIViewType type)
+        {
+            var list = GetObjectsForFlow(flow);
+            IUIPair uipair = null;
+            if (list.TryGetValue(type, out uipair))
+            {
+                list.Remove(type);
+                uipair.Dispose();
+            }
+        }
+
         void RunView(UIViewType viewType, LoadDirection direction, ViewWithData arg = null)
         {
             if (requestedTarget?.ViewType == viewType)

src/GitHub.App/Extensions/AkavacheExtensions.cs

@@ -241,6 +241,37 @@ static IObservable<T> GetAndFetchLatestFromIndex<T>(this IBlobCache This,
                 .Replay().RefCount();
         }
 
+        /// <summary>
+        /// This method adds a new object to the database and updates the
+        /// corresponding index.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="blobCache">The cache to retrieve the object from.</param>
+        /// <param name="key">The key to look up the cache value with.</param>
+        /// <param name="item">The item to add to the database</param>
+        /// <param name="maxCacheDuration">
+        /// The maximum age of a cache object before the object is treated as
+        /// expired and unusable. Cache objects older than this will be treated
+        /// as a cache miss.
+        /// <returns></returns>
+        public static IObservable<T> PutAndUpdateIndex<T>(this IBlobCache blobCache,
+            string key,
+            Func<IObservable<T>> fetchFunc,
+            TimeSpan maxCacheDuration)
+            where T : CacheItem
+        {
+            return Observable.Defer(() =>
+            {
+                var absoluteExpiration = blobCache.Scheduler.Now + maxCacheDuration;
+                return blobCache.GetOrCreateObject(key, () => CacheIndex.Create(key))
+                    .SelectMany(index => fetchFunc()
+                            .Catch<T, Exception>(Observable.Throw<T>)
+                            .SelectMany(x => x.Save<T>(blobCache, key, absoluteExpiration))
+                            .Do(x => index.AddAndSave(blobCache, key, x, absoluteExpiration))
+                    );
+            });
+        }
+
         static bool IsExpired(IBlobCache blobCache, DateTimeOffset itemCreatedAt, TimeSpan cacheDuration)
         {
             var elapsed = blobCache.Scheduler.Now - itemCreatedAt.ToUniversalTime();

src/GitHub.App/GitHub.App.csproj

@@ -127,6 +127,7 @@
     <Compile Include="Factories\UIFactory.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Infrastructure\LoggingConfiguration.cs" />
+    <Compile Include="Models\BranchModel.cs" />
     <Compile Include="Models\PullRequestModel.cs" />
     <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -144,6 +145,7 @@
     <Compile Include="Services\ImageDownloader.cs" />
     <Compile Include="Services\GitClient.cs" />
     <Compile Include="Services\ModelService.cs" />
+    <Compile Include="Services\PullRequestService.cs" />
     <Compile Include="Services\RepositoryCloneService.cs" />
     <Compile Include="Extensions\FileExtensions.cs" />
     <Compile Include="Caches\CredentialCache.cs" />

src/GitHub.App/Models/BranchModel.cs

@@ -0,0 +1,20 @@
+namespace GitHub.Models
+{
+    public class BranchModel : IBranch
+    {
+        public BranchModel()
+        { }
+
+        public BranchModel(Octokit.Branch branch)
+        {
+            Name = branch.Name;
+        }
+
+        public BranchModel(LibGit2Sharp.Branch branch)
+        {
+            Name = branch.FriendlyName;
+        }
+
+        public string Name { get; set; }
+    }
+}

src/GitHub.App/Models/PullRequestModel.cs

@@ -141,6 +141,9 @@ public IAccount Assignee
             set { assignee = value; this.RaisePropertyChange(); }
         }
 
+        public ISimpleRepositoryModel Repository { get; }
+        public IBranch Head { get; }
+        public IBranch Base { get; }
 
         [return: AllowNull] // nullguard thinks a string.Format can return null. sigh.
         public override string ToString()

src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs

@@ -1,6 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using GitHub.ViewModels;
 using System.Collections.Generic;
+using GitHub.Models;
+using GitHub.Validation;
+using System;
+using System.Windows.Input;
+using ReactiveUI;
 
 namespace GitHub.SampleData
 {
@@ -9,27 +14,38 @@ public class PullRequestCreationViewModelDesigner : BaseViewModel, IPullRequestC
     {
         public PullRequestCreationViewModelDesigner()
         {
-            Branches = new List<string>()
+            Branches = new List<IBranch>
             {
-                "don/stub-ui",
-                "feature/pr/views",
-                "release-1.0.17.0"
-            };
+                new BranchModel { Name = "master" },
+                new BranchModel { Name = "don/stub-ui" },
+                new BranchModel { Name = "feature/pr/views" },
+                new BranchModel { Name = "release-1.0.17.0" }
+            }.AsReadOnly();
+
+            TargetBranch = new BranchModel { Name = "master" };
+            SourceBranch = Branches[2];
 
-            CurrentBranchName = "fix-everything";
             SelectedAssignee = "Haacked (Phil Haack)";
-            TargetBranchName = "master";
             Users = new List<string>()
             {
                 "Haacked (Phil Haack)",
                 "shana (Andreia Gaita)"
             };
         }
 
-        public string CurrentBranchName { get; set; }
+        public IBranch SourceBranch { get; set; }
+        public IBranch TargetBranch { get; set; }
+        public IReadOnlyList<IBranch> Branches { get; set; }
+
         public string SelectedAssignee { get; set; }
-        public string TargetBranchName { get; set; }
-        public List<string> Branches { get; set; }
         public List<string> Users { get; set; }
+
+        public IReactiveCommand<IPullRequestModel> CreatePullRequest { get; }
+
+        public string PRTitle { get; set; }
+
+        public ReactivePropertyValidator TitleValidator { get; }
+
+        public ReactivePropertyValidator BranchValidator { get; }
     }
 }

src/GitHub.App/Services/ModelService.cs

@@ -199,6 +199,24 @@ public ITrackingCollection<IRepositoryModel> GetRepositories(ITrackingCollection
             return collection;
         }
 
+        public IObservable<IPullRequestModel> CreatePullRequest(ISimpleRepositoryModel repository, string title, IBranch source, IBranch target)
+        {
+            var keyobs = GetUserFromCache()
+                .Select(user => string.Format(CultureInfo.InvariantCulture, "{0}|{1}:{2}", CacheIndex.PRPrefix, user.Login, repository.Name));
+
+            return Observable.Defer(() => keyobs
+                .SelectMany(key =>
+                    hostCache.PutAndUpdateIndex(key, () =>
+                        apiClient.CreatePullRequest(new NewPullRequest(title, source.Name, target.Name),
+                                    repository.CloneUrl.Owner,
+                                    repository.CloneUrl.RepositoryName)
+                                 .Select(PullRequestCacheItem.Create),
+                    TimeSpan.FromMinutes(30))
+                )
+                .Select(Create)
+            );
+        }
+
         public IObservable<Unit> InvalidateAll()
         {
             return hostCache.InvalidateAll().ContinueAfter(() => hostCache.Vacuum());
@@ -262,6 +280,16 @@ IObservable<IReadOnlyList<IRepositoryModel>> GetOrganizationRepositories(string
                     });
         }
 
+        public IObservable<IBranch> GetBranches(ISimpleRepositoryModel repo)
+        {
+            var keyobs = GetUserFromCache()
+                .Select(user => string.Format(CultureInfo.InvariantCulture, "{0}|{1}|branch", user.Login, repo.Name));
+
+            return Observable.Defer(() => keyobs
+                    .SelectMany(key => apiClient.GetBranches(repo.CloneUrl.Owner, repo.CloneUrl.RepositoryName)))
+                .Select(Create);
+        }
+
         static GitIgnoreItem Create(GitIgnoreCacheItem item)
         {
             return GitIgnoreItem.Create(item.Name);
@@ -272,7 +300,7 @@ static LicenseItem Create(LicenseCacheItem licenseCacheItem)
             return new LicenseItem(licenseCacheItem.Key, licenseCacheItem.Name);
         }
 
-        Models.Account Create(AccountCacheItem accountCacheItem)
+        IAccount Create(AccountCacheItem accountCacheItem)
         {
             return new Models.Account(
                 accountCacheItem.Login,
@@ -313,6 +341,11 @@ IPullRequestModel Create(PullRequestCacheItem prCacheItem)
             };
         }
 
+        IBranch Create(Branch branch)
+        {
+            return new BranchModel(branch);
+        }
+
 
         public IObservable<Unit> InsertUser(AccountCacheItem user)
         {

src/GitHub.App/Services/PullRequestService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel.Composition;
+using GitHub.Models;
+
+namespace GitHub.Services
+{
+    [Export(typeof(IPullRequestService))]
+    [PartCreationPolicy(CreationPolicy.Shared)]
+    public class PullRequestService : IPullRequestService
+    {
+        public IObservable<IPullRequestModel> CreatePullRequest(IRepositoryHost host, ISimpleRepositoryModel repository, string title, IBranch source, IBranch target)
+        {
+            return host.ModelService.CreatePullRequest(repository, title, source, target);
+        }
+    }
+}