diff options
| author | Peter Stone <thepeterstone@gmail.com> | 2026-02-06 14:53:47 -1000 |
|---|---|---|
| committer | Peter Stone <thepeterstone@gmail.com> | 2026-02-06 14:53:47 -1000 |
| commit | 27ee1a271248e9f1de8ecb981a6cabfa8e498b1b (patch) | |
| tree | 7a5b8555ea4199094104f3e2b1227c08a33037ed /internal | |
| parent | 0a1001eb0bd2d1f7c0624ae1ef8ae7ccdb3447d4 (diff) | |
Fix missing settings button, disappeared events, and tab refresh bug
- Add settings gear icon link to dashboard header
- Fix GetTasksByDateRange/GetCardsByDateRange to include overdue items
(changed from BETWEEN to <= end, filter completed tasks)
- Fix refresh replacing active tab with tasks tab by using
htmx.trigger(body, 'refresh-tasks') instead of innerHTML+htmx.process
- Add refresh-tasks hx-trigger to meals, shopping, conditions tabs
- Add tests for overdue inclusion/exclusion, settings link, template data
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/handlers/handlers_test.go | 105 | ||||
| -rw-r--r-- | internal/handlers/timeline_logic_test.go | 72 | ||||
| -rw-r--r-- | internal/store/sqlite.go | 15 | ||||
| -rw-r--r-- | internal/store/sqlite_test.go | 67 |
4 files changed, 247 insertions, 12 deletions
diff --git a/internal/handlers/handlers_test.go b/internal/handlers/handlers_test.go index f91eb32..d338cd3 100644 --- a/internal/handlers/handlers_test.go +++ b/internal/handlers/handlers_test.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "io" "net/http" "net/http/httptest" "os" @@ -1853,9 +1854,107 @@ func TestHandleTimeline(t *testing.T) { h.HandleTimeline(w, req) - // May return 500 if template not found - if w.Code != http.StatusOK && w.Code != http.StatusInternalServerError { - t.Errorf("Expected status 200 or 500, got %d", w.Code) + if w.Code != http.StatusOK { + t.Errorf("Expected status 200, got %d", w.Code) + } +} + +func TestHandleTimeline_RendersDataToTemplate(t *testing.T) { + h, cleanup := setupTestHandler(t) + defer cleanup() + + // Seed tasks with due dates in range + now := config.Now() + todayNoon := time.Date(now.Year(), now.Month(), now.Day(), 12, 0, 0, 0, now.Location()) + tasks := []models.Task{ + {ID: "t1", Content: "Today task", DueDate: &todayNoon, Labels: []string{}, CreatedAt: now}, + } + _ = h.store.SaveTasks(tasks) + + req := httptest.NewRequest("GET", "/tabs/timeline", nil) + w := httptest.NewRecorder() + + h.HandleTimeline(w, req) + + if w.Code != http.StatusOK { + t.Errorf("Expected status 200, got %d", w.Code) + } + + // Verify the renderer received timeline data with items + mock := h.renderer.(*MockRenderer) + if len(mock.Calls) == 0 { + t.Fatal("Expected renderer to be called") + } + + lastCall := mock.Calls[len(mock.Calls)-1] + if lastCall.Name != "timeline-tab" { + t.Errorf("Expected template 'timeline-tab', got '%s'", lastCall.Name) + } + + data, ok := lastCall.Data.(TimelineData) + if !ok { + t.Fatalf("Expected TimelineData, got %T", lastCall.Data) + } + + if len(data.TodayItems) == 0 { + t.Error("Expected TodayItems to contain at least one item, got 0") + } +} + +// ============================================================================= +// Dashboard Content Verification Tests +// ============================================================================= + +func TestHandleDashboard_ContainsSettingsLink(t *testing.T) { + db, cleanup := setupTestDB(t) + defer cleanup() + + mockTodoist := &mockTodoistClient{} + mockTrello := &mockTrelloClient{} + + // Use a renderer that outputs actual content so we can check for settings link + renderer := NewMockRenderer() + renderer.RenderFunc = func(w io.Writer, name string, data interface{}) error { + if name == "index.html" { + // Check that data includes what the template needs + // We verify the template at the source: index.html must contain /settings link + fmt.Fprintf(w, "rendered:%s", name) + } + return nil + } + + h := &Handler{ + store: db, + todoistClient: mockTodoist, + trelloClient: mockTrello, + config: &config.Config{CacheTTLMinutes: 5}, + renderer: renderer, + } + + req := httptest.NewRequest("GET", "/", nil) + w := httptest.NewRecorder() + + h.HandleDashboard(w, req) + + if w.Code != http.StatusOK { + t.Errorf("Expected status 200, got %d", w.Code) + } +} + +// TestDashboardTemplate_HasSettingsLink verifies the index.html template +// contains a link to /settings. This catches regressions where the settings +// button is accidentally removed. +func TestDashboardTemplate_HasSettingsLink(t *testing.T) { + // Read the actual template file and verify it contains a settings link + content, err := os.ReadFile("../../web/templates/index.html") + if err != nil { + t.Skipf("Cannot read template file (running from unexpected directory): %v", err) + } + + templateStr := string(content) + + if !strings.Contains(templateStr, `href="/settings"`) { + t.Error("index.html must contain a link to /settings (settings button missing from UI)") } } diff --git a/internal/handlers/timeline_logic_test.go b/internal/handlers/timeline_logic_test.go index 9a71741..11406b9 100644 --- a/internal/handlers/timeline_logic_test.go +++ b/internal/handlers/timeline_logic_test.go @@ -251,6 +251,78 @@ func TestCalcCalendarBounds(t *testing.T) { } } +func TestBuildTimeline_IncludesOverdueItems(t *testing.T) { + s := setupTestStore(t) + + // Base: "today" is Jan 2, 2023 + today := time.Date(2023, 1, 2, 0, 0, 0, 0, time.UTC) + yesterday := time.Date(2023, 1, 1, 10, 0, 0, 0, time.UTC) // overdue + todayNoon := time.Date(2023, 1, 2, 12, 0, 0, 0, time.UTC) // current + + // Save a task that is overdue (yesterday) and one that is current (today) + _ = s.SaveTasks([]models.Task{ + {ID: "overdue1", Content: "Overdue task", DueDate: &yesterday}, + {ID: "current1", Content: "Current task", DueDate: &todayNoon}, + }) + + // Query range: today through tomorrow + end := today.AddDate(0, 0, 1) + + items, err := BuildTimeline(context.Background(), s, nil, nil, today, end) + if err != nil { + t.Fatalf("BuildTimeline failed: %v", err) + } + + // Should include both the overdue task and the current task + if len(items) < 2 { + t.Errorf("Expected at least 2 items (overdue + current), got %d", len(items)) + for _, item := range items { + t.Logf(" item: %s (type=%s, time=%s)", item.Title, item.Type, item.Time) + } + } + + // Verify overdue task is marked as overdue + foundOverdue := false + for _, item := range items { + if item.ID == "overdue1" { + foundOverdue = true + if !item.IsOverdue { + t.Error("Expected overdue task to be marked IsOverdue=true") + } + if item.DaySection != models.DaySectionToday { + t.Errorf("Expected overdue task in Today section, got %s", item.DaySection) + } + } + } + if !foundOverdue { + t.Error("Overdue task was not included in timeline results") + } +} + +func TestBuildTimeline_ExcludesCompletedOverdue(t *testing.T) { + s := setupTestStore(t) + + yesterday := time.Date(2023, 1, 1, 10, 0, 0, 0, time.UTC) + today := time.Date(2023, 1, 2, 0, 0, 0, 0, time.UTC) + end := today.AddDate(0, 0, 1) + + // Save a completed overdue task — should NOT appear + _ = s.SaveTasks([]models.Task{ + {ID: "done1", Content: "Done overdue", DueDate: &yesterday, Completed: true}, + }) + + items, err := BuildTimeline(context.Background(), s, nil, nil, today, end) + if err != nil { + t.Fatalf("BuildTimeline failed: %v", err) + } + + for _, item := range items { + if item.ID == "done1" { + t.Error("Completed overdue task should not appear in timeline") + } + } +} + func timePtr(t time.Time) *time.Time { return &t } diff --git a/internal/store/sqlite.go b/internal/store/sqlite.go index 465c3c1..24a24d7 100644 --- a/internal/store/sqlite.go +++ b/internal/store/sqlite.go @@ -735,14 +735,16 @@ func (s *Store) GetShoppingItemChecks(source string) (map[string]bool, error) { return checks, rows.Err() } -// GetTasksByDateRange retrieves tasks due within a specific date range +// GetTasksByDateRange retrieves tasks due within a specific date range, +// including overdue tasks (due before start) so they appear in the timeline. func (s *Store) GetTasksByDateRange(start, end time.Time) ([]models.Task, error) { rows, err := s.db.Query(` SELECT id, content, description, project_id, project_name, due_date, priority, completed, labels, url, created_at FROM tasks - WHERE due_date BETWEEN ? AND ? + WHERE due_date IS NOT NULL AND due_date <= ? + AND completed = FALSE ORDER BY due_date ASC, priority DESC - `, start, end) + `, end) if err != nil { return nil, err } @@ -755,15 +757,16 @@ func (s *Store) GetMealsByDateRange(start, end time.Time) ([]models.Meal, error) return s.GetMeals(start, end) } -// GetCardsByDateRange retrieves cards due within a specific date range +// GetCardsByDateRange retrieves cards due within a specific date range, +// including overdue cards (due before start) so they appear in the timeline. func (s *Store) GetCardsByDateRange(start, end time.Time) ([]models.Card, error) { rows, err := s.db.Query(` SELECT c.id, c.name, b.name, c.list_id, c.list_name, c.due_date, c.url FROM cards c JOIN boards b ON c.board_id = b.id - WHERE c.due_date BETWEEN ? AND ? + WHERE c.due_date IS NOT NULL AND c.due_date <= ? ORDER BY c.due_date ASC - `, start, end) + `, end) if err != nil { return nil, err } diff --git a/internal/store/sqlite_test.go b/internal/store/sqlite_test.go index 69d188a..9c56252 100644 --- a/internal/store/sqlite_test.go +++ b/internal/store/sqlite_test.go @@ -482,17 +482,78 @@ func TestGetTasksByDateRange(t *testing.T) { t.Fatalf("Failed to save tasks: %v", err) } - // Test range covering today and tomorrow + // Test range covering today and tomorrow — should include all tasks <= end start := now.Add(-1 * time.Hour) end := tomorrow.Add(1 * time.Hour) - + results, err := store.GetTasksByDateRange(start, end) if err != nil { t.Fatalf("GetTasksByDateRange failed: %v", err) } if len(results) != 2 { - t.Errorf("Expected 2 tasks, got %d", len(results)) + t.Errorf("Expected 2 tasks (today + tomorrow, not next week), got %d", len(results)) + } +} + +func TestGetTasksByDateRange_IncludesOverdue(t *testing.T) { + store := setupTestStoreWithTasks(t) + defer func() { _ = store.Close() }() + + now := time.Now() + yesterday := now.Add(-24 * time.Hour) + tomorrow := now.Add(24 * time.Hour) + + tasks := []models.Task{ + {ID: "overdue", Content: "Overdue", DueDate: &yesterday}, + {ID: "current", Content: "Current", DueDate: &now}, + } + + if err := store.SaveTasks(tasks); err != nil { + t.Fatalf("Failed to save tasks: %v", err) + } + + // Query from "today" onward — overdue tasks (before start) should also be included + results, err := store.GetTasksByDateRange(now, tomorrow) + if err != nil { + t.Fatalf("GetTasksByDateRange failed: %v", err) + } + + if len(results) != 2 { + t.Errorf("Expected 2 tasks (overdue + current), got %d", len(results)) + for _, r := range results { + t.Logf(" task: %s due=%v", r.Content, r.DueDate) + } + } +} + +func TestGetTasksByDateRange_ExcludesCompleted(t *testing.T) { + store := setupTestStoreWithTasks(t) + defer func() { _ = store.Close() }() + + now := time.Now() + yesterday := now.Add(-24 * time.Hour) + tomorrow := now.Add(24 * time.Hour) + + tasks := []models.Task{ + {ID: "done", Content: "Completed overdue", DueDate: &yesterday, Completed: true}, + {ID: "active", Content: "Active", DueDate: &now}, + } + + if err := store.SaveTasks(tasks); err != nil { + t.Fatalf("Failed to save tasks: %v", err) + } + + results, err := store.GetTasksByDateRange(now, tomorrow) + if err != nil { + t.Fatalf("GetTasksByDateRange failed: %v", err) + } + + if len(results) != 1 { + t.Errorf("Expected 1 task (only active), got %d", len(results)) + } + if len(results) > 0 && results[0].ID != "active" { + t.Errorf("Expected active task, got %s", results[0].ID) } } |
