From e85b42d373de55781af9d699b246c0d6a492aec1 Mon Sep 17 00:00:00 2001
From: Claude <agent@claude.ai>
Date: Wed, 18 Mar 2026 10:04:57 +0000
Subject: refactor: RF-03/06 extract groupMeals helper, eliminate
 convertSyncItemToTask wrapper

RF-03: Extract shared groupMeals helper into internal/handlers/meals.go.
Both HandleTabMeals and BuildTimeline now call groupMeals instead of
duplicating the date+mealType grouping algorithm inline. CombinedMeal
gains ID and Meals fields to carry the first-meal ID and original records
needed by BuildTimeline when constructing TimelineItems.

RF-06: Add api.ConvertSyncItemToTask for single-item conversion.
ConvertSyncItemsToTasks now delegates to it, eliminating duplication.
The Handler.convertSyncItemToTask wrapper (which allocated a one-element
slice just to unwrap it) is deleted; its caller uses api.ConvertSyncItemToTask
directly. Covered by TestConvertSyncItemToTask in internal/api/todoist_test.go.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 internal/handlers/handlers.go | 68 ++++---------------------------------------
 1 file changed, 5 insertions(+), 63 deletions(-)

(limited to 'internal/handlers/handlers.go')

diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index 39e67c9..ce2c57e 100644
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -381,7 +381,7 @@ func (h *Handler) fetchTasks(ctx context.Context, forceRefresh bool) ([]models.T
 				deletedIDs = append(deletedIDs, item.ID)
 			} else {
 				// Upsert active task
-				task := h.convertSyncItemToTask(item, projectMap)
+				task, _ := api.ConvertSyncItemToTask(item, projectMap)
 				if err := h.store.UpsertTask(task); err != nil {
 					log.Printf("Failed to upsert task %s: %v", item.ID, err)
 				}
@@ -408,27 +408,6 @@ func (h *Handler) fetchTasks(ctx context.Context, forceRefresh bool) ([]models.T
 	return h.store.GetTasks()
 }
 
-// convertSyncItemToTask converts a sync item to a Task model
-func (h *Handler) convertSyncItemToTask(item api.SyncItemResponse, projectMap map[string]string) models.Task {
-	// Use the ConvertSyncItemsToTasks helper for single item conversion
-	items := api.ConvertSyncItemsToTasks([]api.SyncItemResponse{item}, projectMap)
-	if len(items) > 0 {
-		return items[0]
-	}
-	// Fallback for completed/deleted items (shouldn't happen in practice)
-	return models.Task{
-		ID:          item.ID,
-		Content:     item.Content,
-		Description: item.Description,
-		ProjectID:   item.ProjectID,
-		ProjectName: projectMap[item.ProjectID],
-		Priority:    item.Priority,
-		Completed:   item.IsCompleted,
-		Labels:      item.Labels,
-		URL:         fmt.Sprintf("https://todoist.com/app/task/%s", item.ID),
-	}
-}
-
 // fetchMeals fetches meals from cache or API
 func (h *Handler) fetchMeals(ctx context.Context, forceRefresh bool) ([]models.Meal, error) {
 	startDate := config.Now()
@@ -1104,10 +1083,12 @@ func (h *Handler) HandleTabPlanning(w http.ResponseWriter, r *http.Request) {
 
 // CombinedMeal represents multiple meals combined for same date+mealType
 type CombinedMeal struct {
+	ID          string
 	RecipeNames []string
 	Date        time.Time
 	MealType    string
-	RecipeURL   string // URL of first meal
+	RecipeURL   string        // URL of first meal
+	Meals       []models.Meal // original meal records
 }
 
 // HandleTabMeals renders the Meals tab (PlanToEat)
@@ -1121,46 +1102,7 @@ func (h *Handler) HandleTabMeals(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Group meals by date+mealType
-	type mealKey struct {
-		date     string
-		mealType string
-	}
-	mealGroups := make(map[mealKey][]models.Meal)
-	for _, meal := range meals {
-		key := mealKey{
-			date:     meal.Date.Format("2006-01-02"),
-			mealType: meal.MealType,
-		}
-		mealGroups[key] = append(mealGroups[key], meal)
-	}
-
-	// Convert to combined meals
-	var combined []CombinedMeal
-	for _, group := range mealGroups {
-		if len(group) == 0 {
-			continue
-		}
-		cm := CombinedMeal{
-			Date:      group[0].Date,
-			MealType:  group[0].MealType,
-			RecipeURL: group[0].RecipeURL,
-		}
-		for _, m := range group {
-			cm.RecipeNames = append(cm.RecipeNames, m.RecipeName)
-		}
-		combined = append(combined, cm)
-	}
-
-	// Sort by date then meal type order
-	sort.Slice(combined, func(i, j int) bool {
-		if !combined[i].Date.Equal(combined[j].Date) {
-			return combined[i].Date.Before(combined[j].Date)
-		}
-		return mealTypeOrder(combined[i].MealType) < mealTypeOrder(combined[j].MealType)
-	})
-
-	HTMLResponse(w, h.renderer, "meals-tab", struct{ Meals []CombinedMeal }{combined})
+	HTMLResponse(w, h.renderer, "meals-tab", struct{ Meals []CombinedMeal }{groupMeals(meals)})
 }
 
 // mealTypeOrder returns sort order for meal types
-- 
cgit v1.2.3