Added support for reviewers (#95)

* Added support for reviewers

Co-authored-by: Laurent Bédard-Hamel <laurent.bedard-hamel@ubisoft.com>

Author: Laurent-BH

NGitLab.Mock/Clients/MergeRequestClient.cs

@@ -377,6 +377,23 @@ public void Delete(int mergeRequestIid)
                     mergeRequests = mergeRequests.Where(mr => mr.Assignee?.Id == assigneeId);
                 }
 
+                if (query.ReviewerId != null)
+                {
+                    if (query.ReviewerId == QueryAssigneeId.None)
+                    {
+                        mergeRequests = mergeRequests.Where(mr => mr.Reviewers == null || mr.Reviewers.Count == 0);
+                    }
+                    else if (query.ReviewerId == QueryAssigneeId.Any)
+                    {
+                        mergeRequests = mergeRequests.Where(mr => mr.Reviewers != null || mr.Reviewers.Any());
+                    }
+                    else
+                    {
+                        var reviewerId = int.Parse(query.ReviewerId.ToString());
+                        mergeRequests = mergeRequests.Where(mr => mr.Reviewers.Any(x => reviewerId.Equals(x.Id)));
+                    }
+                }
+
                 if (query.AuthorId != null)
                 {
                     mergeRequests = mergeRequests.Where(mr => mr.Author.Id == query.AuthorId);
@@ -571,6 +588,18 @@ public Models.MergeRequest Update(int mergeRequestIid, MergeRequestUpdate mergeR
                     }
                 }
 
+                if (mergeRequestUpdate.ReviewerIds != null)
+                {
+                    foreach (var userId in mergeRequestUpdate.ReviewerIds)
+                    {
+                        var reviewer = Server.Users.GetById(userId);
+                        if (reviewer == null)
+                            throw new GitLabBadRequestException("user not found");
+
+                        mergeRequest.Reviewers.Add(reviewer);
+                    }
+                }
+
                 if (mergeRequestUpdate.Description != null)
                 {
                     mergeRequest.Description = mergeRequestUpdate.Description;

NGitLab.Mock/MergeRequest.cs

@@ -27,6 +27,8 @@ public MergeRequest()
 
         public UserRef Assignee { get; set; }
 
+        public IList<UserRef> Reviewers { get; } = new List<UserRef>();
+
         public string SourceBranch { get; set; }
 
         public string TargetBranch { get; set; }
@@ -183,7 +185,20 @@ internal Models.MergeRequest ToMergeRequestClient()
                 HeadPipeline = HeadPipeline?.ToPipelineClient(),
                 Labels = Labels.ToArray(),
                 RebaseInProgress = RebaseInProgress,
+                Reviewers = GetUsers(Reviewers),
             };
         }
+
+        internal static Models.User[] GetUsers(IList<UserRef> userRefs)
+        {
+            var users = new List<Models.User>();
+            foreach(var userRef in userRefs)
+            {
+                var user = userRef.ToUserClient();
+                users.Add(user);
+            }
+
+            return users.ToArray();
+        }
     }
 }

NGitLab.Mock/PublicAPI.Unshipped.txt

@@ -512,6 +512,7 @@ NGitLab.Mock.MergeRequest.Project.get -> NGitLab.Mock.Project
 NGitLab.Mock.MergeRequest.Rebase(NGitLab.Mock.User user) -> NGitLab.Models.RebaseResult
 NGitLab.Mock.MergeRequest.RebaseInProgress.get -> bool
 NGitLab.Mock.MergeRequest.RebaseInProgress.set -> void
+NGitLab.Mock.MergeRequest.Reviewers.get -> System.Collections.Generic.IList<NGitLab.Mock.UserRef>
 NGitLab.Mock.MergeRequest.Sha.get -> NGitLab.Sha1
 NGitLab.Mock.MergeRequest.ShouldRemoveSourceBranch.get -> bool
 NGitLab.Mock.MergeRequest.ShouldRemoveSourceBranch.set -> void

NGitLab.Tests/MergeRequest/MergeRequestClientTests.cs

@@ -166,6 +166,25 @@ public async Task Test_get_assigned_merge_requests()
             Assert.AreEqual(1, mergeRequests.Count, "The query retrieved all open merged requests that are unassigned");
         }
 
