ami/tl-vikunja
1
0
Fork 0
Code Activity

feat: check for cycles when creating or updating a project's parent

Browse Source
This commit is contained in:
kolaente
2023-04-03 11:46:08 +02:00
parent edcb806421
commit 9011894a29
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/models/project.go
View File

@ -627,7 +627,7 @@ func (p *Project) CheckIsArchived(s *xorm.Session) (err error) {
return nil
}
func checkProjectBeforeUpdateOrDelete(s *xorm.Session, project *Project) error {
func checkProjectBeforeUpdateOrDelete(s *xorm.Session, project *Project) (err error) {
if project.ParentProjectID < 0 {
return &ErrProjectCannotBelongToAPseudoParentProject{ProjectID: project.ID, ParentProjectID: project.ParentProjectID}
}
@ -640,10 +640,34 @@ func checkProjectBeforeUpdateOrDelete(s *xorm.Session, project *Project) error {
}
}
_, err := GetProjectSimpleByID(s, project.ParentProjectID)
var parent *Project
parent, err = GetProjectSimpleByID(s, project.ParentProjectID)
if err != nil {
return err
}
// Check if there's a cycle in the parent relation
parentsVisited := make(map[int64]bool)
parentsVisited[project.ID] = true
for {
if parent.ParentProjectID == 0 {
break
}
// FIXME: Can we do this with better performance?
parent, err = GetProjectSimpleByID(s, parent.ParentProjectID)
if err != nil {
return err
}
if parentsVisited[parent.ID] {
return &ErrProjectCannotHaveACyclicRelationship{
ProjectID: project.ID,
}
}
parentsVisited[parent.ID] = true
}
}
// Check if the identifier is unique and not empty