add project linking.

2021-04-03 16:30:43 +02:00
parent 2c5d87134d
commit 2a6c04893d
17 changed files with 365 additions and 46 deletions
@@ -265,7 +265,7 @@ func (l *Loader) ListProjects(ctx context.Context, filter models.ProjectFilter)
 		projectIDs = append(projectIDs, project.ID)
 	}

-	tasks, err := l.DB.Tasks().List(ctx, models.TaskFilter{
+	tasks, links, err := l.DB.Tasks().ListWithLinks(ctx, models.TaskFilter{
 		UserID:     auth.UserID(ctx),
 		ProjectIDs: projectIDs,
 	})
@@ -301,7 +301,18 @@ func (l *Loader) ListProjects(ctx context.Context, filter models.ProjectFilter)
 		results[i].Tasks = make([]*models.TaskResult, 0, 16)
 		for _, task := range tasks {
 			if task.ProjectID != project.ID {
-				continue
+				foundLink := false
+
+				for _, link := range links {
+					if link.TaskID == task.ID && link.ProjectID == project.ID {
+						foundLink = true
+						break
+					}
+				}
+
+				if !foundLink {
+					continue
+				}
 			}

 			taskResult := &models.TaskResult{