[STT-6] Feature(backend): Support linking multiple Events into a Plan…

…ning item (#1991) * Update planning resource * Update types and add utils * Update Events resource * Update Assignments resource * Update item locks * Update ProdAPI * Update json_planning formatter * Update flag_expired command * Update search * New command to replace depreacted event_item attribute * Update planning article export * Fix/add feature tests
superdesk · Jun 5, 2024 · ed7c3f3 · ed7c3f3
1 parent 65b8c35
commit ed7c3f3
Show file tree

Hide file tree

Showing 76 changed files with 2,126 additions and 992 deletions.
diff --git a/server/features/assignments_delete.feature b/server/features/assignments_delete.feature
@@ -291,7 +291,9 @@ Feature: Assignments Delete
                 },
                 "workflow_status": "active"
             }],
-            "event_item": "#events._id#"
+            "related_events": [
+                {"_id": "#events._id#", "link_type": "primary"}
+            ]
         }
         """
         Then we get OK response
@@ -347,7 +349,11 @@ Feature: Assignments Delete
                 },
                 "workflow_status": "active"
             }],
-            "event_item": "#EVENT2._id#",
+            "related_events": [{
+                "_id": "#EVENT2._id#",
+                "link_type": "primary",
+                "recurrence_id": "#EVENT2.recurrence_id#"
+            }],
             "recurrence_id": "#EVENT2.recurrence_id#"
         }
         """

