Add assignee to PullRequestModel so we can filter by it

Author: shana

src/GitHub.App/Models/PullRequestModel.cs

@@ -3,16 +3,21 @@
 using GitHub.Primitives;
 using GitHub.VisualStudio.Helpers;
 using NullGuard;
+using System.Diagnostics;
 
 namespace GitHub.Models
 {
+    [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public sealed class PullRequestModel : NotificationAwareObject, IPullRequestModel
     {
-        public PullRequestModel(int number, string title, IAccount author, DateTimeOffset createdAt, DateTimeOffset? updatedAt = null)
+        public PullRequestModel(int number, string title,
+            IAccount author, [AllowNull]IAccount assignee,
+            DateTimeOffset createdAt, DateTimeOffset? updatedAt = null)
         {
             Number = number;
             Title = title;
             Author = author;
+            Assignee = assignee;
             CreatedAt = createdAt;
             UpdatedAt = updatedAt ?? CreatedAt;
         }
@@ -26,6 +31,7 @@ public void CopyFrom(IPullRequestModel other)
             CommentCount = other.CommentCount;
             HasNewComments = other.HasNewComments;
             IsOpen = other.IsOpen;
+            Assignee = other.Assignee;
         }
 
         public override bool Equals([AllowNull]object obj)
@@ -111,10 +117,28 @@ public bool HasNewComments
         public DateTimeOffset UpdatedAt { get; set; }
         public IAccount Author { get; set; }
 
+        IAccount assignee;
+        [AllowNull]
+        public IAccount Assignee
+        {
+            [return: AllowNull]
+            get { return assignee; }
+            set { assignee = value; this.RaisePropertyChange(); }
+        }
+
+
         [return: AllowNull] // nullguard thinks a string.Format can return null. sigh.
         public override string ToString()
         {
             return string.Format(CultureInfo.InvariantCulture, "id:{0} title:{1} created:{2:u} updated:{3:u}", Number, Title, CreatedAt, UpdatedAt);
         }
+
+        internal string DebuggerDisplay
+        {
+            get
+            {
+                return string.Format(CultureInfo.InvariantCulture, "id:{0} title:{1} created:{2:u} updated:{3:u}", Number, Title, CreatedAt, UpdatedAt);
+            }
+        }
     }
 }

src/GitHub.App/Services/ModelService.cs

@@ -264,6 +264,7 @@ IPullRequestModel Create(PullRequestCacheItem prCacheItem)
                 prCacheItem.Number,
                 prCacheItem.Title,
                 Create(prCacheItem.Author),
+                prCacheItem.Assignee != null ? Create(prCacheItem.Assignee) : null,
                 prCacheItem.CreatedAt,
                 prCacheItem.UpdatedAt)
             {
@@ -357,6 +358,7 @@ public PullRequestCacheItem(PullRequest pr)
                 Number = pr.Number;
                 CommentCount = pr.Comments;
                 Author = new AccountCacheItem(pr.User);
+                Assignee = pr.Assignee != null ? new AccountCacheItem(pr.Assignee) : null;
                 CreatedAt = pr.CreatedAt;
                 UpdatedAt = pr.UpdatedAt;
                 IsOpen = pr.State == ItemState.Open;
@@ -370,6 +372,8 @@ public PullRequestCacheItem(PullRequest pr)
             public int CommentCount { get; set; }
             [AllowNull]
             public AccountCacheItem Author {[return: AllowNull] get; set; }
+            [AllowNull]
+            public AccountCacheItem Assignee { [return: AllowNull] get; set; }
             public DateTimeOffset CreatedAt { get; set; }
             public DateTimeOffset UpdatedAt { get; set; }
             public bool IsOpen { get; set; }

src/GitHub.Exports/Models/IPullRequestModel.cs

@@ -14,5 +14,6 @@ public interface IPullRequestModel : ICopyable<IPullRequestModel>,
         DateTimeOffset CreatedAt { get; }
         DateTimeOffset UpdatedAt { get; }
         IAccount Author { get; }
+        IAccount Assignee { get; }
     }
 }

src/UnitTests/GitHub.App/Models/PullRequestModelTests.cs

@@ -34,7 +34,7 @@ public void ComparisonNullEqualsNull()
     [Fact]
     public void ComparisonBiggerThanNull()
     {
-        PullRequestModel left = new PullRequestModel(0, "", Substitute.For<IAccount>(), Now, Now);
+        PullRequestModel left = new PullRequestModel(0, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now);
         PullRequestModel right = null;
         Assert.False(left == right);
         Assert.True(left != right);
@@ -46,7 +46,7 @@ public void ComparisonBiggerThanNull()
     public void ComparisonNullLowerThan()
     {
         PullRequestModel left = null;
-        PullRequestModel right = new PullRequestModel(0, "", Substitute.For<IAccount>(), Now, Now);
+        PullRequestModel right = new PullRequestModel(0, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now);
         Assert.False(left == right);
         Assert.True(left != right);
         Assert.False(left > right);
@@ -56,8 +56,8 @@ public void ComparisonNullLowerThan()
     [Fact]
     public void ComparisonLowerThan()
     {
-        PullRequestModel left = new PullRequestModel(0, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(1));
-        PullRequestModel right = new PullRequestModel(0, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(2));
+        PullRequestModel left = new PullRequestModel(0, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(1));
+        PullRequestModel right = new PullRequestModel(0, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(2));
         Assert.False(left == right);
         Assert.True(left != right);
         Assert.False(left > right);
@@ -67,8 +67,8 @@ public void ComparisonLowerThan()
     [Fact]
     public void ComparisonGreaterThan()
     {
-        PullRequestModel left = new PullRequestModel(0, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(3));
-        PullRequestModel right = new PullRequestModel(0, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(2));
+        PullRequestModel left = new PullRequestModel(0, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(3));
+        PullRequestModel right = new PullRequestModel(0, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(2));
         Assert.False(left == right);
         Assert.True(left != right);
         Assert.True(left > right);
@@ -78,8 +78,8 @@ public void ComparisonGreaterThan()
     [Fact]
     public void ComparisonEquals()
     {
-        PullRequestModel left = new PullRequestModel(1, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(1));
-        PullRequestModel right = new PullRequestModel(1, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(1));
+        PullRequestModel left = new PullRequestModel(1, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(1));
+        PullRequestModel right = new PullRequestModel(1, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(1));
         Assert.True(left == right);
         Assert.False(left != right);
         Assert.False(left > right);
@@ -91,8 +91,8 @@ public void ComparisonEquals()
     [InlineData(1, 1, 2, 1)]
     public void ComparisonNotEquals(int id1, int ms1, int id2, int ms2)
     {
-        PullRequestModel left = new PullRequestModel(id1, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(ms1));
-        PullRequestModel right = new PullRequestModel(id2, "", Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(ms2));
+        PullRequestModel left = new PullRequestModel(id1, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(ms1));
+        PullRequestModel right = new PullRequestModel(id2, "", Substitute.For<IAccount>(), Substitute.For<IAccount>(), Now, Now + TimeSpan.FromMilliseconds(ms2));
         Assert.False(left == right);
         Assert.True(left != right);
     }