From 8e99c46f3e301e4ac00d487f5263f1cf4be54043 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Sat, 14 Nov 2026 03:31:47 +0100 Subject: [PATCH] fix(#515, #325): review round 4 - declined rows dropped by row, not by UID --- .../de/jeanlucmakiola/calendula/domain/ics/CalendarCopy.kt | 7 ++++--- .../calendula/domain/ics/CalendarRowsTest.kt | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/domain/ics/CalendarCopy.kt b/app/src/main/java/de/jeanlucmakiola/calendula/domain/ics/CalendarCopy.kt index 2f4883a2..13046a57 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/domain/ics/CalendarCopy.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/domain/ics/CalendarCopy.kt @@ -36,9 +36,10 @@ fun planCalendarCopy( }, ) // A declined series still hands its accepted occurrences on before it goes. - val declined = declinedSeries.map { it.event.uid }.toSet() - return flattenOverrides(live, exdateStamp) - .filterNot { it.overrideOf == null && it.uid in declined } + // The flattened series follow the standalone occurrences, one per row in order. + val flat = flattenOverrides(live, exdateStamp) + val standalone = flat.size - live.series.size + return flat.filterIndexed { i, _ -> i < standalone || live.series[i - standalone].eventId !in declinedIds } .map { it.toParsedIcsEvent() } } diff --git a/app/src/test/java/de/jeanlucmakiola/calendula/domain/ics/CalendarRowsTest.kt b/app/src/test/java/de/jeanlucmakiola/calendula/domain/ics/CalendarRowsTest.kt index dba00cf0..4c763dbc 100644 --- a/app/src/test/java/de/jeanlucmakiola/calendula/domain/ics/CalendarRowsTest.kt +++ b/app/src/test/java/de/jeanlucmakiola/calendula/domain/ics/CalendarRowsTest.kt @@ -277,4 +277,11 @@ class CalendarRowsTest { assertThat(IcsParser().parse(text).events.single().recurrenceDates) .containsExactly("20260110T140000Z", "20260111T090000Z") } + + @Test + fun `a declined row takes no other row with its UID along`() { + val rows = CalendarRows(listOf(series("u").copy(declined = true), series("u", id = 2)), emptyList()) + + assertThat(planCalendarCopy(rows, ::formatExdateStamp)).hasSize(1) + } }