From 68ad952577c7c5096ea80a86003dcb1a419dea95 Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Wed, 13 Jan 2021 18:30:14 +0100
Subject: [PATCH] fix tasks endpoint returning wrong values for task.logs.

---
 database/postgres/logs.go |  4 ++--
 models/log.go             |  2 +-
 services/loader.go        | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/database/postgres/logs.go b/database/postgres/logs.go
index c85ebaf..b364318 100644
--- a/database/postgres/logs.go
+++ b/database/postgres/logs.go
@@ -30,8 +30,8 @@ func (r *logRepository) Find(ctx context.Context, id string) (*models.Log, error
 func (r *logRepository) List(ctx context.Context, filter models.LogFilter) ([]*models.Log, error) {
 	sq := squirrel.Select("log.*").From("log").PlaceholderFormat(squirrel.Dollar)
 	sq = sq.Where(squirrel.Eq{"user_id": filter.UserID})
-	if len(filter.IDs) > 0 {
-		sq = sq.Where(squirrel.Eq{"task_id": filter.IDs})
+	if len(filter.TaskIDs) > 0 {
+		sq = sq.Where(squirrel.Eq{"task_id": filter.TaskIDs})
 	}
 	if len(filter.ItemIDs) > 0 {
 		sq = sq.Where(squirrel.Eq{"item_id": filter.ItemIDs})
diff --git a/models/log.go b/models/log.go
index 24b2cc5..4cd2f46 100644
--- a/models/log.go
+++ b/models/log.go
@@ -36,7 +36,7 @@ type LogResult struct {
 
 type LogFilter struct {
 	UserID  string
-	IDs     []string
+	TaskIDs []string
 	ItemIDs []string
 	MinTime *time.Time
 	MaxTime *time.Time
diff --git a/services/loader.go b/services/loader.go
index d743dfa..d51eb8b 100644
--- a/services/loader.go
+++ b/services/loader.go
@@ -207,8 +207,8 @@ func (l *Loader) FindProject(ctx context.Context, id string) (*models.ProjectRes
 	}
 
 	logs, err := l.DB.Logs().List(ctx, models.LogFilter{
-		UserID: auth.UserID(ctx),
-		IDs:    taskIDs,
+		UserID:  auth.UserID(ctx),
+		TaskIDs: taskIDs,
 	})
 	if err != nil {
 		return nil, err
@@ -270,8 +270,8 @@ func (l *Loader) ListProjects(ctx context.Context, filter models.ProjectFilter)
 	}
 
 	logs, err := l.DB.Logs().List(ctx, models.LogFilter{
-		UserID: auth.UserID(ctx),
-		IDs:    taskIDs,
+		UserID:  auth.UserID(ctx),
+		TaskIDs: taskIDs,
 	})
 	if err != nil {
 		return nil, err
@@ -331,8 +331,8 @@ func (l *Loader) FindTask(ctx context.Context, id string) (*models.TaskResult, e
 	result.Item, _ = l.DB.Items().Find(ctx, task.ItemID)
 	result.Project, _ = l.DB.Projects().Find(ctx, task.ProjectID)
 	result.Logs, err = l.DB.Logs().List(ctx, models.LogFilter{
-		UserID: task.UserID,
-		IDs:    []string{task.ID},
+		UserID:  task.UserID,
+		TaskIDs: []string{task.ID},
 	})
 	if err != nil {
 		return nil, err
@@ -363,8 +363,8 @@ func (l *Loader) ListTasks(ctx context.Context, filter models.TaskFilter) ([]*mo
 	}
 
 	logs, err := l.DB.Logs().List(ctx, models.LogFilter{
-		UserID: auth.UserID(ctx),
-		IDs:    taskIDs,
+		UserID:  auth.UserID(ctx),
+		TaskIDs: taskIDs,
 	})
 	if err != nil {
 		return nil, err
@@ -394,7 +394,7 @@ func (l *Loader) ListTasks(ctx context.Context, filter models.TaskFilter) ([]*mo
 		}
 
 		for _, log := range logs {
-			if log.TaskID != task.ID {
+			if log.TaskID == task.ID {
 				result.Logs = append(result.Logs, log)
 			}
 		}