Fix some tests

SDESK-7442

pyproject.toml

@@ -18,4 +18,6 @@ exclude = '''
 
 [tool.pytest.ini_options]
 testpaths = ["server/planning", "server/tests/prod_api"]
-python_files = "*_test.py *_tests.py test_*.py tests_*.py tests.py test.py"
+python_files = "*_test.py *_tests.py test_*.py tests_*.py tests.py test.py"
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"

server/planning/events/events.py

@@ -862,13 +862,12 @@ def generate_recurring_dates(
     start,
     frequency,
     interval=1,
-    endRepeatMode="count",
     until=None,
     byday=None,
     count=5,
     tz=None,
     date_only=False,
-    _created_externally=False,
+    **_,
 ):
     """
 

server/planning/events/events_history.py

@@ -11,6 +11,8 @@
 from copy import deepcopy
 import logging
 
+from planning.types.event import EventResourceModel
+
 from superdesk.resource_fields import ID_FIELD
 from superdesk import Resource
 from planning.utils import get_related_planning_for_events
@@ -37,6 +39,9 @@ def on_item_created(self, items, operation=None):
         created_from_planning = []
         regular_events = []
         for item in items:
+            if isinstance(item, EventResourceModel):
+                item = item.to_dict()
+
             planning_items = get_related_planning_for_events([item[ID_FIELD]], "primary")
             if len(planning_items) > 0:
                 item["created_from_planning"] = planning_items[0].get("_id")

server/planning/events/events_service.py

@@ -115,6 +115,7 @@ async def create(self, docs: list[EventResourceModel]):
         """
 
         docs = await self._convert_dicts_to_model(docs)
+        print(docs)
         ids = await super().create(docs)
 
         embedded_planning_lists: list[tuple[EventResourceModel, list[EmbeddedPlanning]]] = []
@@ -463,7 +464,7 @@ async def _update_single_event(self, updates: dict[str, Any], original: EventRes
         """
 
         if post_required(updates, original.to_dict()):
-            merged: EventResourceModel = original.model_copy(updates, deep=True)
+            merged: EventResourceModel = original.clone_with(updates)
 
             # TODO-ASYNC: replace when `event_post` is async
             get_resource_service("events_post").validate_item(merged.to_dict())
@@ -616,7 +617,7 @@ async def _convert_to_recurring_events(self, updates: dict[str, Any], original:
         self._validate_convert_to_recurring(updates, original)
         updates["recurrence_id"] = original.id
 
-        merged: EventResourceModel = original.model_copy(updates, deep=True)
+        merged = original.clone_with(updates)
 
         # Generated new events will be "draft"
         merged.state = WorkflowState.DRAFT
@@ -753,7 +754,7 @@ def _generate_recurring_events(
                 recurring_event_updates[field] = None
 
             # let's finally clone the original event & update it with recurring event data
-            new_event = event.model_copy(update=recurring_event_updates, deep=True)
+            new_event = event.clone_with(recurring_event_updates)
 
             # reset embedded_planning to all Events but the first one, as this auto-generates
             # associated Planning item with Coverages to the event

server/planning/events/events_sync/__init__.py

@@ -8,18 +8,18 @@
 # AUTHORS and LICENSE files distributed with this source code, or
 # at https://www.sourcefabric.org/superdesk/license
 
-from typing import Dict, Optional, List, cast
-from copy import deepcopy
 
 import pytz
-from eve.utils import str_to_date
+from copy import deepcopy
+from typing import Dict, Optional, List, cast
 
 from superdesk import get_resource_service
 
-from planning.types import Event, EmbeddedPlanningDict, StringFieldTranslation
-from planning.common import get_config_event_fields_to_sync_with_planning
-from planning.content_profiles.utils import AllContentProfileData
+from planning.utils import str_to_date
 from planning.utils import get_related_planning_for_events
+from planning.content_profiles.utils import AllContentProfileData
+from planning.common import get_config_event_fields_to_sync_with_planning
+from planning.types import Event, EmbeddedPlanningDict, StringFieldTranslation
 from planning.types.event import EmbeddedPlanning as EmbeddedPlanningModel, EventResourceModel
 
 from .common import VocabsSyncData, SyncItemData, SyncData
@@ -64,6 +64,7 @@ def sync_event_metadata_with_planning_items(
 
     if isinstance(event_updated["dates"]["start"], str):
         event_updated["dates"]["start"] = str_to_date(event_updated["dates"]["start"])
+
     if event_updated["dates"]["start"].tzinfo is None:
         event_updated["dates"]["start"] = event_updated["dates"]["start"].replace(tzinfo=pytz.utc)