gisle/stufflog2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix tasks endpoint returning wrong values for task.logs.
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gisle
2021-01-13 18:30:14 +01:00
parent 096f25804d
commit 68ad952577
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/postgres/logs.go
+2 -2
View File
@@ -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) { func (r *logRepository) List(ctx context.Context, filter models.LogFilter) ([]*models.Log, error) {
sq := squirrel.Select("log.*").From("log").PlaceholderFormat(squirrel.Dollar) sq := squirrel.Select("log.*").From("log").PlaceholderFormat(squirrel.Dollar)
sq = sq.Where(squirrel.Eq{"user_id": filter.UserID}) sq = sq.Where(squirrel.Eq{"user_id": filter.UserID})
if len(filter.IDs) > 0 { if len(filter.TaskIDs) > 0 {
sq = sq.Where(squirrel.Eq{"task_id": filter.IDs}) sq = sq.Where(squirrel.Eq{"task_id": filter.TaskIDs})
} }
if len(filter.ItemIDs) > 0 { if len(filter.ItemIDs) > 0 {
sq = sq.Where(squirrel.Eq{"item_id": filter.ItemIDs}) sq = sq.Where(squirrel.Eq{"item_id": filter.ItemIDs})
models/log.go
+1 -1
View File
@@ -36,7 +36,7 @@ type LogResult struct {
type LogFilter struct { type LogFilter struct {
UserID string UserID string
IDs []string TaskIDs []string
ItemIDs []string ItemIDs []string
MinTime *time.Time MinTime *time.Time
MaxTime *time.Time MaxTime *time.Time
services/loader.go
+9 -9
View File
@@ -207,8 +207,8 @@ func (l *Loader) FindProject(ctx context.Context, id string) (*models.ProjectRes
} }
logs, err := l.DB.Logs().List(ctx, models.LogFilter{ logs, err := l.DB.Logs().List(ctx, models.LogFilter{
UserID: auth.UserID(ctx), UserID: auth.UserID(ctx),
IDs: taskIDs, TaskIDs: taskIDs,
}) })
if err != nil { if err != nil {
return nil, err 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{ logs, err := l.DB.Logs().List(ctx, models.LogFilter{
UserID: auth.UserID(ctx), UserID: auth.UserID(ctx),
IDs: taskIDs, TaskIDs: taskIDs,
}) })
if err != nil { if err != nil {
return nil, err 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.Item, _ = l.DB.Items().Find(ctx, task.ItemID)
result.Project, _ = l.DB.Projects().Find(ctx, task.ProjectID) result.Project, _ = l.DB.Projects().Find(ctx, task.ProjectID)
result.Logs, err = l.DB.Logs().List(ctx, models.LogFilter{ result.Logs, err = l.DB.Logs().List(ctx, models.LogFilter{
UserID: task.UserID, UserID: task.UserID,
IDs: []string{task.ID}, TaskIDs: []string{task.ID},
}) })
if err != nil { if err != nil {
return nil, err 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{ logs, err := l.DB.Logs().List(ctx, models.LogFilter{
UserID: auth.UserID(ctx), UserID: auth.UserID(ctx),
IDs: taskIDs, TaskIDs: taskIDs,
}) })
if err != nil { if err != nil {
return nil, err return nil, err
@@ -394,7 +394,7 @@ func (l *Loader) ListTasks(ctx context.Context, filter models.TaskFilter) ([]*mo
} }
for _, log := range logs { for _, log := range logs {
if log.TaskID != task.ID { if log.TaskID == task.ID {
result.Logs = append(result.Logs, log) result.Logs = append(result.Logs, log)
} }
} }