From efc91b8de2e6acc5fd198d092104fbb5016951e7 Mon Sep 17 00:00:00 2001
From: Jeremie Bresson <jeremie.bresson@unblu.com>
Date: Mon, 9 Dec 2024 09:16:13 +0100
Subject: [PATCH] BoardApi fixes and group support

---
 .../main/java/org/gitlab4j/api/BoardsApi.java | 417 +++++++++++++++++-
 .../org/gitlab4j/api/models/AbstractUser.java |   9 +
 .../java/org/gitlab4j/api/models/Board.java   |  56 ++-
 .../org/gitlab4j/api/models/BoardList.java    |  54 +++
 .../org/gitlab4j/api/models/Iteration.java    |   6 +
 .../java/org/gitlab4j/api/models/Label.java   |   9 +
 .../gitlab4j/models/TestGitLabApiBeans.java   |   8 +-
 .../org/gitlab4j/models/epic-issue.json       |   4 +-
 .../org/gitlab4j/models/group-board.json      | 102 +++++
 .../resources/org/gitlab4j/models/issue.json  |   4 +-
 .../org/gitlab4j/models/iteration.json        |   4 +-
 .../org/gitlab4j/models/project-board.json    |  35 +-
 12 files changed, 685 insertions(+), 23 deletions(-)
 create mode 100644 gitlab4j-models/src/test/resources/org/gitlab4j/models/group-board.json

diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/BoardsApi.java b/gitlab4j-api/src/main/java/org/gitlab4j/api/BoardsApi.java
index 2cf0fe78a..8a585dfc9 100644
--- a/gitlab4j-api/src/main/java/org/gitlab4j/api/BoardsApi.java
+++ b/gitlab4j-api/src/main/java/org/gitlab4j/api/BoardsApi.java
@@ -122,8 +122,6 @@ public Optional<Board> getOptionalBoard(Object projectIdOrPath, Long boardId) {
     /**
      * Creates a new Issue Board.
      *
-     * <p>NOTE: This is only available in GitLab EE</p>
-     *
      * <pre><code>GitLab Endpoint: POST /projects/:id/boards</code></pre>
      *
      * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
@@ -141,13 +139,13 @@ public Board createBoard(Object projectIdOrPath, String name) throws GitLabApiEx
     /**
      * Updates an existing Issue Board.
      *
-     * <p>NOTE: This is only available in GitLab EE</p>
-     *
      * <pre><code>GitLab Endpoint: PUT /projects/:id/boards/:board_id</code></pre>
      *
      * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance, required
      * @param boardId the ID of the board, required
      * @param name the new name of the board, optional (can be null)
+     * @param hideBacklogList hide the Open list, optional (can be null)
+     * @param hideClosedList hide the Closed list, optional (can be null)
      * @param assigneeId the assignee the board should be scoped to, optional (can be null)
      * @param milestoneId the milestone the board should be scoped to, optional (can be null)
      * @param labels a comma-separated list of label names which the board should be scoped to, optional (can be null)
@@ -155,10 +153,12 @@ public Board createBoard(Object projectIdOrPath, String name) throws GitLabApiEx
      * @return the updated Board instance
      * @throws GitLabApiException if any exception occurs
      */
-    public BoardList updateBoard(
+    public Board updateBoard(
             Object projectIdOrPath,
             Long boardId,
             String name,
+            Boolean hideBacklogList,
+            Boolean hideClosedList,
             Long assigneeId,
             Long milestoneId,
             String labels,
@@ -166,10 +166,13 @@ public BoardList updateBoard(
             throws GitLabApiException {
         GitLabApiForm formData = new GitLabApiForm()
                 .withParam("name", name)
+                .withParam("hide_backlog_list", hideBacklogList)
+                .withParam("hide_closed_list", hideClosedList)
                 .withParam("assignee_id", assigneeId)
                 .withParam("milestone_id", milestoneId)
                 .withParam("labels", labels)
                 .withParam("weight", weight);
+
         Response response = put(
                 Response.Status.OK,
                 formData.asMap(),
@@ -177,14 +180,12 @@ public BoardList updateBoard(
                 getProjectIdOrPath(projectIdOrPath),
                 "boards",
                 boardId);
-        return (response.readEntity(BoardList.class));
+        return (response.readEntity(Board.class));
     }
 
     /**
      * Soft deletes an existing Issue Board.
      *
-     * <p>NOTE: This is only available in GitLab EE</p>
-     *
      * <pre><code>GitLab Endpoint: DELETE /projects/:id/boards/:board_id</code></pre>
      *
      * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
@@ -323,12 +324,21 @@ public Optional<BoardList> getOptionalBoardList(Object projectIdOrPath, Long boa
      *
      * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
      * @param boardId the ID of the board
-     * @param labelId the ID of the label
+     * @param labelId the ID of the label, optional (can be null)
+     * @param assigneeId The ID of a user. Premium and Ultimate only, optional (can be null)
+     * @param milestoneId The ID of a milestone. Premium and Ultimate only, optional (can be null)
+     * @param iterationId The ID of a milestone. Premium and Ultimate only, optional (can be null)
      * @return the created BoardList instance
      * @throws GitLabApiException if any exception occurs
      */
-    public BoardList createBoardList(Object projectIdOrPath, Long boardId, Long labelId) throws GitLabApiException {
-        GitLabApiForm formData = new GitLabApiForm().withParam("label_id", labelId, true);
+    public BoardList createBoardList(
+            Object projectIdOrPath, Long boardId, Long labelId, Long assigneeId, Long milestoneId, Long iterationId)
+            throws GitLabApiException {
+        GitLabApiForm formData = new GitLabApiForm()
+                .withParam("label_id", labelId)
+                .withParam("assignee_id", assigneeId)
+                .withParam("milestone_id", milestoneId)
+                .withParam("iteration_id", iterationId);
         Response response = post(
                 Response.Status.CREATED,
                 formData,
@@ -340,6 +350,23 @@ public BoardList createBoardList(Object projectIdOrPath, Long boardId, Long labe
         return (response.readEntity(BoardList.class));
     }
 
+    /**
+     * Creates a new Issue Board list.
+     *
+     * <pre><code>GitLab Endpoint: POST /projects/:id/boards/:board_id/lists</code></pre>
+     *
+     * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
+     * @param boardId the ID of the board
+     * @param labelId the ID of the label
+     * @return the created BoardList instance
+     * @throws GitLabApiException if any exception occurs
+     * @deprecated use {@link #createBoardList(Object, Long, Long, Long, Long, Long)} instead
+     */
+    @Deprecated
+    public BoardList createBoardList(Object projectIdOrPath, Long boardId, Long labelId) throws GitLabApiException {
+        return createBoardList(projectIdOrPath, boardId, labelId, null, null, null);
+    }
+
     /**
      * Updates an existing Issue Board list. This call is used to change list position.
      *
@@ -388,4 +415,372 @@ public void deleteBoardList(Object projectIdOrPath, Long boardId, Long listId) t
                 "lists",
                 listId);
     }
+
+    /**
+     * Lists Issue Boards in the given group.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @return a list of group's issue boards
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<Board> getGroupBoards(Object groupIdOrPath) throws GitLabApiException {
+        return (getGroupBoards(groupIdOrPath, getDefaultPerPage()).all());
+    }
+
+    /**
+     * Get all issue boards for the specified group using the specified page and per page setting
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param page the page to get
+     * @param perPage the number of items per page
+     * @return a list of group's Boards in the specified range
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<Board> getGroupBoards(Object groupIdOrPath, int page, int perPage) throws GitLabApiException {
+        Response response = get(
+                jakarta.ws.rs.core.Response.Status.OK,
+                getPageQueryParams(page, perPage),
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "boards");
+        return (response.readEntity(new GenericType<List<Board>>() {}));
+    }
+
+    /**
+     * Get a Pager of all issue boards for the specified group.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param itemsPerPage the number of items per page
+     * @return a Pager of group's issue boards
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Pager<Board> getGroupBoards(Object groupIdOrPath, int itemsPerPage) throws GitLabApiException {
+        return (new Pager<Board>(
+                this, Board.class, itemsPerPage, null, "groups", getGroupIdOrPath(groupIdOrPath), "boards"));
+    }
+
+    /**
+     * Get a Stream of all issue boards for the specified group.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @return a Stream of group's issue boards
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Stream<Board> getGroupBoardsStream(Object groupIdOrPath) throws GitLabApiException {
+        return (getGroupBoards(groupIdOrPath, getDefaultPerPage()).stream());
+    }
+
+    /**
+     * Get a single issue board.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @return a Board instance for the specified board ID
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Board getGroupBoard(Object groupIdOrPath, Long boardId) throws GitLabApiException {
+        Response response = get(Response.Status.OK, null, "groups", getGroupIdOrPath(groupIdOrPath), "boards", boardId);
+        return (response.readEntity(Board.class));
+    }
+
+    /**
+     * Get an issue board as an Optional instance.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @return the Board instance for the specified board ID as an Optional instance
+     */
+    public Optional<Board> getOptionalGroupBoard(Object groupIdOrPath, Long boardId) {
+        try {
+            return (Optional.ofNullable(getGroupBoard(groupIdOrPath, boardId)));
+        } catch (GitLabApiException glae) {
+            return (GitLabApi.createOptionalFromException(glae));
+        }
+    }
+
+    /**
+     * Creates a new Issue Board.
+     *
+     * <pre><code>GitLab Endpoint: POST /groups/:id/boards</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param name the name for the new board
+     * @return the created Board instance
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Board createGroupBoard(Object groupIdOrPath, String name) throws GitLabApiException {
+        GitLabApiForm formData = new GitLabApiForm().withParam("name", name, true);
+        Response response =
+                post(Response.Status.CREATED, formData.asMap(), "groups", getGroupIdOrPath(groupIdOrPath), "boards");
+        return (response.readEntity(Board.class));
+    }
+
+    /**
+     * Updates an existing Issue Board.
+     *
+     * <pre><code>GitLab Endpoint: PUT /groups/:id/boards/:board_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance, required
+     * @param boardId the ID of the board, required
+     * @param name the new name of the board, optional (can be null)
+     * @param hideBacklogList hide the Open list, optional (can be null)
+     * @param hideClosedList hide the Closed list, optional (can be null)
+     * @param assigneeId the assignee the board should be scoped to, optional (can be null)
+     * @param milestoneId the milestone the board should be scoped to, optional (can be null)
+     * @param labels a comma-separated list of label names which the board should be scoped to, optional (can be null)
+     * @param weight the weight range from 0 to 9, to which the board should be scoped to, optional (can be null)
+     * @return the updated Board instance
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Board updateGroupBoard(
+            Object groupIdOrPath,
+            Long boardId,
+            String name,
+            Boolean hideBacklogList,
+            Boolean hideClosedList,
+            Long assigneeId,
+            Long milestoneId,
+            String labels,
+            Integer weight)
+            throws GitLabApiException {
+        GitLabApiForm formData = new GitLabApiForm()
+                .withParam("name", name)
+                .withParam("hide_backlog_list", hideBacklogList)
+                .withParam("hide_closed_list", hideClosedList)
+                .withParam("assignee_id", assigneeId)
+                .withParam("milestone_id", milestoneId)
+                .withParam("labels", labels)
+                .withParam("weight", weight);
+        Response response =
+                put(Response.Status.OK, formData.asMap(), "groups", getGroupIdOrPath(groupIdOrPath), "boards", boardId);
+        return (response.readEntity(Board.class));
+    }
+
+    /**
+     * Soft deletes an existing Issue Board.
+     *
+     * <pre><code>GitLab Endpoint: DELETE /groups/:id/boards/:board_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @throws GitLabApiException if any exception occurs
+     */
+    public void deleteGroupBoard(Object groupIdOrPath, Long boardId) throws GitLabApiException {
+        delete(Response.Status.NO_CONTENT, null, "groups", getGroupIdOrPath(groupIdOrPath), "boards", boardId);
+    }
+
+    /**
+     * Get a list of the board’s lists. Does not include open and closed lists.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id/lists</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @return a list of the issue board's lists
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<BoardList> getGroupBoardLists(Object groupIdOrPath, Long boardId) throws GitLabApiException {
+        return (getGroupBoardLists(groupIdOrPath, boardId, getDefaultPerPage()).all());
+    }
+
+    /**
+     * Get a list of the board’s lists for the specified group to using the specified page and per page setting.
+     * Does not include open and closed lists.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id/lists</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @param page the page to get
+     * @param perPage the number of Boards per page
+     * @return a list of the issue board's lists in the specified range
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<BoardList> getGroupBoardLists(Object groupIdOrPath, Long boardId, int page, int perPage)
+            throws GitLabApiException {
+        Response response = get(
+                jakarta.ws.rs.core.Response.Status.OK,
+                getPageQueryParams(page, perPage),
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "boards",
+                boardId,
+                "lists");
+        return (response.readEntity(new GenericType<List<BoardList>>() {}));
+    }
+
+    /**
+     * Get a Pager of the board’s lists. Does not include open and closed lists.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id/lists</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @param itemsPerPage the number of Board instances that will be fetched per page
+     * @return a Pager of the issue board's lists
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Pager<BoardList> getGroupBoardLists(Object groupIdOrPath, Long boardId, int itemsPerPage)
+            throws GitLabApiException {
+        return (new Pager<BoardList>(
+                this,
+                BoardList.class,
+                itemsPerPage,
+                null,
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "boards",
+                boardId,
+                "lists"));
+    }
+
+    /**
+     * Get a Stream of the board’s lists. Does not include open and closed lists.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id/lists</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @return a Stream of the issue board's lists
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Stream<BoardList> getGroupBoardsListsStream(Object groupIdOrPath, Long boardId) throws GitLabApiException {
+        return (getGroupBoardLists(groupIdOrPath, boardId, getDefaultPerPage()).stream());
+    }
+
+    /**
+     * Get a single issue board list.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id/lists/:list_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @param listId the ID of the board lists to get
+     * @return a BoardList instance for the specified board ID and list ID
+     * @throws GitLabApiException if any exception occurs
+     */
+    public BoardList getGroupBoardList(Object groupIdOrPath, Long boardId, Long listId) throws GitLabApiException {
+        Response response = get(
+                Response.Status.OK,
+                null,
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "boards",
+                boardId,
+                "lists",
+                listId);
+        return (response.readEntity(BoardList.class));
+    }
+
+    /**
+     * Get a single issue board list as an Optional instance.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/boards/:board_id/lists/:list_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @param listId the ID of the board lists to get
+     * @return a BoardList instance for the specified board ID and list ID as an Optional instance
+     */
+    public Optional<BoardList> getOptionalGroupBoardList(Object groupIdOrPath, Long boardId, Long listId) {
+        try {
+            return (Optional.ofNullable(getGroupBoardList(groupIdOrPath, boardId, listId)));
+        } catch (GitLabApiException glae) {
+            return (GitLabApi.createOptionalFromException(glae));
+        }
+    }
+
+    /**
+     * Creates a new Issue Board list.
+     *
+     * <pre><code>GitLab Endpoint: POST /groups/:id/boards/:board_id/lists</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @param labelId the ID of the label
+     * @param assigneeId The ID of a user. Premium and Ultimate only, optional (can be null)
+     * @param milestoneId The ID of a milestone. Premium and Ultimate only, optional (can be null)
+     * @param iterationId The ID of a milestone. Premium and Ultimate only, optional (can be null)
+     * @return the created BoardList instance
+     * @throws GitLabApiException if any exception occurs
+     */
+    public BoardList createGroupBoardList(
+            Object groupIdOrPath, Long boardId, Long labelId, Long assigneeId, Long milestoneId, Long iterationId)
+            throws GitLabApiException {
+        GitLabApiForm formData = new GitLabApiForm()
+                .withParam("label_id", labelId)
+                .withParam("assignee_id", assigneeId)
+                .withParam("milestone_id", milestoneId)
+                .withParam("iteration_id", iterationId);
+        Response response = post(
+                Response.Status.CREATED,
+                formData,
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "boards",
+                boardId,
+                "lists");
+        return (response.readEntity(BoardList.class));
+    }
+
+    /**
+     * Updates an existing Issue Board list. This call is used to change list position.
+     *
+     * <pre><code>GitLab Endpoint: PUT /groups/:id/boards/:board_id/lists/:list_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @param listId the ID of the list
+     * @param position the new position for the list
+     * @return the updated BoardList instance
+     * @throws GitLabApiException if any exception occurs
+     */
+    public BoardList updateGroupBoardList(Object groupIdOrPath, Long boardId, Long listId, Integer position)
+            throws GitLabApiException {
+        GitLabApiForm formData = new GitLabApiForm().withParam("position", position, true);
+        Response response = putWithFormData(
+                Response.Status.OK,
+                formData,
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "boards",
+                boardId,
+                "lists",
+                listId);
+        return (response.readEntity(BoardList.class));
+    }
+
+    /**
+     * Soft deletes an existing Issue Board list. Only for admins and group owners.
+     *
+     * <pre><code>GitLab Endpoint: DELETE /groups/:id/boards/:board_id/lists/:list_id</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance
+     * @param boardId the ID of the board
+     * @param listId the ID of the list
+     * @throws GitLabApiException if any exception occurs
+     */
+    public void deleteGroupBoardList(Object groupIdOrPath, Long boardId, Long listId) throws GitLabApiException {
+        delete(
+                Response.Status.NO_CONTENT,
+                null,
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "boards",
+                boardId,
+                "lists",
+                listId);
+    }
 }
diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java
index fe22106e5..dadc9b741 100644
--- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java
+++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java
@@ -17,6 +17,7 @@ public abstract class AbstractUser<U extends AbstractUser<U>> implements Seriali
     private Long id;
     private String name;
     private String state;
+    private Boolean locked;
     private String username;
     private String webUrl;
 
@@ -60,6 +61,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public Boolean getLocked() {
+        return locked;
+    }
+
+    public void setLocked(Boolean locked) {
+        this.locked = locked;
+    }
+
     public String getState() {
         return state;
     }
diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java
index 802bd78eb..5e5b2b355 100644
--- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java
+++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java
@@ -10,9 +10,15 @@ public class Board implements Serializable {
 
     private Long id;
     private String name;
+    private Boolean hideBacklogList;
+    private Boolean hideClosedList;
     private Project project;
-    private Milestone milestone;
     private List<BoardList> lists;
+    private Group group;
+    private Milestone milestone;
+    private Assignee assignee;
+    private List<Label> labels;
+    private Integer weight;
 
     public Long getId() {
         return id;
@@ -30,6 +36,22 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public Boolean getHideBacklogList() {
+        return hideBacklogList;
+    }
+
+    public void setHideBacklogList(Boolean hideBacklogList) {
+        this.hideBacklogList = hideBacklogList;
+    }
+
+    public Boolean getHideClosedList() {
+        return hideClosedList;
+    }
+
+    public void setHideClosedList(Boolean hideClosedList) {
+        this.hideClosedList = hideClosedList;
+    }
+
     public Project getProject() {
         return project;
     }
@@ -54,6 +76,38 @@ public void setLists(List<BoardList> lists) {
         this.lists = lists;
     }
 
+    public Group getGroup() {
+        return group;
+    }
+
+    public void setGroup(Group group) {
+        this.group = group;
+    }
+
+    public Assignee getAssignee() {
+        return assignee;
+    }
+
+    public void setAssignee(Assignee assignee) {
+        this.assignee = assignee;
+    }
+
+    public List<Label> getLabels() {
+        return labels;
+    }
+
+    public void setLabels(List<Label> labels) {
+        this.labels = labels;
+    }
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));
diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java
index 5780d2c31..516facfe5 100644
--- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java
+++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java
@@ -10,6 +10,12 @@ public class BoardList implements Serializable {
     private Long id;
     private Label label;
     private Integer position;
+    private Assignee assignee;
+    private Milestone milestone;
+    private Iteration iteration;
+    private Integer maxIssueCount;
+    private Integer maxIssueWeight;
+    private Integer limitMetric;
 
     public Long getId() {
         return id;
@@ -35,6 +41,54 @@ public void setPosition(Integer position) {
         this.position = position;
     }
 
+    public Assignee getAssignee() {
+        return assignee;
+    }
+
+    public void setAssignee(Assignee assignee) {
+        this.assignee = assignee;
+    }
+
+    public Milestone getMilestone() {
+        return milestone;
+    }
+
+    public void setMilestone(Milestone milestone) {
+        this.milestone = milestone;
+    }
+
+    public Iteration getIteration() {
+        return iteration;
+    }
+
+    public void setIteration(Iteration iteration) {
+        this.iteration = iteration;
+    }
+
+    public Integer getMaxIssueCount() {
+        return maxIssueCount;
+    }
+
+    public void setMaxIssueCount(Integer maxIssueCount) {
+        this.maxIssueCount = maxIssueCount;
+    }
+
+    public Integer getMaxIssueWeight() {
+        return maxIssueWeight;
+    }
+
+    public void setMaxIssueWeight(Integer maxIssueWeight) {
+        this.maxIssueWeight = maxIssueWeight;
+    }
+
+    public Integer getLimitMetric() {
+        return limitMetric;
+    }
+
+    public void setLimitMetric(Integer limitMetric) {
+        this.limitMetric = limitMetric;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));
diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java
index adcad5805..7ee443257 100644
--- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java
+++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 public class Iteration implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -52,8 +53,13 @@ public String toString() {
     private IterationState state;
     private Date createdAt;
     private Date updatedAt;
+
+    @JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
     private Date startDate;
+
+    @JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
     private Date dueDate;
+
     private String webUrl;
 
     public Long getId() {
diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java
index e71d6f287..5772a4413 100644
--- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java
+++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java
@@ -15,6 +15,7 @@ public class Label implements Serializable {
     private String color;
     private String description;
     private String descriptionHtml;
+    private String textColor;
     private Integer openIssuesCount;
     private Integer closedIssuesCount;
     private Integer openMergeRequestsCount;
@@ -77,6 +78,14 @@ public void setDescriptionHtml(String descriptionHtml) {
         this.descriptionHtml = descriptionHtml;
     }
 
+    public String getTextColor() {
+        return textColor;
+    }
+
+    public void setTextColor(String textColor) {
+        this.textColor = textColor;
+    }
+
     public Integer getOpenIssuesCount() {
         return openIssuesCount;
     }
diff --git a/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiBeans.java b/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiBeans.java
index 7282b4bd7..7db61992c 100644
--- a/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiBeans.java
+++ b/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiBeans.java
@@ -78,11 +78,17 @@ public void testBlame() throws Exception {
     }
 
     @Test
-    public void testBoard() throws Exception {
+    public void testProjectBoard() throws Exception {
         List<Board> boards = unmarshalResourceList(Board.class, "project-board.json");
         assertTrue(compareJson(boards, "project-board.json"));
     }
 
+    @Test
+    public void testGroupBoard() throws Exception {
+        List<Board> boards = unmarshalResourceList(Board.class, "group-board.json");
+        assertTrue(compareJson(boards, "group-board.json"));
+    }
+
     @Test
     public void testBranch() throws Exception {
 
diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/epic-issue.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/epic-issue.json
index 5046da865..4c68b46da 100644
--- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/epic-issue.json
+++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/epic-issue.json
@@ -71,8 +71,8 @@
     "state": 3,
     "created_at": "2023-08-07T00:05:06.739Z",
     "updated_at": "2023-09-04T00:05:06.612Z",
-    "start_date": "2023-09-04T00:00:00Z",
-    "due_date": "2023-09-10T00:00:00Z",
+    "start_date": "2023-09-04",
+    "due_date": "2023-09-10",
     "web_url": "http://example.com/example/-/iterations/158"
   }
 }
\ No newline at end of file
diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-board.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-board.json
new file mode 100644
index 000000000..a4accf541
--- /dev/null
+++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-board.json
@@ -0,0 +1,102 @@
+[
+    {
+        "id": 70,
+        "name": "Development",
+        "hide_backlog_list": false,
+        "hide_closed_list": false,
+        "lists": [],
+        "group": {
+            "id": 1474,
+            "web_url": "https://example.gitlab.com/groups/a-group/main",
+            "name": "Main"
+        },
+        "labels": [],
+        "weight": 4
+    },
+    {
+        "id": 71,
+        "name": "uSlots",
+        "hide_backlog_list": true,
+        "hide_closed_list": true,
+        "lists": [
+            {
+                "id": 360,
+                "label": {
+                    "id": 13640,
+                    "name": "a-label",
+                    "description": "desc",
+                    "description_html": "desc",
+                    "text_color": "#FFFFFF",
+                    "color": "#9400d3"
+                },
+                "position": 0,
+                "max_issue_count": 0,
+                "max_issue_weight": 0
+            },
+            {
+                "id": 361,
+                "label": {
+                    "id": 13641,
+                    "name": "b-label",
+                    "description": "desc2",
+                    "description_html": "desc2",
+                    "text_color": "#FFFFFF",
+                    "color": "#9400d3"
+                },
+                "position": 1,
+                "max_issue_count": 0,
+                "max_issue_weight": 0
+            },
+            {
+                "id": 362,
+                "position": 2,
+                "assignee": {
+                    "id": 61,
+                    "username": "john.smith",
+                    "name": "John Smith"
+                },
+                "max_issue_count": 0,
+                "max_issue_weight": 0
+            },
+            {
+                "id": 363,
+                "position": 3,
+                "assignee": {
+                    "id": 26,
+                    "username": "alice.johnson",
+                    "name": "Alice Johnson"
+                },
+                "max_issue_count": 0,
+                "max_issue_weight": 0
+            }
+        ],
+        "group": {
+            "id": 1474,
+            "web_url": "https://example.gitlab.com/groups/a-group/main",
+            "name": "Main"
+        },
+        "milestone": {
+            "title": "Started"
+        },
+        "assignee": {
+            "id": 37,
+            "username": "bob.martin",
+            "name": "Bob Martin",
+            "state": "active",
+            "locked": false,
+            "avatar_url": "https://example.gitlab.com/uploads/-/system/user/avatar/37/avatar.png",
+            "web_url": "https://example.gitlab.com/bob.martin"
+        },
+        "labels": [
+            {
+                "id": 116,
+                "name": "Abc",
+                "description": "",
+                "description_html": "",
+                "text_color": "#FFFFFF",
+                "color": "#6699cc"
+            }
+        ],
+        "weight": 3
+    }
+]
diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue.json
index d90cde0ba..2865d91e4 100644
--- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue.json
+++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue.json
@@ -84,8 +84,8 @@
       "state": 1,
       "created_at": "2023-08-07T00:05:06.739Z",
       "updated_at": "2023-09-04T00:05:06.612Z",
-      "start_date": "2023-09-04T00:00:00Z",
-      "due_date": "2023-09-10T00:00:00Z",
+      "start_date": "2023-09-04",
+      "due_date": "2023-09-10",
       "web_url": "http://example.com/example/-/iterations/158"
   },
   "health_status": "needs_attention"
diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/iteration.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/iteration.json
index 30cd76785..b72895626 100644
--- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/iteration.json
+++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/iteration.json
@@ -8,7 +8,7 @@
    "state": 2,
    "created_at": "2022-03-14T05:21:11.929Z",
    "updated_at": "2022-03-14T05:21:11.929Z",
-   "start_date": "2022-03-08T00:00:00Z",
-   "due_date": "2022-03-14T00:00:00Z",
+   "start_date": "2022-03-08",
+   "due_date": "2022-03-14",
    "web_url": "https://gitlab.com/groups/my-group/-/iterations/90"
 }
diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-board.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-board.json
index 34025e337..77a53ecd6 100644
--- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-board.json
+++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-board.json
@@ -35,12 +35,39 @@
       },
       {
         "id" : 3,
-        "label" : {
-          "name" : "Production",
-          "color" : "#FF5F00",
-          "description" : "Production board"
+        "milestone": {
+            "id": 918,
+            "iid": 1,
+            "project_id": 5,
+            "title": "Some Milestone",
+            "description": "A description",
+            "state": "active",
+            "created_at": "2024-10-17T07:24:04.309Z",
+            "updated_at": "2024-10-17T07:24:04.309Z",
+            "due_date": "2024-12-31",
+            "start_date": "2024-12-01",
+            "expired": false,
+            "web_url": "http://example.com/diaspora/diaspora-project-site/-/milestones/1"
         },
         "position" : 3
+      },
+      {
+        "id" : 4,
+        "iteration": {
+            "id": 304,
+            "iid": 1,
+            "sequence": 1,
+            "group_id": 1648,
+            "title": "a title",
+            "description": "a decription",
+            "state": 1,
+            "created_at": "2024-12-27T12:34:42.162Z",
+            "updated_at": "2024-12-27T12:34:42.162Z",
+            "start_date": "2025-01-01",
+            "due_date": "2025-01-21",
+            "web_url": "http://example.com/diaspora"
+        },
+        "position" : 4
       }
     ]
   }