From 781f8b490e211c0dde4dfa2f84226eed802255c2 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tuxtimo@gmail.com>
Date: Wed, 13 Jul 2022 18:28:22 +0200
Subject: [PATCH] Update Project Issue Board API to match upstream API

---
 boards.go            | 40 +++++++++++++++++++++++++++++++---------
 boards_test.go       |  6 ++++--
 group_boards_test.go |  8 ++++++++
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/boards.go b/boards.go
index fa90b9264..a75c9bda4 100644
--- a/boards.go
+++ b/boards.go
@@ -33,11 +33,21 @@ type IssueBoardsService struct {
 //
 // GitLab API docs: https://docs.gitlab.com/ce/api/boards.html
 type IssueBoard struct {
-	ID        int          `json:"id"`
-	Name      string       `json:"name"`
-	Project   *Project     `json:"project"`
-	Milestone *Milestone   `json:"milestone"`
-	Lists     []*BoardList `json:"lists"`
+	ID        int        `json:"id"`
+	Name      string     `json:"name"`
+	Project   *Project   `json:"project"`
+	Milestone *Milestone `json:"milestone"`
+	Assignee  *struct {
+		ID        int    `json:"id"`
+		Username  string `json:"username"`
+		Name      string `json:"name"`
+		State     string `json:"state"`
+		AvatarURL string `json:"avatar_url"`
+		WebURL    string `json:"web_url"`
+	} `json:"assignee"`
+	Lists  []*BoardList    `json:"lists"`
+	Weight int             `json:"weight"`
+	Labels []*LabelDetails `json:"labels"`
 }
 
 func (b IssueBoard) String() string {
@@ -48,9 +58,18 @@ func (b IssueBoard) String() string {
 //
 // GitLab API docs: https://docs.gitlab.com/ce/api/boards.html
 type BoardList struct {
-	ID       int    `json:"id"`
-	Label    *Label `json:"label"`
-	Position int    `json:"position"`
+	ID       int `json:"id"`
+	Assignee *struct {
+		ID       int    `json:"id"`
+		Name     string `json:"name"`
+		Username string `json:"username"`
+	} `json:"assignee"`
+	Iteration      *ProjectIteration `json:"iteration"`
+	Label          *Label            `json:"label"`
+	MaxIssueCount  int               `json:"max_issue_count"`
+	MaxIssueWeight int               `json:"max_issue_weight"`
+	Milestone      *Milestone        `json:"milestone"`
+	Position       int               `json:"position"`
 }
 
 func (b BoardList) String() string {
@@ -257,7 +276,10 @@ func (s *IssueBoardsService) GetIssueBoardList(pid interface{}, board, list int,
 //
 // GitLab API docs: https://docs.gitlab.com/ce/api/boards.html#new-board-list
 type CreateIssueBoardListOptions struct {
-	LabelID *int `url:"label_id" json:"label_id"`
+	LabelID     *int `url:"label_id,omitempty" json:"label_id,omitempty"`
+	AssigneeID  *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
+	MilestoneID *int `url:"milestone_id,omitempty" json:"milestone_id,omitempty"`
+	IterationID *int `url:"iteration_id,omitempty" json:"iteration_id,omitempty"`
 }
 
 // CreateIssueBoardList creates a new issue board list.
diff --git a/boards_test.go b/boards_test.go
index 46dfb8aa8..892e1debe 100644
--- a/boards_test.go
+++ b/boards_test.go
@@ -49,7 +49,8 @@ func TestIssueBoardsService_CreateIssueBoard(t *testing.T) {
 			Path:              "diaspora-project-site",
 			PathWithNamespace: "diaspora/diaspora-project-site",
 		},
-		Lists: []*BoardList{},
+		Lists:  []*BoardList{},
+		Labels: []*LabelDetails{},
 	}
 
 	ib, resp, err := client.Boards.CreateIssueBoard(5, nil, nil)
@@ -114,7 +115,8 @@ func TestIssueBoardsService_UpdateIssueBoard(t *testing.T) {
 			Path:              "diaspora-project-site",
 			PathWithNamespace: "diaspora/diaspora-project-site",
 		},
-		Lists: []*BoardList{},
+		Lists:  []*BoardList{},
+		Labels: []*LabelDetails{},
 	}
 
 	ib, resp, err := client.Boards.UpdateIssueBoard(5, 1, nil, nil)
diff --git a/group_boards_test.go b/group_boards_test.go
index ba60c3684..63e29f060 100644
--- a/group_boards_test.go
+++ b/group_boards_test.go
@@ -583,6 +583,14 @@ func TestGroupIssueBoardsService_CreateGroupIssueBoardList(t *testing.T) {
 		ID:       9,
 		Label:    nil,
 		Position: 0,
+		Milestone: &Milestone{
+			ID:          7,
+			IID:         3,
+			Title:       "Milestone with due date",
+			Description: "",
+			State:       "active",
+			WebURL:      "https://gitlab.example.com/groups/issue-reproduce/-/milestones/3",
+		},
 	}
 
 	bl, resp, err := client.GroupIssueBoards.CreateGroupIssueBoardList(5, 1, nil, nil)