add new params and handle the case to prevent planning from publish

superdesk · Sep 8, 2023 · a127146 · a127146
1 parent f4d26bb
commit a127146
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/client/api/editor/item_events.ts b/client/api/editor/item_events.ts
@@ -137,6 +137,10 @@ export function getEventsInstance(type: EDITOR_TYPE): IEditorAPI['item']['events
             return;
         }
 
+        if (updates && original?.version == original?.posted_version) {
+            original['version'] = original?.version ? original['version'] + 1 : 1;
+        }
+
         plans[index] = {
             ...original,
             ...updates,

diff --git a/client/interfaces.ts b/client/interfaces.ts
@@ -706,6 +706,8 @@ export interface IPlanningItem extends IBaseRestApiResponse {
     reason: string;
     _time_to_be_confirmed: boolean;
     _cancelAllCoverage: boolean;
+    version:number;
+    posted_version:number;
 
     // Used when showing Associated Planning item for Events
     _agendas: Array<IAgenda>;

diff --git a/server/planning/events/events_post.py b/server/planning/events/events_post.py
@@ -215,8 +215,9 @@ def post_related_plannings(self, plannings, new_post_state):
                         "etag": planning.get("etag"),
                         "pubstatus": POST_STATE.USABLE,
                     }
-                    for planning in plannings
+                    for planning in plannings if planning.get("version") != planning.get("posted_version")
                 ]
+            if len(docs) > 0:
                 planning_post_service.post(docs)
             return
         for planning in plannings:

diff --git a/server/planning/planning/planning.py b/server/planning/planning/planning.py
@@ -1653,6 +1653,9 @@ def duplicate_xmp_file(self, coverage):
     TO_BE_CONFIRMED_FIELD: TO_BE_CONFIRMED_FIELD_SCHEMA,
     "_type": {"type": "string", "mapping": None},
     "extra": metadata_schema["extra"],
+    # Added fields for post planning item with events
+    "posted_version" : {"type": "number", "nullable": False},
+    "version" : {"type": "number", "default": 1},
 }  # end planning_schema
 
 

diff --git a/server/planning/planning/planning_post.py b/server/planning/planning/planning_post.py
@@ -125,6 +125,7 @@ def post_planning(self, plan, new_post_state, assignments_to_delete):
         updates = {
             "state": get_item_post_state(plan, new_post_state),
             "pubstatus": new_post_state,
+            "posted_version": plan.get("version")
         }
         if updates["state"] in [WORKFLOW_STATE.SCHEDULED, WORKFLOW_STATE.KILLED]:
             updates["state_reason"] = None