diff --git a/server/features/assignments_lock.feature b/server/features/assignments_lock.feature
@@ -6,6 +6,7 @@ Feature: Assignments Locking
         """
         [{
             "_id": "a123",
+            "planning_item": "plan1",
             "planning": {
                 "ednote": "test coverage, I want 250 words",
                 "headline": "test headline",
@@ -34,6 +35,7 @@ Feature: Assignments Locking
         """
         [{
             "_id": "a123",
+            "planning_item": "plan1",
             "planning": {
                 "ednote": "test coverage, I want 250 words",
                 "headline": "test headline",
@@ -148,6 +150,7 @@ Feature: Assignments Locking
         """
         [{
             "_id": "a123",
+            "planning_item": "plan1",
             "planning": {
                 "ednote": "test coverage, I want 250 words",
                 "headline": "test headline",

diff --git a/server/features/assignments_revert.feature b/server/features/assignments_revert.feature
@@ -11,6 +11,7 @@ Feature: Assignment Revert
     """
     [{
         "_id": "aaaaaaaaaaaaaaaaaaaaaaaa",
+        "planning_item": "plan1",
         "planning": {
             "ednote": "test coverage, I want 250 words",
             "headline": "test headline",
@@ -78,6 +79,7 @@ Feature: Assignment Revert
     """
     [{
         "_id": "aaaaaaaaaaaaaaaaaaaaaaaa",
+        "planning_item": "plan1",
         "planning": {
             "ednote": "test coverage, I want 250 words",
             "headline": "test headline",
@@ -114,6 +116,7 @@ Feature: Assignment Revert
     """
     [{
         "_id": "aaaaaaaaaaaaaaaaaaaaaaaa",
+        "planning_item": "plan1",
         "planning": {
             "ednote": "test coverage, I want 250 words",
             "headline": "test headline",

diff --git a/server/features/combined_export.feature b/server/features/combined_export.feature
@@ -58,7 +58,9 @@ Feature: Export combined Planning and Event items with default template
             "headline": "Planning 1",
             "slugline": "planning-1",
             "description_text": "desc",
-            "event_item": "#events._id#",
+            "related_events": [
+                {"_id": "#events._id#", "link_type": "primary"}
+            ],
             "ednote": "Ed. note 1",
             "coverages": [{
                 "coverage_id": "123",

diff --git a/server/features/event_embedded_planning.feature b/server/features/event_embedded_planning.feature
@@ -43,7 +43,9 @@ Feature: Event Embedded Planning
             "original_creator": "#CONTEXT_USER_ID#",
             "firstcreated": "__now__",
             "versioncreated": "__now__",
-            "event_item": "event1",
+            "related_events": [
+                {"_id": "event1", "link_type": "primary"}
+            ],
             "planning_date": "2029-11-21T12:00:00+0000",
             "coverages": [{
                 "coverage_id": "__any_value__",
@@ -381,7 +383,9 @@ Feature: Event Embedded Planning
         Then we get list with 1 items
         """
         {"_items": [{
-            "event_item": "event1",
+            "related_events": [
+                {"_id": "event1", "link_type": "primary"}
+            ],
             "slugline": "__no_value__",
             "coverages": [{
                 "planning": {

diff --git a/server/features/events.feature b/server/features/events.feature
@@ -677,7 +677,7 @@ Feature: Events
         When we get "/planning/plan1"
         Then we get existing resource
         """
-        {"event_item": "#events._id#"}
+        {"related_events": [{"_id": "#events._id#", "link_type": "primary"}]}
         """
         And we get notifications
         """
@@ -711,7 +711,9 @@ Feature: Events
                     "operation": "create_event",
                     "planning_id": "#planning._id#",
                     "update": {
-                        "event_item": "#events._id#"
+                        "related_events": [
+                            {"_id": "#events._id#", "link_type": "primary"}
+                        ]
                     }
                 }]
             }
@@ -1135,7 +1137,7 @@ Feature: Events
         When we get "/planning/#planning._id#"
         Then we get existing resource
         """
-        {"event_item": "#events._id#"}
+        {"related_events": [{"_id": "#events._id#", "link_type": "primary"}]}
         """
         When we post to "/events/#events._id#/lock"
         """
@@ -1324,7 +1326,7 @@ Feature: Events
         When we get "/planning/#planning._id#"
         Then we get existing resource
         """
-        {"event_item": "#events._id#"}
+        {"related_events": [{"_id": "#events._id#", "link_type": "primary"}]}
         """
         When we post to "/events/#events._id#/lock"
         """
@@ -1465,7 +1467,9 @@ Feature: Events
                         "assigned_to": {}
                     }
                 ],
-                "event_item": "tempId-1712220681040btveuuz"
+                "related_events": [
+                    {"_id": "tempId-1712220681040btveuuz", "link_type": "primary"}
+                ]
             }
         ],
         "related_items": [
@@ -1554,7 +1558,9 @@ Feature: Events
                         "assigned_to": {}
                     }
                 ],
-                "event_item": "tempId-1712220681040btveuuz"
+                "related_events": [
+                    {"_id": "tempId-1712220681040btveuuz", "link_type": "primary"}
+                ]
             }
         ],
         "related_items": [

diff --git a/server/features/events_cancel.feature b/server/features/events_cancel.feature
@@ -164,15 +164,15 @@ Feature: Events Cancel
             "_id": "plan1",
             "guid": "plan1",
             "slugline": "TestPlan 1",
-            "event_item": "event1",
+            "related_events": [{"_id": "event1", "link_type": "primary"}],
             "state": "draft",
             "planning_date": "2016-01-02"
         },
         {
             "_id": "plan2",
             "guid": "plan2",
             "slugline": "TestPlan 2",
-            "event_item": "event1",
+            "related_events": [{"_id": "event1", "link_type": "primary"}],
             "state": "draft",
             "planning_date": "2016-01-02"
         }]
@@ -311,7 +311,7 @@ Feature: Events Cancel
         [{
             "slugline": "Weekly Meetings",
             "headline": "Friday Club",
-            "event_item": "#EVENT3._id#",
+            "related_events": [{"_id": "#EVENT3._id#", "link_type": "primary"}],
             "planning_date": "2016-01-02"
         }]
         """
@@ -349,6 +349,7 @@ Feature: Events Cancel
         """
         [{
             "_id": "aaaaaaaaaaaaaaaaaaaaaaaa",
+            "planning_item": "plan1",
             "planning": {
                 "ednote": "test coverage, I want 250 words",
                 "headline": "test headline",
@@ -392,7 +393,9 @@ Feature: Events Cancel
             "_id": "plan1",
             "guid": "plan1",
             "slugline": "TestPlan 1",
-            "event_item": "event1",
+            "related_events": [
+                {"_id": "event1", "link_type": "primary"}
+            ],
             "ednote": "We're covering this Event",
             "state": "draft",
             "coverages": [{
@@ -866,7 +869,9 @@ Feature: Events Cancel
         [{
             "slugline": "Weekly Meetings",
             "headline": "Friday Club",
-            "event_item": "#EVENT3._id#",
+            "related_events": [
+                {"_id": "#EVENT3._id#", "link_type": "primary"}
+            ],
             "planning_date": "2016-01-02"
         }]
         """
@@ -895,3 +900,48 @@ Feature: Events Cancel
             { "_id": "#EVENT4._id#", "state": "cancelled" }
         ]}
         """
+
+    @auth
+    @vocabulary
+    Scenario: Cancelling an Event does not cancel Planning item with secondary link
+        Given we have sessions "/sessions"
+        And "events"
+        """
+        [{
+            "guid": "event1",
+            "name": "Event1",
+            "dates": {
+                "start": "2029-05-29T12:00:00+0000",
+                "end": "2029-05-29T14:00:00+0000",
+                "tz": "Australia/Sydney"
+            },
+            "lock_user": "#CONTEXT_USER_ID#",
+            "lock_session": "#SESSION_ID#",
+            "lock_action": "cancel",
+            "lock_time": "#DATE#"
+        }]
+        """
+        And "planning"
+        """
+        [{
+            "guid": "plan1",
+            "slugline": "test-plan",
+            "planning_date": "2029-05-29T12:00:00+0000",
+            "related_events": [{"_id": "event1", "link_type": "primary"}]
+        }, {
+            "guid": "plan2",
+            "slugline": "test-plan",
+            "planning_date": "2029-05-29T12:00:00+0000",
+            "related_events": [{"_id": "event1", "link_type": "secondary"}]
+        }]
+        """
+        When we perform cancel on events "event1"
+        Then we get OK response
+        When we get "/planning"
+        Then we get list with 2 items
+        """
+        {"_items": [
+            {"_id": "plan1", "state": "cancelled"},
+            {"_id": "plan2", "state": "draft"}
+        ]}
+        """
diff --git a/server/features/events_lock.feature b/server/features/events_lock.feature
@@ -101,7 +101,7 @@ Feature: Events Locking
         """
         [{
             "slugline": "TestPlan",
-            "event_item": "123",
+            "related_events": [{"_id": "123", "link_type": "primary"}],
             "planning_date": "2016-01-02"
         }]
         """
@@ -113,7 +113,7 @@ Feature: Events Locking
         """
         {
           "slugline": "TestPlan",
-          "event_item": "123",
+          "related_events": [{"_id": "123", "link_type": "primary"}],
           "lock_user": "#CONTEXT_USER_ID#"
         }
 
@@ -236,7 +236,7 @@ Feature: Events Locking
             {
                 "item_class": "item class value",
                 "headline": "test headline",
-                "event_item": "#EVENT3._id#",
+                "related_events": [{"_id": "#EVENT3._id#", "link_type": "primary"}],
                 "planning_date": "2016-01-02"
             }
         ]
@@ -251,7 +251,7 @@ Feature: Events Locking
         {
           "item_class": "item class value",
           "headline": "test headline",
-          "event_item": "#EVENT3._id#",
+          "related_events": [{"_id": "#EVENT3._id#", "link_type": "primary"}],
           "lock_user": "#CONTEXT_USER_ID#"
         }
         """