Remove Octokit.Repository dependency

Remove Octokit.Repository dependency from RemoteRepositoryModel.

Author: jcansdale

src/GitHub.App/Services/ModelService.cs

@@ -107,7 +107,22 @@ public IObservable<IReadOnlyList<IAccount>> GetAccounts()
         public IObservable<RemoteRepositoryModel> GetForks(RepositoryModel repository)
         {
             return ApiClient.GetForks(repository.Owner, repository.Name)
-                .Select(x => new RemoteRepositoryModel(x));
+                .Select(x => CreateRemoteRepositoryModel(x));
+        }
+
+        static RemoteRepositoryModel CreateRemoteRepositoryModel(Repository repository)
+        {
+            var ownerAccount = new Models.Account(repository.Owner);
+            var parent = repository.Parent != null ? CreateRemoteRepositoryModel(repository.Parent) : null;
+            var model = new RemoteRepositoryModel(repository.Id, repository.Name, repository.CloneUrl,
+                repository.Private, repository.Fork, ownerAccount, parent, repository.DefaultBranch);
+
+            if (parent != null)
+            {
+                parent.DefaultBranch.DisplayName = parent.DefaultBranch.Id;
+            }
+
+            return model;
         }
 
         IObservable<LicenseCacheItem> GetLicensesFromApi()

src/GitHub.App/ViewModels/GitHubPane/PullRequestCreationViewModel.cs

@@ -149,7 +149,7 @@ public async Task InitializeAsync(LocalRepositoryModel repository, IConnection c
             SourceBranch = gitService.GetBranch(repository);
 
             var obs = modelService.ApiClient.GetRepository(repository.Owner, repository.Name)
-                .Select(r => new RemoteRepositoryModel(r))
+                .Select(r => CreateRemoteRepositoryModel(r))
                 .PublishLast();
             disposables.Add(obs.Connect());
             var githubObs = obs;
@@ -196,6 +196,21 @@ public async Task InitializeAsync(LocalRepositoryModel repository, IConnection c
             Initialized = true;
         }
 
+        static RemoteRepositoryModel CreateRemoteRepositoryModel(Repository repository)
+        {
+            var ownerAccount = new Models.Account(repository.Owner);
+            var parent = repository.Parent != null ? CreateRemoteRepositoryModel(repository.Parent) : null;
+            var model = new RemoteRepositoryModel(repository.Id, repository.Name, repository.CloneUrl,
+                repository.Private, repository.Fork, ownerAccount, parent, repository.DefaultBranch);
+
+            if (parent != null)
+            {
+                parent.DefaultBranch.DisplayName = parent.DefaultBranch.Id;
+            }
+
+            return model;
+        }
+
         async Task LoadInitialState(string draftKey)
         {
             if (activeLocalRepo.CloneUrl == null)

src/GitHub.Exports.Reactive/Models/RemoteRepositoryModel.cs

@@ -1,6 +1,6 @@
-using GitHub.Primitives;
-using System;
+using System;
 using System.Globalization;
+using GitHub.Primitives;
 using GitHub.Extensions;
 using GitHub.Collections;
 
@@ -27,7 +27,9 @@ protected RemoteRepositoryModel()
         /// <param name="isFork">Whether the repository is a fork.</param>
         /// <param name="ownerAccount">The repository owner account.</param>
         /// <param name="parent">The parent repository if this repository is a fork.</param>
-        public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPrivate, bool isFork, IAccount ownerAccount, RemoteRepositoryModel parent)
+        /// <param name="defaultBranchName">The default branch name (or "master" if undefined).</param>
+        public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPrivate, bool isFork, IAccount ownerAccount,
+            RemoteRepositoryModel parent, string defaultBranchName = "master")
             : base(name, cloneUrl)
         {
             Guard.ArgumentNotEmptyString(name, nameof(name));
@@ -37,31 +39,10 @@ public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPr
             OwnerAccount = ownerAccount;
             IsFork = isFork;
             SetIcon(isPrivate, isFork);
-            // this is an assumption, we'd have to load the repo information from octokit to know for sure
-            // probably not worth it for this ctor
-            DefaultBranch = new BranchModel("master", this);
+            DefaultBranch = new BranchModel(defaultBranchName, this);
             Parent = parent;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RemoteRepositoryModel"/> class.
-        /// </summary>
-        /// <param name="repository">The source octokit repository.</param>
-        public RemoteRepositoryModel(Octokit.Repository repository)
-            : base(repository.Name, repository.CloneUrl)
-        {
-            Guard.ArgumentNotNull(repository, nameof(repository));
-
-            Id = repository.Id;
-            IsFork = repository.Fork;
-            SetIcon(repository.Private, IsFork);
-            OwnerAccount = new Account(repository.Owner);
-            DefaultBranch = new BranchModel(repository.DefaultBranch, this);
-            Parent = repository.Parent != null ? new RemoteRepositoryModel(repository.Parent) : null;
-            if (Parent != null)
-                Parent.DefaultBranch.DisplayName = Parent.DefaultBranch.Id;
-        }
-
         #region Equality Things
         public void CopyFrom(RemoteRepositoryModel other)
         {

test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestCreationViewModelTests.cs

@@ -93,7 +93,7 @@ static TestData PrepareTestData(
             githubRepoParent = CreateRepository(targetRepoOwner, repoName, id: 1);
         var githubRepo = CreateRepository(sourceRepoOwner, repoName, id: 2, parent: githubRepoParent);
         var sourceBranch = new BranchModel(sourceBranchName, activeRepo);
-        var sourceRepo = new RemoteRepositoryModel(githubRepo);
+        var sourceRepo = CreateRemoteRepositoryModel(githubRepo);
         var targetRepo = targetRepoOwner == sourceRepoOwner ? sourceRepo : sourceRepo.Parent;
         var targetBranch = targetBranchName != targetRepo.DefaultBranch.Name ? new BranchModel(targetBranchName, targetRepo) : targetRepo.DefaultBranch;
 
@@ -125,6 +125,21 @@ static TestData PrepareTestData(
         };
     }
 
+    static RemoteRepositoryModel CreateRemoteRepositoryModel(Repository repository)
+    {
+        var ownerAccount = new GitHub.Models.Account(repository.Owner);
+        var parent = repository.Parent != null ? CreateRemoteRepositoryModel(repository.Parent) : null;
+        var model = new RemoteRepositoryModel(repository.Id, repository.Name, repository.CloneUrl,
+            repository.Private, repository.Fork, ownerAccount, parent, repository.DefaultBranch);
+
+        if (parent != null)
+        {
+            parent.DefaultBranch.DisplayName = parent.DefaultBranch.Id;
+        }
+
+        return model;
+    }
+
     [Test]
     public async Task TargetBranchDisplayNameIncludesRepoOwnerWhenForkAsync()
     {