Skip to content

Commit

Permalink
fix error when ingesting cancelled event with assignments
Browse files Browse the repository at this point in the history
STTNHUB-361
  • Loading branch information
petrjasek committed Sep 17, 2024
1 parent ae9e2bd commit 7104574
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion server/planning/assignments/assignments.py
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ def on_delete(self, doc):
"""
Validate that we have a lock on the Assignment and it's associated Planning item
"""
if doc.get("_to_delete") is True:
if doc.get("_to_delete") is True or not request:
# Already marked for delete - no validation needed (could be the background job)
return

Expand Down
35 changes: 18 additions & 17 deletions server/planning/planning/planning.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import logging
from datetime import datetime

from flask import json, current_app as app
from flask import json, current_app as app, request
from eve.methods.common import resolve_document_etag

import superdesk
Expand Down Expand Up @@ -1274,23 +1274,24 @@ def delete_assignments_for_coverages(self, coverages, notify=True):
if original_assigment:
assignment_service.system_update(ObjectId(assign_id), {"_to_delete": True}, original_assigment)

session_id = get_auth().get("_id")
user_id = get_user().get(config.ID_FIELD)
if len(deleted_assignments) > 0:
push_notification(
"assignments:delete",
items=deleted_assignments,
session=session_id,
user=user_id,
)
if request:
session_id = get_auth().get("_id")
user_id = get_user().get(config.ID_FIELD)
if len(deleted_assignments) > 0:
push_notification(
"assignments:delete",
items=deleted_assignments,
session=session_id,
user=user_id,
)

if len(failed_assignments) > 0 and notify:
push_notification(
"assignments:delete:fail",
items=failed_assignments,
session=session_id,
user=user_id,
)
if len(failed_assignments) > 0 and notify:
push_notification(
"assignments:delete:fail",
items=failed_assignments,
session=session_id,
user=user_id,
)

def get_expired_items(self, expiry_datetime, spiked_planning_only=False):
"""Get the expired items
Expand Down

0 comments on commit 7104574

Please sign in to comment.