+        [Test]
+        [NGitLabRetry]
+        public async Task Test_set_reviewers_merge_requests()
+        {
+            using var context = await GitLabTestContext.CreateAsync();
+            var (project, mergeRequest) = context.CreateMergeRequest();
+            context.CreateMergeRequest(); // Second MR to verify filter returns only one
+            var mergeRequestClient = context.Client.GetMergeRequest(project.Id);
+            var userId = context.Client.Users.Current.Id;
+            mergeRequestClient.Update(mergeRequest.Iid, new MergeRequestUpdate { ReviewerIds = new int[] { userId } });
+
+            var mergeRequests = mergeRequestClient.Get(new MergeRequestQuery { ReviewerId = userId }).ToList();
+            Assert.AreEqual(1, mergeRequests.Count, "The query retrieved all open merged requests that are assigned for a reviewer");
+
+            var mergeRequestUpdated = mergeRequests.Single();
+            var reviewers = mergeRequestUpdated.Reviewers;
+            Assert.AreEqual(1, reviewers.Length);
+        }
+
         private static void ListMergeRequest(IMergeRequestClient mergeRequestClient, Models.MergeRequest mergeRequest)
         {
             Assert.IsTrue(mergeRequestClient.All.Any(x => x.Id == mergeRequest.Id), "Test 'All' accessor returns the merge request");

NGitLab/Impl/MergeRequestClient.cs

@@ -46,6 +46,7 @@ public IEnumerable<MergeRequest> Get(MergeRequestQuery query)
             url = Utils.AddParameter(url, "author_id", query.AuthorId);
             url = Utils.AddParameter(url, "per_page", query.PerPage);
             url = Utils.AddParameter(url, "assignee_id", query.AssigneeId);
+            url = Utils.AddParameter(url, "reviewer_id", query.ReviewerId);
             url = Utils.AddParameter(url, "approver_ids[]", query.ApproverIds);
             url = Utils.AddParameter(url, "source_branch", query.SourceBranch);
             url = Utils.AddParameter(url, "target_branch", query.TargetBranch);

NGitLab/Models/MergeRequest.cs

@@ -114,6 +114,9 @@ public class MergeRequest
         [DataMember(Name = "assignees")]
         public User[] Assignees;
 
+        [DataMember(Name = "reviewers")]
+        public User[] Reviewers;
+
         [DataMember(Name = "allow_collaboration")]
         public bool? AllowCollaboration;
 

NGitLab/Models/MergeRequestQuery.cs

@@ -74,6 +74,11 @@ public class MergeRequestQuery
         /// </summary>
         public QueryAssigneeId AssigneeId { get; set; }
 
+        /// <summary>
+        /// Returns the merge requests reviewer ids.
+        /// </summary>
+        public QueryAssigneeId ReviewerId { get; set; }
+
         /// <summary>
         /// Returns merge requests which have specified all the users with the given ids as individual approvers.
         /// None returns merge requests without approvers. Any returns merge requests with an approver.

NGitLab/Models/MergeRequestUpdate.cs

@@ -17,6 +17,9 @@ public class MergeRequestUpdate
         [DataMember(Name = "assignee_ids")]
         public int[] AssigneeIds;
 
+        [DataMember(Name = "reviewer_ids")]
+        public int[] ReviewerIds;
+
         [DataMember(Name = "title")]
         public string Title;
 

NGitLab/PublicAPI.Unshipped.txt

@@ -1680,6 +1680,7 @@ NGitLab.Models.MergeRequest.MergeWhenPipelineSucceeds -> bool
 NGitLab.Models.MergeRequest.Milestone -> NGitLab.Models.Milestone
 NGitLab.Models.MergeRequest.ProjectId -> int
 NGitLab.Models.MergeRequest.RebaseInProgress -> bool
+NGitLab.Models.MergeRequest.Reviewers -> NGitLab.Models.User[]
 NGitLab.Models.MergeRequest.Sha -> string
 NGitLab.Models.MergeRequest.ShouldRemoveSourceBranch -> bool?
 NGitLab.Models.MergeRequest.SourceBranch -> string
@@ -1828,6 +1829,8 @@ NGitLab.Models.MergeRequestQuery.OrderBy.get -> string
 NGitLab.Models.MergeRequestQuery.OrderBy.set -> void
 NGitLab.Models.MergeRequestQuery.PerPage.get -> int?
 NGitLab.Models.MergeRequestQuery.PerPage.set -> void
+NGitLab.Models.MergeRequestQuery.ReviewerId.get -> NGitLab.Models.QueryAssigneeId
+NGitLab.Models.MergeRequestQuery.ReviewerId.set -> void
 NGitLab.Models.MergeRequestQuery.Scope.get -> string
 NGitLab.Models.MergeRequestQuery.Scope.set -> void
 NGitLab.Models.MergeRequestQuery.Search.get -> string
@@ -1866,6 +1869,7 @@ NGitLab.Models.MergeRequestUpdate.Labels -> string
 NGitLab.Models.MergeRequestUpdate.MergeRequestUpdate() -> void
 NGitLab.Models.MergeRequestUpdate.MilestoneId -> int?
 NGitLab.Models.MergeRequestUpdate.NewState -> string
+NGitLab.Models.MergeRequestUpdate.ReviewerIds -> int[]
 NGitLab.Models.MergeRequestUpdate.SourceBranch -> string
 NGitLab.Models.MergeRequestUpdate.TargetBranch -> string
 NGitLab.Models.MergeRequestUpdate.Title -> string