diff options
Diffstat (limited to 'internal/handlers')
| -rw-r--r-- | internal/handlers/timeline_logic.go | 25 | ||||
| -rw-r--r-- | internal/handlers/timeline_logic_test.go | 30 |
2 files changed, 54 insertions, 1 deletions
diff --git a/internal/handlers/timeline_logic.go b/internal/handlers/timeline_logic.go index adfa406..145e851 100644 --- a/internal/handlers/timeline_logic.go +++ b/internal/handlers/timeline_logic.go @@ -18,7 +18,7 @@ func BuildTimeline(ctx context.Context, s *store.Store, tasksClient api.GoogleTa var items []models.TimelineItem now := config.Now() - // 1. Fetch Tasks + // 1. Fetch Tasks (dated) tasks, err := s.GetTasksByDateRange(start, end) if err != nil { return nil, err @@ -42,6 +42,29 @@ func BuildTimeline(ctx context.Context, s *store.Store, tasksClient api.GoogleTa items = append(items, item) } + // 1b. Fetch undated Tasks — place in Today section + undatedTasks, err := s.GetUndatedTasks() + if err != nil { + log.Printf("Warning: failed to fetch undated tasks: %v", err) + } else { + for _, task := range undatedTasks { + item := models.TimelineItem{ + ID: task.ID, + Type: models.TimelineItemTypeTask, + Title: task.Content, + Time: now, + Description: task.Description, + URL: task.URL, + OriginalItem: task, + IsCompleted: task.Completed, + Source: "todoist", + IsAllDay: true, + } + item.ComputeDaySection(now) + items = append(items, item) + } + } + // 2. Fetch Meals - combine multiple items for same date+mealType meals, err := s.GetMealsByDateRange(start, end) if err != nil { diff --git a/internal/handlers/timeline_logic_test.go b/internal/handlers/timeline_logic_test.go index b42ad4c..8104a96 100644 --- a/internal/handlers/timeline_logic_test.go +++ b/internal/handlers/timeline_logic_test.go @@ -462,6 +462,36 @@ func TestSaveAndGetCalendarEvents(t *testing.T) { } } +func TestBuildTimeline_IncludesUndatedTodoistTasks(t *testing.T) { + s := setupTestStore(t) + + // Save a task with no due date + _ = s.SaveTasks([]models.Task{ + {ID: "undated1", Content: "Take out recycling"}, // DueDate is nil + }) + + start := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC) + end := time.Date(2023, 1, 2, 0, 0, 0, 0, time.UTC) + + items, err := BuildTimeline(context.Background(), s, nil, start, end) + if err != nil { + t.Fatalf("BuildTimeline failed: %v", err) + } + + found := false + for _, item := range items { + if item.ID == "undated1" { + found = true + if item.DaySection != models.DaySectionToday { + t.Errorf("Undated task should be in Today section, got %s", item.DaySection) + } + } + } + if !found { + t.Error("Undated Todoist task should appear in timeline Today section") + } +} + func timePtr(t time.Time) *time.Time { return &t } |
