Fix GitLab Author Metadata: Use username Instead of author_name, Add author_username Trait, and Improve Release Metadata Extraction (#1)

Author: JuryA

git-cliff-core/src/release.rs

@@ -551,6 +551,7 @@ mod test {
 					merge_commit_sha: Some(String::from(
 						"1d244937ee6ceb8e0314a4a201ba93a7a61f2071",
 					)),
+					user:             None,
 					labels:           vec![PullRequestLabel {
 						name: String::from("rust"),
 					}],
@@ -561,6 +562,7 @@ mod test {
 					merge_commit_sha: Some(String::from(
 						"21f6aa587fcb772de13f2fde0e92697c51f84162",
 					)),
+					user:             None,
 					labels:           vec![PullRequestLabel {
 						name: String::from("rust"),
 					}],
@@ -571,6 +573,7 @@ mod test {
 					merge_commit_sha: Some(String::from(
 						"35d8c6b6329ecbcf131d7df02f93c3bbc5ba5973",
 					)),
+					user:             None,
 					labels:           vec![PullRequestLabel {
 						name: String::from("deps"),
 					}],
@@ -581,6 +584,7 @@ mod test {
 					merge_commit_sha: Some(String::from(
 						"4d3ffe4753b923f4d7807c490e650e6624a12074",
 					)),
+					user:             None,
 					labels:           vec![PullRequestLabel {
 						name: String::from("deps"),
 					}],
@@ -591,6 +595,7 @@ mod test {
 					merge_commit_sha: Some(String::from(
 						"5a55e92e5a62dc5bf9872ffb2566959fad98bd05",
 					)),
+					user:             None,
 					labels:           vec![PullRequestLabel {
 						name: String::from("github"),
 					}],

git-cliff-core/src/remote/bitbucket.rs

@@ -149,6 +149,10 @@ impl RemotePullRequest for BitbucketPullRequest {
 	fn merge_commit(&self) -> Option<String> {
 		Some(self.merge_commit.hash.clone())
 	}
+
+	fn author_username(&self) -> Option<String> {
+		self.author.login.clone()
+	}
 }
 
 /// <https://developer.atlassian.com/cloud/bitbucket/rest/api-group-pullrequests/#api-repositories-workspace-repo-slug-pullrequests-get>

git-cliff-core/src/remote/github.rs

@@ -95,6 +95,13 @@ pub struct GitHubCommitAuthor {
 	pub login: Option<String>,
 }
 
+/// Author of the pull request.
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct GitHubPullRequestUser {
+	/// Username.
+	pub login: Option<String>,
+}
+
 /// Label of the pull request.
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -112,6 +119,8 @@ pub struct GitHubPullRequest {
 	pub title:            Option<String>,
 	/// SHA of the merge commit.
 	pub merge_commit_sha: Option<String>,
+	/// Author of the pull request.
+	pub user:             Option<GitHubPullRequestUser>,
 	/// Labels of the pull request.
 	pub labels:           Vec<PullRequestLabel>,
 }
@@ -132,6 +141,10 @@ impl RemotePullRequest for GitHubPullRequest {
 	fn merge_commit(&self) -> Option<String> {
 		self.merge_commit_sha.clone()
 	}
+
+	fn author_username(&self) -> Option<String> {
+		self.user.clone().and_then(|v| v.login)
+	}
 }
 
 impl RemoteEntry for GitHubPullRequest {

git-cliff-core/src/remote/gitlab.rs

@@ -194,6 +194,10 @@ impl RemotePullRequest for GitLabMergeRequest {
 			.or(self.squash_commit_sha.clone())
 			.or(Some(self.sha.clone()))
 	}
+
+	fn author_username(&self) -> Option<String> {
+		Some(self.author.username.clone())
+	}
 }
 
 impl RemoteEntry for GitLabMergeRequest {

git-cliff-core/src/remote/mod.rs

@@ -115,6 +115,10 @@ pub trait RemotePullRequest: DynClone {
 	fn labels(&self) -> Vec<String>;
 	/// Merge commit SHA.
 	fn merge_commit(&self) -> Option<String>;
+	/// Username of the author of the pull request.
+	fn author_username(&self) -> Option<String> {
+		None
+	}
 }
 
 dyn_clone::clone_trait_object!(RemotePullRequest);
@@ -354,7 +358,10 @@ macro_rules! update_release_metadata {
 							pr.merge_commit() == Some(v.id().clone()) ||
 								pr.merge_commit() == sha_short
 						});
-						commit.$remote.username = v.username();
+						let username = pull_request
+							.and_then(|pr| pr.author_username())
+							.or_else(|| v.username());
+						commit.$remote.username = username.clone();
 						commit.$remote.pr_number = pull_request.map(|v| v.number());
 						commit.$remote.pr_title =
 							pull_request.and_then(|v| v.title().clone());