From 8bc8ca1953e9edfe1677378472c321b3d33875fd Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Sun, 9 Apr 2023 23:07:23 +0900
Subject: [PATCH] Improve GetBoards and getDefaultBoard (#22981)

Change
`GetBoards(ctx context.Context, projectID int64)`
to
`(p *Project) GetBoards(ctx context.Context) (BoardList, error)`

`getDefaultBoard` is same.
---
 models/project/board.go      | 12 ++++++------
 routers/web/org/projects.go  |  2 +-
 routers/web/repo/projects.go |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/models/project/board.go b/models/project/board.go
index dc4e2e688..2ab1d5c7b 100644
--- a/models/project/board.go
+++ b/models/project/board.go
@@ -229,14 +229,14 @@ func UpdateBoard(ctx context.Context, board *Board) error {
 
 // GetBoards fetches all boards related to a project
 // if no default board set, first board is a temporary "Uncategorized" board
-func GetBoards(ctx context.Context, projectID int64) (BoardList, error) {
+func (p *Project) GetBoards(ctx context.Context) (BoardList, error) {
 	boards := make([]*Board, 0, 5)
 
-	if err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", projectID, false).OrderBy("Sorting").Find(&boards); err != nil {
+	if err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", p.ID, false).OrderBy("Sorting").Find(&boards); err != nil {
 		return nil, err
 	}
 
-	defaultB, err := getDefaultBoard(ctx, projectID)
+	defaultB, err := p.getDefaultBoard(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -245,9 +245,9 @@ func GetBoards(ctx context.Context, projectID int64) (BoardList, error) {
 }
 
 // getDefaultBoard return default board and create a dummy if none exist
-func getDefaultBoard(ctx context.Context, projectID int64) (*Board, error) {
+func (p *Project) getDefaultBoard(ctx context.Context) (*Board, error) {
 	var board Board
-	exist, err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", projectID, true).Get(&board)
+	exist, err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", p.ID, true).Get(&board)
 	if err != nil {
 		return nil, err
 	}
@@ -257,7 +257,7 @@ func getDefaultBoard(ctx context.Context, projectID int64) (*Board, error) {
 
 	// represents a board for issues not assigned to one
 	return &Board{
-		ProjectID: projectID,
+		ProjectID: p.ID,
 		Title:     "Uncategorized",
 		Default:   true,
 	}, nil
diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
index 5d8005781..5d1d7a15c 100644
--- a/routers/web/org/projects.go
+++ b/routers/web/org/projects.go
@@ -313,7 +313,7 @@ func ViewProject(ctx *context.Context) {
 		return
 	}
 
-	boards, err := project_model.GetBoards(ctx, project.ID)
+	boards, err := project.GetBoards(ctx)
 	if err != nil {
 		ctx.ServerError("GetProjectBoards", err)
 		return
diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go
index 91e17dee2..cef6893fb 100644
--- a/routers/web/repo/projects.go
+++ b/routers/web/repo/projects.go
@@ -300,7 +300,7 @@ func ViewProject(ctx *context.Context) {
 		return
 	}
 
-	boards, err := project_model.GetBoards(ctx, project.ID)
+	boards, err := project.GetBoards(ctx)
 	if err != nil {
 		ctx.ServerError("GetProjectBoards", err)
 		return