格式调整

Author: 欧俊

src/azure.devops.notify.dingtalk.robots/AzureDevOps/PullRequestCreatedResource.cs

@@ -19,7 +19,7 @@ public class PullRequestCreatedResource : Resource
         public Commit LastMergeSourceCommit { get; set; }
         public Commit LastMergeTargetCommit { get; set; }
         public Commit LastMergeCommit { get; set; }
-        public List<Reviewer> Reviewers { get; set; }
+        public List<Reviewer> Reviewers { get; set; } = new List<Reviewer>();
         public List<Commit> Commits { get; set; }
         public string Url { get; set; }
         [JsonProperty("_links")]

src/azure.devops.notify.dingtalk.robots/AzureDevOps/Reviewer.cs

@@ -2,10 +2,11 @@
 {
     public class Reviewer
     {
-        public string reviewerUrl { get; set; }
-        public int vote { get; set; }
-        public string displayName { get; set; }
+        public string ReviewerUrl { get; set; }
+        public int Vote { get; set; }
+        public string DisplayName { get; set; }
         public string Url { get; set; }
+        public bool? IsRequired { get; set; }
 
     }
 }

src/azure.devops.notify.dingtalk.robots/Controllers/WebHookController.cs

@@ -45,7 +45,14 @@ public WebHookController(IDingTalkService dingTalkService, ILogger<WebHookContro
             "abandoned" => "已放弃",
             _ => status,
         };
-
+        public string ReviewStatus(int vote) => vote switch
+        {
+            -10 => " [拒绝]",
+            -5 => " [无聊]",
+            5 => " [会议]",
+            10 => " [OK]",
+            _ => ""
+        };
         /// <summary>
         /// 拉取请求
         /// </summary>
@@ -59,24 +66,35 @@ public async Task<IActionResult> RequestUpdated([FromBody] WebHooksRequestPullRe
             string repository = request.Resource.Repository.Name;
 
             StringBuilder stringBuilder = new();
-            stringBuilder.AppendLine($"#### [#{request.Resource.CodeReviewId} {createdBy} {request.Resource.SourceRefName.Replace("refs/heads/", "")} 到 {request.Resource.TargetRefName.Replace("refs/heads/", "")} 分支的拉取请求]({html})");
+            stringBuilder.AppendLine($"#### [#{request.Resource.CodeReviewId} {repository} 产生了 {request.Resource.SourceRefName.Replace("refs/heads/", "")} 到 {request.Resource.TargetRefName.Replace("refs/heads/", "")} 的拉取请求]({html})");
             stringBuilder.AppendLine();
             stringBuilder.AppendLine("---");
             stringBuilder.AppendLine($"> 仓储: {repository}");
             stringBuilder.AppendLine("> ");
+            stringBuilder.AppendLine($"> 创建: @{createdBy}");
+            stringBuilder.AppendLine("> ");
             stringBuilder.AppendLine($"> 合并: {request.Resource.SourceRefName.Replace("refs/heads/", "")} 到 {request.Resource.TargetRefName.Replace("refs/heads/", "")} {(request.Resource.MergeStatus == "conflicts" ? "[打叉]合并冲突" : "")}");
             stringBuilder.AppendLine("> ");
 
 
             //request.Resource.Status->completed,active,abandoned
             stringBuilder.AppendLine($"> 状态: {RequestUpdatedStatus(request.Resource.Status)}");
             stringBuilder.AppendLine("> ");
-
-            var reviews = request.Resource.Reviewers?.Select(t => $"@{t.displayName}").ToList() ?? new List<string>();
-            if (reviews.Any())
+            if (request.Resource.Reviewers.Any())
             {
-                stringBuilder.AppendLine($"> 审阅: {string.Join(' ', reviews)}");
-                stringBuilder.AppendLine("> ");
+                stringBuilder.AppendLine("---");
+                var requiredreviews = request.Resource.Reviewers?.Where(t => t.IsRequired == true)?.Select(t => $"@{t.DisplayName}{ReviewStatus(t.Vote)}").ToList() ?? new List<string>();
+                if (requiredreviews.Any())
+                {
+                    stringBuilder.AppendLine($"> 审阅-必须: {string.Join(" 、", requiredreviews)}");
+                    stringBuilder.AppendLine("> ");
+                }
+                var reviews = request.Resource.Reviewers?.Where(t => t.IsRequired != true)?.Select(t => $"@{t.DisplayName}{ReviewStatus(t.Vote)}").ToList() ?? new List<string>();
+                if (reviews.Any())
+                {
+                    stringBuilder.AppendLine($"> 审阅-可选: {string.Join(" 、", reviews)}");
+                    stringBuilder.AppendLine("> ");
+                }
             }
             stringBuilder.AppendLine("---");
             stringBuilder.AppendLine();