debug DIRT migration

Author: wpbonelli

plantit/plantit/celery_tasks.py

@@ -1133,6 +1133,7 @@ def start_dirt_migration(self, username: str):
     for file in image_files:
         # get file entity ID given root image file ID
         file_entity_id = mig.get_file_entity_id(file.id)
+        file.entity_id = file_entity_id
 
         # if no corresponding file entity for this managed file, skip it
         if file_entity_id is None:
@@ -1206,6 +1207,8 @@ def start_dirt_migration(self, username: str):
                                               orphan=file.orphan,
                                               missing=file.missing,
                                               uploaded=file.uploaded,
+                                              entity_id=file.file_entity_id,
+                                              collection_entity_id=file.collection_entity_id,
                                               nfs_path=join(rootnfs_dir, 'root-images', file.folder, file.name),
                                               staging_path=join(staging_dir, file.name))
     for file in metadata_files:

plantit/plantit/migration.py

@@ -71,8 +71,8 @@ class ManagedFile(NamedTuple):
     orphan: bool
     missing: bool
     uploaded: Optional[str]
-    entity_id: str
-    collection_entity_id: str
+    entity_id: Optional[str]
+    collection_entity_id: Optional[str]
 
 
 def row_to_managed_file(row):
@@ -94,7 +94,7 @@ def row_to_managed_file(row):
         return ManagedFile(
             id=fid,
             name=name,
-            path=path.replace('public://', ''),
+            nfs_path=path.replace('public://', ''),
             type='metadata',
             folder=path.rpartition('metadata-files')[2].replace(name, '').replace('/', ''),
             orphan=False,
@@ -105,7 +105,7 @@ def row_to_managed_file(row):
         return ManagedFile(
             id=fid,
             name=name,
-            path=path.replace('public://', ''),
+            nfs_path=path.replace('public://', ''),
             type='output',
             folder=folder,
             orphan=False,
@@ -115,7 +115,7 @@ def row_to_managed_file(row):
         return ManagedFile(
             id=fid,
             name=name,
-            path=path.replace('public://', ''),
+            nfs_path=path.replace('public://', ''),
             type='logs',
             folder=path.rpartition('output-logs')[2].replace(name, '').replace('/', ''),
             orphan=False,