Refactoring asset storage

Author: usercode

src/DragonFly.API.Core/ClientAPI/AssetApiStorage.cs

@@ -30,9 +30,9 @@ public async Task<Result<QueryResult<Asset>>> QueryAsync(AssetQuery assetQuery)
         return result.ToResult(x => x.Convert(e => e.ToModel()));
     }
 
-    public async Task<Result> UploadAsync(Asset asset, string mimetype, Stream stream)
+    public async Task<Result> UploadAsync(Guid assetId, string mimetype, Stream stream)
     {
-        HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, $"api/asset/{asset.Id}/upload");
+        HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, $"api/asset/{assetId}/upload");
         requestMessage.Content = new StreamContent(stream);
         requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue(mimetype);
 

src/DragonFly.API/Rest/AssetApiExtensions.cs

@@ -123,7 +123,7 @@ private static async Task<IResult> MapUpload(HttpContext context, IAssetStorage
             return TypedResults.NotFound();
         }
 
-        return (await storage.UploadAsync(asset, context.Request.ContentType, context.Request.Body)).ToHttpResult();
+        return (await storage.UploadAsync(asset.Id, context.Request.ContentType, context.Request.Body)).ToHttpResult();
     }
 
     private static async Task<IResult> MapRefreshMetadata(IAssetStorage storage, Guid id)

src/DragonFly.AspNetCore/Permissions/Storages/AssetPermissionStorage.cs

@@ -76,8 +76,8 @@ public async Task<Result> UpdateAsync(Asset asset)
         return await Api.AuthorizeAsync(PrincipalContext.Current, AssetPermissions.UpdateAsset).ThenAsync(x => Storage.UpdateAsync(asset));
     }
 
-    public async Task<Result> UploadAsync(Asset asset, string mimetype, Stream stream)
+    public async Task<Result> UploadAsync(Guid assetId, string mimetype, Stream stream)
     {
-        return await Api.AuthorizeAsync(PrincipalContext.Current, AssetPermissions.UploadAsset).ThenAsync(x => Storage.UploadAsync(asset, mimetype, stream));
+        return await Api.AuthorizeAsync(PrincipalContext.Current, AssetPermissions.UploadAsset).ThenAsync(x => Storage.UploadAsync(assetId, mimetype, stream));
     }
 }

src/DragonFly.Client/Pages/Assets/AssetDetail.razor

@@ -139,7 +139,7 @@
                                         </div>
                                         @if (Entity.Hash != null)
                                         {
-                                            <div style="margin: 1rem 0;">
+                                            <div class="image-preview">
                                                 @AssetPreviewManager.CreateComponent(Entity)
                                             </div>
                                         }

src/DragonFly.Client/Pages/Assets/AssetDetail.razor.cs

@@ -105,7 +105,7 @@ protected async Task OnInputFileChange(InputFileChangeEventArgs e)
 
         using (Stream stream = SelectedFile.OpenReadStream(long.MaxValue))
         {
-            await AssetService.UploadAsync(Entity, SelectedFile.ContentType, stream);
+            await AssetService.UploadAsync(Entity.Id, SelectedFile.ContentType, stream);
         }
 
         await RefreshAsync();

src/DragonFly.Client/Pages/Assets/AssetDetail.razor.css

@@ -0,0 +1,5 @@
+.image-preview {
+    margin: 1rem 0;
+    display: flex;
+    justify-content: center;
+}

src/DragonFly.Client/Shared/AssetSelector.razor

@@ -39,7 +39,7 @@
 
     @if (Asset != null && ShowPreview)
     {
-        <div class="image" style="margin: 1rem 0;">
+        <div class="image-preview">
             @if (string.IsNullOrEmpty(Asset.PreviewUrl) == false)
             {
                 @if (Asset.IsSVG())

src/DragonFly.Client/Shared/AssetSelector.razor.css

@@ -5,7 +5,7 @@
     height: 150px;
 }
 
-.image {
+.image-preview {
     margin: 1rem 0;
     display: flex;
     justify-content: center;

src/DragonFly.Core/Modules/Assets/IAssetStorage.cs

@@ -23,7 +23,7 @@ public interface IAssetStorage
 
     Task<Result> PublishAsync(Asset asset);
 
-    Task<Result> UploadAsync(Asset asset, string mimetype, Stream stream);
+    Task<Result> UploadAsync(Guid assetId, string mimetype, Stream stream);
 
     Task<Result<Stream>> GetStreamAsync(Asset asset);
 

src/DragonFly.MongoDB/Storages/AssetMongoStorage.cs

@@ -128,19 +128,21 @@ await Assets.UpdateOneAsync(
         return Result.Ok();
     }
 
-    public async Task<Result> UploadAsync(Asset asset, string mimetype, Stream stream)
+    public async Task<Result> UploadAsync(Guid assetId, string mimetype, Stream stream)
     {        
         //upload new stream to asset
-        await AssetData.UploadFromStreamAsync(asset.Id.ToString(), stream);
+        await AssetData.UploadFromStreamAsync(assetId.ToString(), stream);
+
+        Asset? asset = null;
 
         //refresh asset info
-        using (Stream s = await AssetData.OpenDownloadStreamByNameAsync(asset.Id.ToString()))
+        using (Stream s = await AssetData.OpenDownloadStreamByNameAsync(assetId.ToString()))
         {
             byte[] hash = await SHA256.HashDataAsync(s);
 
             string hashString = Convert.ToHexString(hash).ToLowerInvariant();
 
-            var mongoAsset = await Assets.FindOneAndUpdateAsync(Builders<MongoAsset>.Filter.Eq(x => x.Id, asset.Id),
+            var mongoAsset = await Assets.FindOneAndUpdateAsync(Builders<MongoAsset>.Filter.Eq(x => x.Id, assetId),
                                         Builders<MongoAsset>.Update
                                                     .Set(x => x.Size, s.Length)
                                                     .Set(x => x.Hash, hashString)