From d57586c76b22e9d57b56e9abf831cb49e4e570db Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 4 Feb 2020 16:47:26 +0100
Subject: [PATCH] added mapping for avalon -> ftrack id if ftrackId is not in
 entity's data

---
 pype/ftrack/actions/action_delete_asset.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pype/ftrack/actions/action_delete_asset.py b/pype/ftrack/actions/action_delete_asset.py
index 5d177748cd..fc9e66e4f8 100644
--- a/pype/ftrack/actions/action_delete_asset.py
+++ b/pype/ftrack/actions/action_delete_asset.py
@@ -129,6 +129,7 @@ class DeleteAssetSubset(BaseAction):
             "type": "asset",
             "data.ftrackId": {"$in": ftrack_ids}
         }))
+        found_without_ftrack_id = {}
         if len(selected_av_entities) != len(ftrack_ids):
             found_ftrack_ids = [
                 ent["data"]["ftrackId"] for ent in selected_av_entities
@@ -156,6 +157,7 @@ class DeleteAssetSubset(BaseAction):
                     # with same name does not match same ftrack id?
                     if "ftrackId" not in av_ent["data"]:
                         selected_av_entities.append(av_ent)
+                        found_without_ftrack_id[str(av_ent["_id"])] = ftrack_id
                         break
 
         if not selected_av_entities:
@@ -186,7 +188,8 @@ class DeleteAssetSubset(BaseAction):
             "created_at": datetime.now(),
             "project_name": project_name,
             "subset_ids_by_name": {},
-            "subset_ids_by_parent": {}
+            "subset_ids_by_parent": {},
+            "without_ftrack_id": found_without_ftrack_id
         }
 
         id_item = {
@@ -444,14 +447,21 @@ class DeleteAssetSubset(BaseAction):
         asset_ids_to_archive = []
         ftrack_ids_to_delete = []
         if len(assets_to_delete) > 0:
+            map_av_ftrack_id = spec_data["without_ftrack_id"]
             # Prepare data when deleting whole avalon asset
             avalon_assets = self.dbcon.find({"type": "asset"})
             avalon_assets_by_parent = collections.defaultdict(list)
             for asset in avalon_assets:
+                asset_id = asset["_id"]
                 parent_id = asset["data"]["visualParent"]
                 avalon_assets_by_parent[parent_id].append(asset)
-                if asset["_id"] in assets_to_delete:
-                    ftrack_id = asset["data"]["ftrackId"]
+                if asset_id in assets_to_delete:
+                    ftrack_id = map_av_ftrack_id.get(str(asset_id))
+                    if not ftrack_id:
+                        ftrack_id = asset["data"].get("ftrackId")
+
+                    if not ftrack_id:
+                        continue
                     ftrack_ids_to_delete.append(ftrack_id)
 
             children_queue = Queue()