1 files changed, 50 insertions, 5 deletions

diff --git a/internal/store/native_tasks.go b/internal/store/native_tasks.go
index 7789a0d..c0a7a61 100644
--- a/internal/store/native_tasks.go
+++ b/internal/store/native_tasks.go
@@ -4,6 +4,8 @@ import (
 	"database/sql"
 	"encoding/json"
 	"errors"
+	"strconv"
+	"strings"
 	"time"
 
 	"task-dashboard/internal/models"
@@ -19,7 +21,8 @@ var ErrNativeTaskNotFound = errors.New("native task not found")
 // GetNativeTasks returns all non-completed native tasks.
 func (s *Store) GetNativeTasks() ([]models.Task, error) {
 	rows, err := s.db.Query(`
-		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at
+		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at,
+		       recurrence_freq, recurrence_interval, recurrence_weekdays, recurrence_series_id, next_occurrence_override
 		FROM native_tasks
 		WHERE completed = 0
 		ORDER BY CASE WHEN due_date IS NULL THEN 1 ELSE 0 END, due_date ASC, priority DESC
@@ -37,7 +40,8 @@ func (s *Store) GetNativeTasks() ([]models.Task, error) {
 // without double-counting against that separate fetch.
 func (s *Store) GetNativeTasksByDateRange(start, end time.Time) ([]models.Task, error) {
 	rows, err := s.db.Query(`
-		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at
+		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at,
+		       recurrence_freq, recurrence_interval, recurrence_weekdays, recurrence_series_id, next_occurrence_override
 		FROM native_tasks
 		WHERE completed = 0 AND due_date IS NOT NULL AND due_date >= ? AND due_date < ?
 		ORDER BY due_date ASC, priority DESC
@@ -57,7 +61,8 @@ func (s *Store) GetNativeTasksByDateRange(start, end time.Time) ([]models.Task,
 // ComputeDaySection to be marked IsOverdue.
 func (s *Store) GetOverdueNativeTasks(before time.Time) ([]models.Task, error) {
 	rows, err := s.db.Query(`
-		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at
+		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at,
+		       recurrence_freq, recurrence_interval, recurrence_weekdays, recurrence_series_id, next_occurrence_override
 		FROM native_tasks
 		WHERE completed = 0 AND due_date IS NOT NULL AND due_date < ?
 		ORDER BY due_date ASC, priority DESC
@@ -72,7 +77,8 @@ func (s *Store) GetOverdueNativeTasks(before time.Time) ([]models.Task, error) {
 // GetUndatedNativeTasks returns non-completed native tasks with no due date.
 func (s *Store) GetUndatedNativeTasks() ([]models.Task, error) {
 	rows, err := s.db.Query(`
-		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at
+		SELECT id, content, description, project_name, due_date, priority, completed, labels, created_at,
+		       recurrence_freq, recurrence_interval, recurrence_weekdays, recurrence_series_id, next_occurrence_override
 		FROM native_tasks
 		WHERE completed = 0 AND due_date IS NULL
 		ORDER BY priority DESC, created_at ASC
@@ -173,7 +179,12 @@ func scanNativeTasks(rows interface {
 		var t models.Task
 		var labelsJSON string
 		var dueDateStr *string
-		if err := rows.Scan(&t.ID, &t.Content, &t.Description, &t.ProjectName, &dueDateStr, &t.Priority, &t.Completed, &labelsJSON, &t.CreatedAt); err != nil {
+		var weekdaysStr string
+		var nextOverrideStr string
+		if err := rows.Scan(
+			&t.ID, &t.Content, &t.Description, &t.ProjectName, &dueDateStr, &t.Priority, &t.Completed, &labelsJSON, &t.CreatedAt,
+			&t.RecurrenceFreq, &t.RecurrenceInterval, &weekdaysStr, &t.RecurrenceSeriesID, &nextOverrideStr,
+		); err != nil {
 			return nil, err
 		}
 		if dueDateStr != nil {
@@ -188,7 +199,41 @@ func scanNativeTasks(rows interface {
 		if err := json.Unmarshal([]byte(labelsJSON), &t.Labels); err != nil {
 			t.Labels = nil
 		}
+		t.RecurrenceWeekdays = parseWeekdays(weekdaysStr)
+		if nextOverrideStr != "" {
+			if parsed, err := time.Parse("2006-01-02", nextOverrideStr); err == nil {
+				t.NextOccurrenceOverride = &parsed
+			}
+		}
 		tasks = append(tasks, t)
 	}
 	return tasks, rows.Err()
 }
+
+// parseWeekdays parses a comma-separated list of 0-6 ints (e.g. "1,3,5"),
+// returning nil for an empty string.
+func parseWeekdays(s string) []int {
+	if s == "" {
+		return nil
+	}
+	parts := strings.Split(s, ",")
+	weekdays := make([]int, 0, len(parts))
+	for _, p := range parts {
+		if n, err := strconv.Atoi(strings.TrimSpace(p)); err == nil {
+			weekdays = append(weekdays, n)
+		}
+	}
+	return weekdays
+}
+
+// formatWeekdays is the inverse of parseWeekdays.
+func formatWeekdays(weekdays []int) string {
+	if len(weekdays) == 0 {
+		return ""
+	}
+	strs := make([]string, len(weekdays))
+	for i, d := range weekdays {
+		strs[i] = strconv.Itoa(d)
+	}
+	return strings.Join(strs, ",")
+}