Add rrule param to create_event for recurring events, with integration tests

Author: bigcat88

src/nc_mcp_server/tools/calendar.py

@@ -229,6 +229,7 @@ def _build_ical(
     location: str = "",
     status: str = "CONFIRMED",
     categories: list[str] | None = None,
+    rrule: str = "",
 ) -> str:
     """Build a minimal iCalendar VEVENT string."""
     cal = ICal()
@@ -248,10 +249,29 @@ def _build_ical(
         event.add("status", status)
     if categories:
         event.add("categories", categories)
+    if rrule:
+        event.add("rrule", _parse_rrule(rrule))
     cal.add_component(event)
     return cal.to_ical().decode()
 
 
+def _parse_rrule(rrule_str: str) -> dict[str, list[Any]]:
+    """Parse an RRULE string like 'FREQ=WEEKLY;COUNT=4;BYDAY=MO,WE' into a dict."""
+    result: dict[str, list[Any]] = {}
+    for part in rrule_str.split(";"):
+        if "=" not in part:
+            continue
+        key, val = part.split("=", 1)
+        key = key.strip()
+        if key == "UNTIL":
+            result[key] = [datetime.fromisoformat(val.strip())]
+        elif key in {"COUNT", "INTERVAL"}:
+            result[key] = [int(val.strip())]
+        else:
+            result[key] = [v.strip() for v in val.split(",")]
+    return result
+
+
 def _validate_status(status: str) -> str:
     valid = {"CONFIRMED", "TENTATIVE", "CANCELLED"}
     upper = status.upper()
@@ -424,6 +444,7 @@ async def create_event(
         location: str = "",
         status: str = "CONFIRMED",
         categories: str = "",
+        rrule: str = "",
     ) -> str:
         """Create a new calendar event.
 
@@ -440,6 +461,9 @@ async def create_event(
             location: Optional event location.
             status: Event status: "CONFIRMED" (default), "TENTATIVE", or "CANCELLED".
             categories: Optional comma-separated category names (e.g. "Work,Meeting").
+            rrule: Optional recurrence rule in iCalendar RRULE format.
+                   Examples: "FREQ=DAILY;COUNT=5", "FREQ=WEEKLY;BYDAY=MO,WE,FR",
+                   "FREQ=MONTHLY;BYMONTHDAY=15;UNTIL=20261231T235959Z".
 
         Returns:
             JSON object with the created event's uid and summary.
@@ -455,7 +479,7 @@ async def create_event(
             dtend = dtstart + timedelta(hours=1)
 
         uid = str(uuid.uuid4())
-        ical_data = _build_ical(uid, summary, dtstart, dtend, description, location, status_upper, cat_list)
+        ical_data = _build_ical(uid, summary, dtstart, dtend, description, location, status_upper, cat_list, rrule)
         client = get_client()
         user = get_config().user
         path = _caldav_path(user, calendar_id, f"{uid}.ics")

tests/integration/test_calendar.py

@@ -170,6 +170,65 @@ async def test_create_with_categories(self, nc_mcp: McpTestHelper) -> None:
 
         await nc_mcp.call("delete_event", calendar_id=CAL_ID, event_uid=created["uid"])
 
+    @pytest.mark.asyncio
+    async def test_create_recurring_weekly(self, nc_mcp: McpTestHelper) -> None:
+        result = await nc_mcp.call(
+            "create_event",
+            calendar_id=CAL_ID,
+            summary="mcp-test-weekly",
+            start="2027-06-02T10:00:00Z",
+            end="2027-06-02T11:00:00Z",
+            rrule="FREQ=WEEKLY;COUNT=4",
+        )
+        created = json.loads(result)
+        event = json.loads(await nc_mcp.call("get_event", calendar_id=CAL_ID, event_uid=created["uid"]))
+        assert "rrule" in event
+        assert "WEEKLY" in event["rrule"]
+        assert "COUNT=4" in event["rrule"]
+
+        await nc_mcp.call("delete_event", calendar_id=CAL_ID, event_uid=created["uid"])
+
+    @pytest.mark.asyncio
+    async def test_create_recurring_daily_with_until(self, nc_mcp: McpTestHelper) -> None:
+        result = await nc_mcp.call(
+            "create_event",
+            calendar_id=CAL_ID,
+            summary="mcp-test-daily",
+            start="2027-07-01T09:00:00Z",
+            end="2027-07-01T09:30:00Z",
+            rrule="FREQ=DAILY;UNTIL=20270705T235959Z",
+        )
+        created = json.loads(result)
+        events = json.loads(
+            await nc_mcp.call(
+                "get_events",
+                calendar_id=CAL_ID,
+                start="2027-07-01T00:00:00Z",
+                end="2027-07-31T23:59:59Z",
+            )
+        )
+        matching = [e for e in events if e["uid"] == created["uid"]]
+        assert len(matching) >= 1
+
+        await nc_mcp.call("delete_event", calendar_id=CAL_ID, event_uid=created["uid"])
+
+    @pytest.mark.asyncio
+    async def test_create_recurring_monthly_byday(self, nc_mcp: McpTestHelper) -> None:
+        result = await nc_mcp.call(
+            "create_event",
+            calendar_id=CAL_ID,
+            summary="mcp-test-monthly",
+            start="2027-08-01T14:00:00Z",
+            end="2027-08-01T15:00:00Z",
+            rrule="FREQ=MONTHLY;BYMONTHDAY=1;COUNT=3",
+        )
+        created = json.loads(result)
+        event = json.loads(await nc_mcp.call("get_event", calendar_id=CAL_ID, event_uid=created["uid"]))
+        assert "MONTHLY" in event["rrule"]
+        assert "BYMONTHDAY=1" in event["rrule"]
+
+        await nc_mcp.call("delete_event", calendar_id=CAL_ID, event_uid=created["uid"])
+
     @pytest.mark.asyncio
     async def test_create_invalid_status_raises(self, nc_mcp: McpTestHelper) -> None:
         with pytest.raises((ToolError, ValueError)):