mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-26 20:27:03 +01:00
2f0b4a8f61
This field adds the possibility to set the update date when modifying an issue through the API. A 'NoAutoDate' in-memory field is added in the Issue struct. If the update_at field is set, NoAutoDate is set to true and the Issue's UpdatedUnix field is filled. That information is passed down to the functions that actually updates the database, which have been modified to not auto update dates if requested. A guard is added to the 'EditIssue' API call, to checks that the udpate_at date is between the issue's creation date and the current date (to avoid 'malicious' changes). It also limits the new feature to project's owners and admins. (cherry picked from commitc524d33402
) Add a SetIssueUpdateDate() function in services/issue.go That function is used by some API calls to set the NoAutoDate and UpdatedUnix fields of an Issue if an updated_at date is provided. (cherry picked from commitf061caa655
) Add an updated_at field to the API calls related to Issue's Labels. The update date is applied to the issue's comment created to inform about the modification of the issue's labels. (cherry picked from commitea36cf80f5
) Add an updated_at field to the API call for issue's attachment creation The update date is applied to the issue's comment created to inform about the modification of the issue's content, and is set as the asset creation date. (cherry picked from commit96150971ca
) Checking Issue changes, with and without providing an updated_at date Those unit tests are added: - TestAPIEditIssueWithAutoDate - TestAPIEditIssueWithNoAutoDate - TestAPIAddIssueLabelsWithAutoDate - TestAPIAddIssueLabelsWithNoAutoDate - TestAPICreateIssueAttachmentWithAutoDate - TestAPICreateIssueAttachmentWithNoAutoDate (cherry picked from commit4926a5d7a2
) Add an updated_at field to the API call for issue's comment creation The update date is used as the comment creation date, and is applied to the issue as the update creation date. (cherry picked from commit76c8faecdc
) Add an updated_at field to the API call for issue's comment edition The update date is used as the comment update date, and is applied to the issue as an update date. (cherry picked from commitcf787ad7fd
) Add an updated_at field to the API call for comment's attachment creation The update date is applied to the comment, and is set as the asset creation date. (cherry picked from commit1e4ff424d3
) Checking Comment changes, with and without providing an updated_at date Those unit tests are added: - TestAPICreateCommentWithAutoDate - TestAPICreateCommentWithNoAutoDate - TestAPIEditCommentWithAutoDate - TestAPIEditCommentWithNoAutoDate - TestAPICreateCommentAttachmentWithAutoDate - TestAPICreateCommentAttachmentWithNoAutoDate (cherry picked from commitda932152f1
) Pettier code to set the update time of comments Now uses sess.AllCols().NoAutoToime().SetExpr("updated_unix", ...) XORM is smart enough to compose one single SQL UPDATE which all columns + updated_unix. (cherry picked from commit1f6a42808d
) Issue edition: Keep the max of the milestone and issue update dates. When editing an issue via the API, an updated_at date can be provided. If the EditIssue call changes the issue's milestone, the milestone's update date is to be changed accordingly, but only with a greater value. This ensures that a milestone's update date is the max of all issue's update dates. (cherry picked from commit8f22ea182e
) Rewrite the 'AutoDate' tests using subtests Also add a test to check the permissions to set a date, and a test to check update dates on milestones. The tests related to 'AutoDate' are: - TestAPIEditIssueAutoDate - TestAPIAddIssueLabelsAutoDate - TestAPIEditIssueMilestoneAutoDate - TestAPICreateIssueAttachmentAutoDate - TestAPICreateCommentAutoDate - TestAPIEditCommentWithDate - TestAPICreateCommentAttachmentAutoDate (cherry picked from commit961fd13c55
) (cherry picked from commitd52f4eea44
) (cherry picked from commit3540ea2a43
) Conflicts: services/issue/issue.go https://codeberg.org/forgejo/forgejo/pulls/1415 (cherry picked from commit56720ade00
) Conflicts: routers/api/v1/repo/issue_label.go https://codeberg.org/forgejo/forgejo/pulls/1462 (cherry picked from commit47c78927d6
) (cherry picked from commit2030f3b965
) (cherry picked from commitf02aeb7698
) Conflicts: routers/api/v1/repo/issue_attachment.go routers/api/v1/repo/issue_comment_attachment.go https://codeberg.org/forgejo/forgejo/pulls/1575 (cherry picked from commitd072525b35
) (cherry picked from commit8424d0ab3d
) (cherry picked from commit5cc62caec7
) (cherry picked from commitd6300d5dcd
) [FEAT] allow setting the update date on issues and comments (squash) apply the 'update_at' value to the cross-ref comments (#1676) [this is a follow-up to PR #764] When a comment of issue A referencing issue B is added with a forced 'updated_at' date, that date has to be applied to the comment created in issue B. ----- Comment: While trying my 'RoundUp migration script', I found that this case was forgotten in PR #764 - my apologies... I'll try to write a functional test, base on models/issues/issue_xref_test.go Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1676 Co-authored-by: fluzz <fluzz@freedroid.org> Co-committed-by: fluzz <fluzz@freedroid.org> (cherry picked from commitac4f727f63
) (cherry picked from commit5110476ee9
) (cherry picked from commit77ba6be1da
) (cherry picked from commit9c8337b5c4
) (cherry picked from commit1d689eb686
) (cherry picked from commit511c519c87
)
394 lines
10 KiB
Go
394 lines
10 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package issues
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
"code.gitea.io/gitea/modules/timeutil"
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
"xorm.io/builder"
|
|
)
|
|
|
|
// ErrMilestoneNotExist represents a "MilestoneNotExist" kind of error.
|
|
type ErrMilestoneNotExist struct {
|
|
ID int64
|
|
RepoID int64
|
|
Name string
|
|
}
|
|
|
|
// IsErrMilestoneNotExist checks if an error is a ErrMilestoneNotExist.
|
|
func IsErrMilestoneNotExist(err error) bool {
|
|
_, ok := err.(ErrMilestoneNotExist)
|
|
return ok
|
|
}
|
|
|
|
func (err ErrMilestoneNotExist) Error() string {
|
|
if len(err.Name) > 0 {
|
|
return fmt.Sprintf("milestone does not exist [name: %s, repo_id: %d]", err.Name, err.RepoID)
|
|
}
|
|
return fmt.Sprintf("milestone does not exist [id: %d, repo_id: %d]", err.ID, err.RepoID)
|
|
}
|
|
|
|
func (err ErrMilestoneNotExist) Unwrap() error {
|
|
return util.ErrNotExist
|
|
}
|
|
|
|
// Milestone represents a milestone of repository.
|
|
type Milestone struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
RepoID int64 `xorm:"INDEX"`
|
|
Repo *repo_model.Repository `xorm:"-"`
|
|
Name string
|
|
Content string `xorm:"TEXT"`
|
|
RenderedContent string `xorm:"-"`
|
|
IsClosed bool
|
|
NumIssues int
|
|
NumClosedIssues int
|
|
NumOpenIssues int `xorm:"-"`
|
|
Completeness int // Percentage(1-100).
|
|
IsOverdue bool `xorm:"-"`
|
|
|
|
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
|
|
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
|
|
DeadlineUnix timeutil.TimeStamp
|
|
ClosedDateUnix timeutil.TimeStamp
|
|
DeadlineString string `xorm:"-"`
|
|
|
|
TotalTrackedTime int64 `xorm:"-"`
|
|
}
|
|
|
|
func init() {
|
|
db.RegisterModel(new(Milestone))
|
|
}
|
|
|
|
// BeforeUpdate is invoked from XORM before updating this object.
|
|
func (m *Milestone) BeforeUpdate() {
|
|
if m.NumIssues > 0 {
|
|
m.Completeness = m.NumClosedIssues * 100 / m.NumIssues
|
|
} else {
|
|
m.Completeness = 0
|
|
}
|
|
}
|
|
|
|
// AfterLoad is invoked from XORM after setting the value of a field of
|
|
// this object.
|
|
func (m *Milestone) AfterLoad() {
|
|
m.NumOpenIssues = m.NumIssues - m.NumClosedIssues
|
|
if m.DeadlineUnix.Year() == 9999 {
|
|
return
|
|
}
|
|
|
|
m.DeadlineString = m.DeadlineUnix.Format("2006-01-02")
|
|
if m.IsClosed {
|
|
m.IsOverdue = m.ClosedDateUnix >= m.DeadlineUnix
|
|
} else {
|
|
m.IsOverdue = timeutil.TimeStampNow() >= m.DeadlineUnix
|
|
}
|
|
}
|
|
|
|
// State returns string representation of milestone status.
|
|
func (m *Milestone) State() api.StateType {
|
|
if m.IsClosed {
|
|
return api.StateClosed
|
|
}
|
|
return api.StateOpen
|
|
}
|
|
|
|
// NewMilestone creates new milestone of repository.
|
|
func NewMilestone(ctx context.Context, m *Milestone) (err error) {
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
m.Name = strings.TrimSpace(m.Name)
|
|
|
|
if err = db.Insert(ctx, m); err != nil {
|
|
return err
|
|
}
|
|
|
|
if _, err = db.Exec(ctx, "UPDATE `repository` SET num_milestones = num_milestones + 1 WHERE id = ?", m.RepoID); err != nil {
|
|
return err
|
|
}
|
|
return committer.Commit()
|
|
}
|
|
|
|
// HasMilestoneByRepoID returns if the milestone exists in the repository.
|
|
func HasMilestoneByRepoID(ctx context.Context, repoID, id int64) (bool, error) {
|
|
return db.GetEngine(ctx).ID(id).Where("repo_id=?", repoID).Exist(new(Milestone))
|
|
}
|
|
|
|
// GetMilestoneByRepoID returns the milestone in a repository.
|
|
func GetMilestoneByRepoID(ctx context.Context, repoID, id int64) (*Milestone, error) {
|
|
m := new(Milestone)
|
|
has, err := db.GetEngine(ctx).ID(id).Where("repo_id=?", repoID).Get(m)
|
|
if err != nil {
|
|
return nil, err
|
|
} else if !has {
|
|
return nil, ErrMilestoneNotExist{ID: id, RepoID: repoID}
|
|
}
|
|
return m, nil
|
|
}
|
|
|
|
// GetMilestoneByRepoIDANDName return a milestone if one exist by name and repo
|
|
func GetMilestoneByRepoIDANDName(ctx context.Context, repoID int64, name string) (*Milestone, error) {
|
|
var mile Milestone
|
|
has, err := db.GetEngine(ctx).Where("repo_id=? AND name=?", repoID, name).Get(&mile)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !has {
|
|
return nil, ErrMilestoneNotExist{Name: name, RepoID: repoID}
|
|
}
|
|
return &mile, nil
|
|
}
|
|
|
|
// UpdateMilestone updates information of given milestone.
|
|
func UpdateMilestone(ctx context.Context, m *Milestone, oldIsClosed bool) error {
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
if m.IsClosed && !oldIsClosed {
|
|
m.ClosedDateUnix = timeutil.TimeStampNow()
|
|
}
|
|
|
|
if err := updateMilestone(ctx, m); err != nil {
|
|
return err
|
|
}
|
|
|
|
// if IsClosed changed, update milestone numbers of repository
|
|
if oldIsClosed != m.IsClosed {
|
|
if err := updateRepoMilestoneNum(ctx, m.RepoID); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return committer.Commit()
|
|
}
|
|
|
|
func updateMilestone(ctx context.Context, m *Milestone) error {
|
|
m.Name = strings.TrimSpace(m.Name)
|
|
_, err := db.GetEngine(ctx).ID(m.ID).AllCols().Update(m)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return UpdateMilestoneCounters(ctx, m.ID)
|
|
}
|
|
|
|
func updateMilestoneCounters(ctx context.Context, id int64, noAutoTime bool, updatedUnix timeutil.TimeStamp) error {
|
|
e := db.GetEngine(ctx)
|
|
sess := e.ID(id).
|
|
SetExpr("num_issues", builder.Select("count(*)").From("issue").Where(
|
|
builder.Eq{"milestone_id": id},
|
|
)).
|
|
SetExpr("num_closed_issues", builder.Select("count(*)").From("issue").Where(
|
|
builder.Eq{
|
|
"milestone_id": id,
|
|
"is_closed": true,
|
|
},
|
|
))
|
|
if noAutoTime {
|
|
sess.SetExpr("updated_unix", updatedUnix).NoAutoTime()
|
|
}
|
|
_, err := sess.Update(&Milestone{})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = e.Exec("UPDATE `milestone` SET completeness=100*num_closed_issues/(CASE WHEN num_issues > 0 THEN num_issues ELSE 1 END) WHERE id=?",
|
|
id,
|
|
)
|
|
return err
|
|
}
|
|
|
|
// UpdateMilestoneCounters calculates NumIssues, NumClosesIssues and Completeness
|
|
func UpdateMilestoneCounters(ctx context.Context, id int64) error {
|
|
return updateMilestoneCounters(ctx, id, false, 0)
|
|
}
|
|
|
|
// UpdateMilestoneCountersWithDate calculates NumIssues, NumClosesIssues and Completeness and set the UpdatedUnix date
|
|
func UpdateMilestoneCountersWithDate(ctx context.Context, id int64, updatedUnix timeutil.TimeStamp) error {
|
|
return updateMilestoneCounters(ctx, id, true, updatedUnix)
|
|
}
|
|
|
|
// ChangeMilestoneStatusByRepoIDAndID changes a milestone open/closed status if the milestone ID is in the repo.
|
|
func ChangeMilestoneStatusByRepoIDAndID(ctx context.Context, repoID, milestoneID int64, isClosed bool) error {
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
m := &Milestone{
|
|
ID: milestoneID,
|
|
RepoID: repoID,
|
|
}
|
|
|
|
has, err := db.GetEngine(ctx).ID(milestoneID).Where("repo_id = ?", repoID).Get(m)
|
|
if err != nil {
|
|
return err
|
|
} else if !has {
|
|
return ErrMilestoneNotExist{ID: milestoneID, RepoID: repoID}
|
|
}
|
|
|
|
if err := changeMilestoneStatus(ctx, m, isClosed); err != nil {
|
|
return err
|
|
}
|
|
|
|
return committer.Commit()
|
|
}
|
|
|
|
// ChangeMilestoneStatus changes the milestone open/closed status.
|
|
func ChangeMilestoneStatus(ctx context.Context, m *Milestone, isClosed bool) (err error) {
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
if err := changeMilestoneStatus(ctx, m, isClosed); err != nil {
|
|
return err
|
|
}
|
|
|
|
return committer.Commit()
|
|
}
|
|
|
|
func changeMilestoneStatus(ctx context.Context, m *Milestone, isClosed bool) error {
|
|
m.IsClosed = isClosed
|
|
if isClosed {
|
|
m.ClosedDateUnix = timeutil.TimeStampNow()
|
|
}
|
|
|
|
count, err := db.GetEngine(ctx).ID(m.ID).Where("repo_id = ? AND is_closed = ?", m.RepoID, !isClosed).Cols("is_closed", "closed_date_unix").Update(m)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if count < 1 {
|
|
return nil
|
|
}
|
|
return updateRepoMilestoneNum(ctx, m.RepoID)
|
|
}
|
|
|
|
// DeleteMilestoneByRepoID deletes a milestone from a repository.
|
|
func DeleteMilestoneByRepoID(ctx context.Context, repoID, id int64) error {
|
|
m, err := GetMilestoneByRepoID(ctx, repoID, id)
|
|
if err != nil {
|
|
if IsErrMilestoneNotExist(err) {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
repo, err := repo_model.GetRepositoryByID(ctx, m.RepoID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
sess := db.GetEngine(ctx)
|
|
|
|
if _, err = sess.ID(m.ID).Delete(new(Milestone)); err != nil {
|
|
return err
|
|
}
|
|
|
|
numMilestones, err := db.Count[Milestone](ctx, FindMilestoneOptions{
|
|
RepoID: repo.ID,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
numClosedMilestones, err := db.Count[Milestone](ctx, FindMilestoneOptions{
|
|
RepoID: repo.ID,
|
|
IsClosed: util.OptionalBoolTrue,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
repo.NumMilestones = int(numMilestones)
|
|
repo.NumClosedMilestones = int(numClosedMilestones)
|
|
|
|
if _, err = sess.ID(repo.ID).Cols("num_milestones, num_closed_milestones").Update(repo); err != nil {
|
|
return err
|
|
}
|
|
|
|
if _, err = db.Exec(ctx, "UPDATE `issue` SET milestone_id = 0 WHERE milestone_id = ?", m.ID); err != nil {
|
|
return err
|
|
}
|
|
return committer.Commit()
|
|
}
|
|
|
|
func updateRepoMilestoneNum(ctx context.Context, repoID int64) error {
|
|
_, err := db.GetEngine(ctx).Exec("UPDATE `repository` SET num_milestones=(SELECT count(*) FROM milestone WHERE repo_id=?),num_closed_milestones=(SELECT count(*) FROM milestone WHERE repo_id=? AND is_closed=?) WHERE id=?",
|
|
repoID,
|
|
repoID,
|
|
true,
|
|
repoID,
|
|
)
|
|
return err
|
|
}
|
|
|
|
// LoadTotalTrackedTime loads the tracked time for the milestone
|
|
func (m *Milestone) LoadTotalTrackedTime(ctx context.Context) error {
|
|
type totalTimesByMilestone struct {
|
|
MilestoneID int64
|
|
Time int64
|
|
}
|
|
totalTime := &totalTimesByMilestone{MilestoneID: m.ID}
|
|
has, err := db.GetEngine(ctx).Table("issue").
|
|
Join("INNER", "milestone", "issue.milestone_id = milestone.id").
|
|
Join("LEFT", "tracked_time", "tracked_time.issue_id = issue.id").
|
|
Where("tracked_time.deleted = ?", false).
|
|
Select("milestone_id, sum(time) as time").
|
|
Where("milestone_id = ?", m.ID).
|
|
GroupBy("milestone_id").
|
|
Get(totalTime)
|
|
if err != nil {
|
|
return err
|
|
} else if !has {
|
|
return nil
|
|
}
|
|
m.TotalTrackedTime = totalTime.Time
|
|
return nil
|
|
}
|
|
|
|
// InsertMilestones creates milestones of repository.
|
|
func InsertMilestones(ctx context.Context, ms ...*Milestone) (err error) {
|
|
if len(ms) == 0 {
|
|
return nil
|
|
}
|
|
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
sess := db.GetEngine(ctx)
|
|
|
|
// to return the id, so we should not use batch insert
|
|
for _, m := range ms {
|
|
if _, err = sess.NoAutoTime().Insert(m); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if _, err = db.Exec(ctx, "UPDATE `repository` SET num_milestones = num_milestones + ? WHERE id = ?", len(ms), ms[0].RepoID); err != nil {
|
|
return err
|
|
}
|
|
return committer.Commit()
|
|
}
|