From e7f17bd68d4fcaed4a9f033df22ee7e406452571 Mon Sep 17 00:00:00 2001
From: Gabriel Weyer <gabrielweyer@gmail.com>
Date: Wed, 23 Dec 2015 16:10:35 +1100
Subject: [PATCH 1/3] Added Id And Locked properties to Issue, fixed XML
 comment of Update Issue (was a copy of Create Issue)

---
 .../Clients/IssuesClientTests.cs                 | 16 ++++++++++++++++
 Octokit/Clients/IssuesClient.cs                  |  5 ++---
 Octokit/Models/Response/Issue.cs                 | 14 +++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
index f930d32285..73284093a5 100644
--- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
@@ -22,6 +22,22 @@ public IssuesClientTests()
         _context = github.CreateRepositoryContext(new NewRepository(repoName)).Result;
     }
 
+    [IntegrationTest]
+    public async Task CanDeserializeIssue()
+    {
+        const string title = "a test issue";
+        const string description = "A new unassigned issue";
+        var newIssue = new NewIssue(title) { Body = description };
+        var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
+        var retrieved = await _issuesClient.Get(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+
+        Assert.NotNull(retrieved);
+        Assert.NotEqual(0, issue.Id);
+        Assert.Equal(false, issue.Locked);
+        Assert.Equal(title, retrieved.Title);
+        Assert.Equal(description, retrieved.Body);
+    }
+
     [IntegrationTest]
     public async Task CanCreateRetrieveAndCloseIssue()
     {
diff --git a/Octokit/Clients/IssuesClient.cs b/Octokit/Clients/IssuesClient.cs
index 2dbabc8997..8b924245bb 100644
--- a/Octokit/Clients/IssuesClient.cs
+++ b/Octokit/Clients/IssuesClient.cs
@@ -208,10 +208,9 @@ public Task<Issue> Create(string owner, string name, NewIssue newIssue)
         }
 
         /// <summary>
-        /// Creates an issue for the specified repository. Any user with pull access to a repository can create an
-        /// issue.
+        /// Updates an issue for the specified repository. Issue owners and users with push access can edit an issue.
         /// </summary>
-        /// <remarks>http://developer.github.com/v3/issues/#create-an-issue</remarks>
+        /// <remarks>https://developer.github.com/v3/issues/#edit-an-issue</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="number">The issue number</param>
diff --git a/Octokit/Models/Response/Issue.cs b/Octokit/Models/Response/Issue.cs
index c676f11180..e961fe7c32 100644
--- a/Octokit/Models/Response/Issue.cs
+++ b/Octokit/Models/Response/Issue.cs
@@ -10,8 +10,9 @@ public class Issue
     {
         public Issue() { }
 
-        public Issue(Uri url, Uri htmlUrl, Uri commentsUrl, Uri eventsUrl, int number, ItemState state, string title, string body, User user, IReadOnlyList<Label> labels, User assignee, Milestone milestone, int comments, PullRequest pullRequest, DateTimeOffset? closedAt, DateTimeOffset createdAt, DateTimeOffset? updatedAt)
+        public Issue(Uri url, Uri htmlUrl, Uri commentsUrl, Uri eventsUrl, int number, ItemState state, string title, string body, User user, IReadOnlyList<Label> labels, User assignee, Milestone milestone, int comments, PullRequest pullRequest, DateTimeOffset? closedAt, DateTimeOffset createdAt, DateTimeOffset? updatedAt, int id, bool locked)
         {
+            Id = id;
             Url = url;
             HtmlUrl = htmlUrl;
             CommentsUrl = commentsUrl;
@@ -29,8 +30,14 @@ public Issue(Uri url, Uri htmlUrl, Uri commentsUrl, Uri eventsUrl, int number, I
             ClosedAt = closedAt;
             CreatedAt = createdAt;
             UpdatedAt = updatedAt;
+            Locked = locked;
         }
 
+        /// <summary>
+        /// The Id for this issue
+        /// </summary>
+        public int Id { get; protected set; }
+
         /// <summary>
         /// The URL for this issue.
         /// </summary>
@@ -113,6 +120,11 @@ public Issue(Uri url, Uri htmlUrl, Uri commentsUrl, Uri eventsUrl, int number, I
         /// </summary>
         public DateTimeOffset? UpdatedAt { get; protected set; }
 
+        /// <summary>
+        /// If the issue is locked or not
+        /// </summary>
+        public bool Locked { get; protected set; }
+
         internal string DebuggerDisplay
         {
             get

From 84a39c5b5a76c7024661efd284e4aa74a9dea2e4 Mon Sep 17 00:00:00 2001
From: Gabriel Weyer <gabrielweyer@gmail.com>
Date: Wed, 23 Dec 2015 16:29:48 +1100
Subject: [PATCH 2/3] Added CommitUrl to IssueEvent

---
 .../Clients/IssuesEventsClientTests.cs        | 25 +++++++++++++------
 Octokit/Models/Response/IssueEvent.cs         |  8 +++++-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
index 68c3c2f6bb..61f9c91971 100644
--- a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
@@ -9,7 +9,7 @@
 
 public class IssuesEventsClientTests : IDisposable
 {
-    private readonly IIssuesEventsClient _issuesEventsClientClient;
+    private readonly IIssuesEventsClient _issuesEventsClient;
     private readonly IIssuesClient _issuesClient;
     private readonly RepositoryContext _context;
 
@@ -17,7 +17,7 @@ public IssuesEventsClientTests()
     {
         var github = Helper.GetAuthenticatedClient();
 
-        _issuesEventsClientClient = github.Issue.Events;
+        _issuesEventsClient = github.Issue.Events;
         _issuesClient = github.Issue;
         var repoName = Helper.MakeNameWithTimestamp("public-repo");
 
@@ -30,13 +30,13 @@ public async Task CanListEventInfoForAnIssue()
         var newIssue = new NewIssue("a test issue") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
 
-        var issueEventInfo = await _issuesEventsClientClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        var issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
         Assert.Empty(issueEventInfo);
 
         var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemState.Closed })
             .Result;
         Assert.NotNull(closed);
-        issueEventInfo = await _issuesEventsClientClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         Assert.Equal(1, issueEventInfo.Count);
         Assert.Equal(EventInfoState.Closed, issueEventInfo[0].Event);
@@ -67,7 +67,7 @@ public async Task CanListIssueEventsForARepository()
             .Result;
         Assert.NotNull(closed2);
 
-        var issueEvents = await _issuesEventsClientClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
+        var issueEvents = await _issuesEventsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
 
         Assert.Equal(3, issueEvents.Count);
         Assert.Equal(2, issueEvents.Count(issueEvent => issueEvent.Issue.Body == "Everything's coming up Millhouse"));
@@ -81,10 +81,10 @@ public async Task CanRetrieveIssueEventById()
         var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemState.Closed })
             .Result;
         Assert.NotNull(closed);
-        var issueEvents = await _issuesEventsClientClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
+        var issueEvents = await _issuesEventsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
         int issueEventId = issueEvents[0].Id;
 
-        var issueEventLookupById = await _issuesEventsClientClient.Get(_context.RepositoryOwner, _context.RepositoryName, issueEventId);
+        var issueEventLookupById = await _issuesEventsClient.Get(_context.RepositoryOwner, _context.RepositoryName, issueEventId);
 
         Assert.Equal(issueEventId, issueEventLookupById.Id);
         Assert.Equal(issueEvents[0].Event, issueEventLookupById.Event);
@@ -98,6 +98,17 @@ public async Task CanDeserializeUnsubscribeEvent()
         Assert.Equal(EventInfoState.Unsubscribed, issue.Event);
     }
 
+    [IntegrationTest]
+    public async Task CanDeserializeMergedEvent()
+    {
+        var issueEvent = await _issuesEventsClient.Get("octokit", "octokit.net", 490490630);
+
+        Assert.NotNull(issueEvent);
+        Assert.Equal(EventInfoState.Merged, issueEvent.Event);
+        Assert.Equal("0bb8747a0ad1a9efff201ea017a0a6a4f69b797e", issueEvent.CommitId);
+        Assert.Equal(new Uri("https://api.github.com/repos/octokit/octokit.net/commits/0bb8747a0ad1a9efff201ea017a0a6a4f69b797e"), issueEvent.CommitUrl);
+    }
+
     public void Dispose()
     {
         _context.Dispose();
diff --git a/Octokit/Models/Response/IssueEvent.cs b/Octokit/Models/Response/IssueEvent.cs
index 04c0323d1f..5e88095a97 100644
--- a/Octokit/Models/Response/IssueEvent.cs
+++ b/Octokit/Models/Response/IssueEvent.cs
@@ -9,7 +9,7 @@ public class IssueEvent
     {
         public IssueEvent() { }
 
-        public IssueEvent(int id, Uri url, User actor, User assignee, Label label, EventInfoState @event, string commitId, DateTimeOffset createdAt, Issue issue)
+        public IssueEvent(int id, Uri url, User actor, User assignee, Label label, EventInfoState @event, string commitId, DateTimeOffset createdAt, Issue issue, Uri commitUrl)
         {
             Id = id;
             Url = url;
@@ -20,6 +20,7 @@ public IssueEvent(int id, Uri url, User actor, User assignee, Label label, Event
             CommitId = commitId;
             CreatedAt = createdAt;
             Issue = issue;
+            CommitUrl = commitUrl;
         }
 
         /// <summary>
@@ -57,6 +58,11 @@ public IssueEvent(int id, Uri url, User actor, User assignee, Label label, Event
         /// </summary>
         public string CommitId { get; protected set; }
 
+        /// <summary>
+        /// The commit URL of a commit that referenced this issue.
+        /// </summary>
+        public Uri CommitUrl { get; protected set; }
+
         /// <summary>
         /// Date the event occurred for the issue/pull request.
         /// </summary>

From 34d13743e5bdf70b7e2ab6b3e44531050f63ee26 Mon Sep 17 00:00:00 2001
From: Gabriel Weyer <gabrielweyer@gmail.com>
Date: Wed, 23 Dec 2015 16:42:29 +1100
Subject: [PATCH 3/3] Removed Assignee and Labels from IssueEventPayload

---
 Octokit.Tests/Clients/EventsClientTests.cs    | 26 +++++++++----------
 .../ActivityPayloads/IssueEventPayload.cs     |  2 --
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Octokit.Tests/Clients/EventsClientTests.cs b/Octokit.Tests/Clients/EventsClientTests.cs
index e2cab605dd..57437d825f 100644
--- a/Octokit.Tests/Clients/EventsClientTests.cs
+++ b/Octokit.Tests/Clients/EventsClientTests.cs
@@ -360,18 +360,18 @@ public async Task DeserializesIssueEventCorrectly()
                 {
                     "payload", new
                     {
-                        action = "assigned",
+                        action = "created",
                         issue = new
                         {
-                            number = 1337
-                        },
-                        assignee = new
-                        {
-                            id = 1337
-                        },
-                        label = new
-                        {
-                            name = "bug"
+                            number = 1337,
+                            assignee = new
+                            {
+                                id = 1337
+                            },
+                            labels = new[]
+                            {
+                                new { name = "bug"}
+                            }
                         }
                     }
                 }
@@ -382,10 +382,10 @@ public async Task DeserializesIssueEventCorrectly()
             Assert.Equal(1, activities.Count);
 
             var payload = activities.FirstOrDefault().Payload as IssueEventPayload;
-            Assert.Equal("assigned", payload.Action);
+            Assert.Equal("created", payload.Action);
             Assert.Equal(1337, payload.Issue.Number);
-            Assert.Equal(1337, payload.Assignee.Id);
-            Assert.Equal("bug", payload.Label.Name);
+            Assert.Equal(1337, payload.Issue.Assignee.Id);
+            Assert.Equal("bug", payload.Issue.Labels.First().Name);
         }
 
         [Fact]
diff --git a/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs
index 04f18177f4..1f40a122df 100644
--- a/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs
@@ -7,7 +7,5 @@ public class IssueEventPayload : ActivityPayload
     {
         public string Action { get; protected set; }
         public Issue Issue { get; protected set; }
-        public User Assignee { get; protected set; }
-        public Label Label { get; protected set; }
     }
 }