Fixes due to recent rebase

Jericho · Jericho · commit b30f26b414cb · 2023-11-12T10:58:24.000-05:00
diff --git a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
@@ -413,7 +413,7 @@ public string GetIssueType(Issue issue)
         {
             return issue.IsPullRequest ? "Pull Request" : "Issue";
         }
-        
+
         public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)
         {
             var graphQLQuery = string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY,
diff --git a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
@@ -391,6 +391,12 @@ public string GetIssueType(Issue issue)
             return issue.IsPullRequest ? "Merge Request" : "Issue";
         }
 
+        public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)
+        {
+            // This is a placeholder until I figure out if GitLab has a something equivalent to GitHub's "linked issue"
+            throw new NotImplementedException();
+        }
+
         private int GetGitLabProjectId(string owner, string repository)
         {
             if (_projectId.HasValue)
diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -76,7 +76,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
             {
                 foreach (var issue in kvp.Value)
                 {
-                    issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.Number).ConfigureAwait(false);
+                    issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.PublicNumber).ConfigureAwait(false);
                 }
             }
 
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-details.sbn b/src/GitReleaseManager.Core/Templates/default/issue-details.sbn
@@ -1,9 +1,5 @@
 __{{ issue_label }}__
 
 {{ for issue in issues.items[issue_label]
-    if issue.is_pull_request
-        include 'pullrequest-note'
-    else
-        include 'issue-note'
-    end
+    include 'issue-note'
 end }}
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -1,6 +1,6 @@
 {{
     if issue.is_pull_request
-}}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue }} raised in [#{{ issue.linked_issue.public_number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
+}}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue }} raised in [#{{ issue.linked_issue.public_number }}]({{ issue.linked_issue.html_url }}){{ if issue.linked_issue.user }} by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}{{ end }}
 {{  else
-}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue }} resolved in [#{{ issue.linked_issue.public_number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
+}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue }} resolved in [#{{ issue.linked_issue.public_number }}]({{ issue.linked_issue.html_url }}){{ if issue.linked_issue.user }} by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}{{ end }}
 {{  end -}}
diff --git a/src/GitReleaseManager.Core/Templates/default/pullrequest-note.sbn b/src/GitReleaseManager.Core/Templates/default/pullrequest-note.sbn
diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -107,11 +107,11 @@ public async Task GetLinkedIssue()
         {
             // Assert that issue 43 is linked to pull request 108
             var result1 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 43).ConfigureAwait(false);
-            Assert.AreEqual(108, result1.Number);
+            Assert.AreEqual(108, result1.PublicNumber);
 
             // Assert that pull request 108 is linked to issue 43
             var result2 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 108).ConfigureAwait(false);
-            Assert.AreEqual(43, result2.Number);
+            Assert.AreEqual(43, result2.PublicNumber);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ public string GetIssueType(Issue issue)`
`413`	`413`	`{`
`414`	`414`	`return issue.IsPullRequest ? "Pull Request" : "Issue";`
`415`	`415`	`}`
`416`		`-`
	`416`	`+`
`417`	`417`	`public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)`
`418`	`418`	`{`
`419`	`419`	`var graphQLQuery = string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY,`
Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,12 @@ public string GetIssueType(Issue issue)`
`391`	`391`	`return issue.IsPullRequest ? "Merge Request" : "Issue";`
`392`	`392`	`}`
`393`	`393`
	`394`	`+ public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)`
	`395`	`+ {`
	`396`	`+ // This is a placeholder until I figure out if GitLab has a something equivalent to GitHub's "linked issue"`
	`397`	`+ throw new NotImplementedException();`
	`398`	`+ }`
	`399`	`+`
`394`	`400`	`private int GetGitLabProjectId(string owner, string repository)`
`395`	`401`	`{`
`396`	`402`	`if (_projectId.HasValue)`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,`
`76`	`76`	`{`
`77`	`77`	`foreach (var issue in kvp.Value)`
`78`	`78`	`{`
`79`		`- issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.Number).ConfigureAwait(false);`
	`79`	`+ issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.PublicNumber).ConfigureAwait(false);`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ public async Task GetLinkedIssue()`
`107`	`107`	`{`
`108`	`108`	`// Assert that issue 43 is linked to pull request 108`
`109`	`109`	`var result1 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 43).ConfigureAwait(false);`
`110`		`- Assert.AreEqual(108, result1.Number);`
	`110`	`+ Assert.AreEqual(108, result1.PublicNumber);`
`111`	`111`
`112`	`112`	`// Assert that pull request 108 is linked to issue 43`
`113`	`113`	`var result2 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 108).ConfigureAwait(false);`
`114`		`- Assert.AreEqual(43, result2.Number);`
	`114`	`+ Assert.AreEqual(43, result2.PublicNumber);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`