Notes for Project-Board-Columns

models/issues/issue.go

@@ -7,7 +7,6 @@ package issues
 import (
 	"context"
 	"fmt"
-	"regexp"
 	"slices"
 
 	"code.gitea.io/gitea/models/db"
@@ -16,6 +15,7 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/markup/markdown"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
@@ -141,11 +141,6 @@ type Issue struct {
 	ShowRole RoleDescriptor `xorm:"-"`
 }
 
-var (
-	issueTasksPat     = regexp.MustCompile(`(^\s*[-*]\s\[[\sxX]\]\s.)|(\n\s*[-*]\s\[[\sxX]\]\s.)`)
-	issueTasksDonePat = regexp.MustCompile(`(^\s*[-*]\s\[[xX]\]\s.)|(\n\s*[-*]\s\[[xX]\]\s.)`)
-)
-
 // IssueIndex represents the issue index table
 type IssueIndex db.ResourceIndex
 
@@ -443,12 +438,12 @@ func (issue *Issue) IsPoster(uid int64) bool {
 
 // GetTasks returns the amount of tasks in the issues content
 func (issue *Issue) GetTasks() int {
-	return len(issueTasksPat.FindAllStringIndex(issue.Content, -1))
+	return len(markdown.MarkdownTasksRegex.FindAllStringIndex(issue.Content, -1))
 }
 
 // GetTasksDone returns the amount of completed tasks in the issues content
 func (issue *Issue) GetTasksDone() int {
-	return len(issueTasksDonePat.FindAllStringIndex(issue.Content, -1))
+	return len(markdown.MarkdownTasksDoneRegex.FindAllStringIndex(issue.Content, -1))
 }
 
 // GetLastEventTimestamp returns the last user visible event timestamp, either the creation of this issue or the close.

models/migrations/v1_22/v287.go

@@ -0,0 +1,51 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_22 //nolint
+
+import (
+	"code.gitea.io/gitea/modules/timeutil"
+
+	"xorm.io/xorm"
+)
+
+type BoardNote struct {
+	ID          int64  `xorm:"pk autoincr"`
+	Title       string `xorm:"TEXT NOT NULL"`
+	Content     string `xorm:"LONGTEXT"`
+	Sorting     int64  `xorm:"NOT NULL DEFAULT 0"`
+	PinOrder    int64  `xorm:"NOT NULL DEFAULT 0"`
+	MilestoneID int64  `xorm:"INDEX"`
+
+	ProjectID int64 `xorm:"INDEX NOT NULL"`
+	BoardID   int64 `xorm:"INDEX NOT NULL"`
+	CreatorID int64 `xorm:"NOT NULL"`
+
+	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
+}
+
+// TableName xorm will read the table name from this method
+func (BoardNote) TableName() string {
+	return "project_board_note"
+}
+
+type BoardNoteLabel struct {
+	ID          int64 `xorm:"pk autoincr"`
+	BoardNoteID int64 `xorm:"UNIQUE(s) NOT NULL"`
+	LabelID     int64 `xorm:"UNIQUE(s) NOT NULL"`
+}
+
+// TableName xorm will read the table name from this method
+func (BoardNoteLabel) TableName() string {
+	return "project_board_note_label"
+}
+
+func CreateTablesForBoardNotes(x *xorm.Engine) error {
+	err := x.Sync(new(BoardNote))
+	if err != nil {
+		return err
+	}
+
+	return x.Sync(new(BoardNoteLabel))
+}

models/project/board.go

@@ -82,6 +82,27 @@ func (b *Board) NumIssues(ctx context.Context) int {
 	return int(c)
 }
 
+// NumBoardNotes return counter of all notes assigned to the board
+func (b *Board) NumBoardNotes(ctx context.Context) int {
+	c, err := db.GetEngine(ctx).Table("project_board_note").
+		Where("project_id=?", b.ProjectID).
+		And("board_id=?", b.ID).
+		GroupBy("id").
+		Cols("id").
+		Count()
+	if err != nil {
+		return 0
+	}
+	return int(c)
+}
+
+// NumIssuesAndNotes return counter of all issues and notes assigned to the board
+func (b *Board) NumIssuesAndNotes(ctx context.Context) int {
+	numIssues := b.NumIssues(ctx)
+	numBoardNotes := b.NumBoardNotes(ctx)
+	return numIssues + numBoardNotes
+}
+
 func init() {
 	db.RegisterModel(new(Board))
 }
@@ -180,6 +201,10 @@ func deleteBoardByID(ctx context.Context, boardID int64) error {
 		return err
 	}
 
+	if err = board.removeBoardNotes(ctx); err != nil {
+		return err
+	}
+
 	if _, err := db.GetEngine(ctx).ID(board.ID).NoAutoCondition().Delete(board); err != nil {
 		return err
 	}