ФУНКЦИИ - МЕЖПРОЕКТНАЯ КОММУНИКАЦИЯ: blob-дедупликация файлов

plane-src/apps/api/plane/space/views/asset.py

@@ -15,9 +15,9 @@ from rest_framework import status
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.response import Response
 
-from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
 from plane.db.models import DeployBoard, FileAsset
 from plane.settings.storage import S3Storage
+from plane.utils.file_dedup import UploadedObjectMissing, confirm_uploaded_file_asset, release_file_asset_blob
 
 # Module imports
 from .base import BaseAPIView
@@ -141,16 +141,17 @@ class EntityAssetEndpoint(BaseAPIView):
 
         # get the asset id
         asset = FileAsset.objects.get(id=pk, workspace=deploy_board.workspace)
-        # get the storage metadata
-        asset.is_uploaded = True
-        # get the storage metadata
-        if not asset.storage_metadata:
-            get_asset_object_metadata.delay(str(asset.id))
-
-        # update the attributes
-        asset.attributes = request.data.get("attributes", asset.attributes)
-        # save the asset
-        asset.save(update_fields=["attributes", "is_uploaded"])
+        try:
+            confirm_uploaded_file_asset(
+                asset,
+                request=request,
+                attributes=request.data.get("attributes", asset.attributes),
+            )
+        except UploadedObjectMissing:
+            return Response(
+                {"error": "The uploaded asset object was not found.", "status": False},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, anchor, pk):
@@ -161,11 +162,13 @@ class EntityAssetEndpoint(BaseAPIView):
             return Response({"error": "Project is not published"}, status=status.HTTP_404_NOT_FOUND)
         # Get the asset
         asset = FileAsset.objects.get(id=pk, workspace=deploy_board.workspace, project_id=deploy_board.project_id)
+        if not asset.is_uploaded:
+            release_file_asset_blob(asset, request=request, delete_untracked_object=True)
         # Check deleted assets
         asset.is_deleted = True
         asset.deleted_at = timezone.now()
         # Save the asset
-        asset.save(update_fields=["is_deleted", "deleted_at"])
+        asset.save(update_fields=["is_deleted", "deleted_at", "updated_at"])
         return Response(status=status.HTTP_204_NO_CONTENT)