ami/tl-vikunja
1
0
Fork 0
Code

fix(import): resolve task relations by old task ids

Browse Source
This commit is contained in:
kolaente 2023-09-07 10:24:15 +02:00
parent adf4b95ed3
commit 93795d2f29
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/modules/migration/create_from_structure.go
View File

@ -178,15 +178,18 @@ func createProjectWithEverything(s *xorm.Session, project *models.ProjectWithTas
} }
} }
tasksByOldID := make(map[int64]*models.TaskWithComments, len(tasks))
// Create all tasks // Create all tasks
for _, t := range tasks { for _, t := range tasks {
setBucketOrDefault(&t.Task) setBucketOrDefault(&t.Task)
oldid := t.ID
t.ProjectID = project.ID t.ProjectID = project.ID
err = t.Create(s, user) err = t.Create(s, user)
if err != nil { if err != nil {
return return
} }
tasksByOldID[oldid] = t
log.Debugf("[creating structure] Created task %d", t.ID) log.Debugf("[creating structure] Created task %d", t.ID)
if len(t.RelatedTasks) > 0 { if len(t.RelatedTasks) > 0 {
@ -202,13 +205,15 @@ func createProjectWithEverything(s *xorm.Session, project *models.ProjectWithTas
for _, rt := range tasks { for _, rt := range tasks {
// First create the related tasks if they do not exist // First create the related tasks if they do not exist
if rt.ID == 0 { if _, exists := tasksByOldID[rt.ID]; !exists {
oldid := rt.ID
setBucketOrDefault(rt) setBucketOrDefault(rt)
rt.ProjectID = t.ProjectID rt.ProjectID = t.ProjectID
err = rt.Create(s, user) err = rt.Create(s, user)
if err != nil { if err != nil {
return return
} }
tasksByOldID[oldid] = &models.TaskWithComments{Task: *rt}
log.Debugf("[creating structure] Created related task %d", rt.ID) log.Debugf("[creating structure] Created related task %d", rt.ID)
} }
@ -218,10 +223,14 @@ func createProjectWithEverything(s *xorm.Session, project *models.ProjectWithTas
OtherTaskID: rt.ID, OtherTaskID: rt.ID,
RelationKind: kind, RelationKind: kind,
} }
if ttt, exists := tasksByOldID[rt.ID]; exists {
taskRel.OtherTaskID = ttt.ID
}
err = taskRel.Create(s, user) err = taskRel.Create(s, user)
if err != nil { if err != nil && !models.IsErrRelationAlreadyExists(err) {
return return
} }
err = nil
log.Debugf("[creating structure] Created task relation between task %d and %d", t.ID, rt.ID) log.Debugf("[creating structure] Created task relation between task %d and %d", t.ID, rt.ID)