diff --git a/CHANGELOG.md b/CHANGELOG.md index e1c42a3c5..c879915b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 0.48.2 - Unreleased - Dependencies: refresh the MCP and Google API clients, networking libraries, and tracking-worker tooling while preserving the Go 1.26 minimum, 24-hour worker cooldown, and security overrides. +- Calendar: clear timed fields when an update converts an event to all day, and clear all-day dates for the inverse conversion. (#1348) — thanks @finn-atlas. ## 0.48.1 - 2026-11-15 diff --git a/internal/cmd/calendar_edit_test.go b/internal/cmd/calendar_edit_test.go index e21914a11..874ba230a 100644 --- a/internal/cmd/calendar_edit_test.go +++ b/internal/cmd/calendar_edit_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/alecthomas/kong" + "google.golang.org/api/calendar/v3" "github.com/openclaw/gogcli/internal/googleauth" ) @@ -89,6 +90,88 @@ func TestCalendarUpdatePatchClearsReminders(t *testing.T) { } } +func TestCalendarUpdatePatchClearsPreviousTimeRepresentation(t *testing.T) { + tests := []struct { + name string + args []string + wantStart string + wantEnd string + wantNulls []string + }{ + { + name: "timed to all-day", + args: []string{"cal1", "evt1", "--from", "2030-01-01", "--to", "2030-01-02", "--all-day"}, + wantStart: "2030-01-01", + wantEnd: "2030-01-02", + wantNulls: []string{"DateTime", "TimeZone"}, + }, + { + name: "all-day to timed", + args: []string{"cal1", "evt1", "--from", "2030-01-01T09:00:00Z", "--to", "2030-01-01T10:00:00Z"}, + wantStart: "2030-01-01T09:00:00Z", + wantEnd: "2030-01-01T10:00:00Z", + wantNulls: []string{"Date"}, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + cmd := &CalendarUpdateCmd{} + kctx := parseKongContext(t, cmd, test.args) + patch, changed, err := buildCalendarUpdatePatch(calendarUpdateInputFromCommand(cmd), calendarUpdateFieldsFromKong(kctx)) + if err != nil { + t.Fatalf("buildUpdatePatch: %v", err) + } + if !changed || patch.Start == nil || patch.End == nil { + t.Fatalf("unexpected time patch: changed=%t patch=%#v", changed, patch) + } + + if cmd.AllDay { + if patch.Start.Date != test.wantStart || patch.End.Date != test.wantEnd { + t.Fatalf("unexpected all-day range: start=%#v end=%#v", patch.Start, patch.End) + } + } else if patch.Start.DateTime != test.wantStart || patch.End.DateTime != test.wantEnd { + t.Fatalf("unexpected timed range: start=%#v end=%#v", patch.Start, patch.End) + } + + for _, field := range test.wantNulls { + if !hasStringValue(patch.Start.NullFields, field) || !hasStringValue(patch.End.NullFields, field) { + t.Fatalf("expected %s to be cleared: start=%#v end=%#v", field, patch.Start, patch.End) + } + } + }) + } +} + +func TestCalendarUpdatePatchKeepsTimeClearsWhenAddingRecurrence(t *testing.T) { + cmd := &CalendarUpdateCmd{} + kctx := parseKongContext(t, cmd, []string{ + "cal1", "evt1", + "--from", "2030-01-01", + "--to", "2030-01-02", + "--all-day", + "--rrule", "RRULE:FREQ=DAILY", + }) + patch, changed, err := buildCalendarUpdatePatch(calendarUpdateInputFromCommand(cmd), calendarUpdateFieldsFromKong(kctx)) + if err != nil { + t.Fatalf("buildUpdatePatch: %v", err) + } + if !changed || len(patch.Recurrence) != 1 { + t.Fatalf("unexpected recurring patch: changed=%t patch=%#v", changed, patch) + } + + fallbackStart := &calendar.EventDateTime{DateTime: "2029-12-31T09:00:00Z", TimeZone: "UTC"} + fallbackEnd := &calendar.EventDateTime{DateTime: "2029-12-31T10:00:00Z", TimeZone: "UTC"} + patch.Start = normalizeRecurringPatchDateTime(patch.Start, fallbackStart) + patch.End = normalizeRecurringPatchDateTime(patch.End, fallbackEnd) + + for _, field := range []string{"DateTime", "TimeZone"} { + if !hasStringValue(patch.Start.NullFields, field) || !hasStringValue(patch.End.NullFields, field) { + t.Fatalf("expected %s to stay cleared: start=%#v end=%#v", field, patch.Start, patch.End) + } + } +} + func TestCalendarUpdatePatchDisablesReminders(t *testing.T) { cmd := &CalendarUpdateCmd{} kctx := parseKongContext(t, cmd, []string{"cal1", "evt1", "--no-reminders"}) diff --git a/internal/cmd/calendar_update_patch_plan.go b/internal/cmd/calendar_update_patch_plan.go index 7262876a9..75db7a750 100644 --- a/internal/cmd/calendar_update_patch_plan.go +++ b/internal/cmd/calendar_update_patch_plan.go @@ -155,7 +155,7 @@ func applyUpdateTimeFields(input calendarUpdateInput, fields calendarUpdateField if err != nil { return false, err } - patch.Start, err = buildEventDateTimeWithTimezone(input.From, allDay, input.StartTimezone, "--start-timezone") + patch.Start, err = buildUpdateEventDateTime(input.From, allDay, input.StartTimezone, "--start-timezone") if err != nil { return false, err } @@ -166,7 +166,7 @@ func applyUpdateTimeFields(input calendarUpdateInput, fields calendarUpdateField if err != nil { return false, err } - patch.End, err = buildEventDateTimeWithTimezone(input.To, allDay, input.EndTimezone, "--end-timezone") + patch.End, err = buildUpdateEventDateTime(input.To, allDay, input.EndTimezone, "--end-timezone") if err != nil { return false, err } @@ -175,6 +175,22 @@ func applyUpdateTimeFields(input calendarUpdateInput, fields calendarUpdateField return changed, nil } +func buildUpdateEventDateTime(value string, allDay bool, timezone, flagName string) (*calendar.EventDateTime, error) { + dt, err := buildEventDateTimeWithTimezone(value, allDay, timezone, flagName) + if err != nil { + return nil, err + } + + // Calendar PATCH merges nested date-time fields. Clear the representation + // that the update replaces so Google never receives both date and dateTime. + if allDay { + dt.NullFields = []string{"DateTime", "TimeZone"} + } else { + dt.NullFields = []string{"Date"} + } + return dt, nil +} + func applyUpdateAttendees(input calendarUpdateInput, fields calendarUpdateFields, patch *calendar.Event) (bool, error) { if !fields.Attendees { return false, nil @@ -266,9 +282,11 @@ func cloneEventDateTime(in *calendar.EventDateTime) *calendar.EventDateTime { return nil } return &calendar.EventDateTime{ - Date: in.Date, - DateTime: in.DateTime, - TimeZone: in.TimeZone, + Date: in.Date, + DateTime: in.DateTime, + TimeZone: in.TimeZone, + ForceSendFields: append([]string(nil), in.ForceSendFields...), + NullFields: append([]string(nil), in.NullFields...), } }