Fix publish

dandiapi/api/models/asset.py

@@ -148,41 +148,28 @@ def _populate_metadata(self):
             )
         return metadata
 
-    @classmethod
-    def published_asset(cls, asset: Asset):
-        """
-        Generate a published asset + metadata without saving it.
-
-        This is useful to validate asset metadata without saving it.
-        """
+    def published_metadata(self):
+        """Generate the metadata of this asset as if it were being published."""
         now = datetime.datetime.utcnow()
         # Inject the publishedBy and datePublished fields
         published_metadata, _ = AssetMetadata.objects.get_or_create(
             metadata={
-                **asset.metadata.metadata,
-                'publishedBy': asset.metadata.published_by(now),
+                **self.metadata.metadata,
+                'publishedBy': self.metadata.published_by(now),
                 'datePublished': now.isoformat(),
             },
         )
+        return published_metadata
 
-        # Create the published model
-        published_asset = Asset(
-            path=asset.path,
-            blob=asset.blob,
-            metadata=published_metadata,
-            # If we're publishing, just assume that the asset was valid
-            status=Asset.Status.VALID,
-            previous=asset,
-            published=True,
-        )
-
-        # Recompute the metadata
-        published_metadata, _ = AssetMetadata.objects.get_or_create(
-            metadata=published_asset._populate_metadata(),
-        )
-        published_asset.metadata = published_metadata
+    def publish(self):
+        """
+        Modify the metadata of this asset as if it were being published.
 
-        return published_asset
+        This is useful to validate asset metadata without saving it.
+        To actually publish this Asset, simply save() after calling publish().
+        """
+        self.metadata = self.published_metadata()
+        self.published = True
 
     def save(self, *args, **kwargs):
         metadata = self._populate_metadata()

dandiapi/api/tasks.py

@@ -93,8 +93,7 @@ def validate_asset_metadata(asset_id: int) -> None:
     asset.save()
 
     try:
-        publish_asset = Asset.published_asset(asset)
-        metadata = publish_asset.metadata.metadata
+        metadata = asset.published_metadata().metadata
         validate(metadata, schema_key='PublishedAsset')
     except Exception as e:
         logger.error('Error while validating asset %s', asset_id)

dandiapi/api/views/version.py

@@ -141,14 +141,12 @@ def publish(self, request, **kwargs):
         from dandiapi.api.models import Asset
 
         draft_assets = old_version.assets.filter(published=False).all()
-        new_published_assets = [Asset.published_asset(draft_asset) for draft_asset in draft_assets]
-        Asset.objects.bulk_create(new_published_assets)
+        for draft_asset in draft_assets:
+            draft_asset.publish()
+        Asset.objects.bulk_update(draft_assets, ['metadata', 'published'])
 
         AssetVersions.objects.bulk_create(
-            [
-                AssetVersions(asset_id=asset.id, version_id=new_version.id)
-                for asset in new_published_assets
-            ]
+            [AssetVersions(asset_id=asset.id, version_id=new_version.id) for asset in draft_assets]
         )
 
         # Save again to recompute metadata, specifically assetsSummary