Merge branch 'master' of https://gitea.nxsir.cn/nanxun/IM_NEW

FileService.Application/UploadFile/FileResponse.cs

@@ -19,6 +19,6 @@ namespace FileService.Application.UploadFile
         public StorageLocation StorageLocation { get; set; }
         public CheckSum CheckSum { get; set; }
         public DateTimeOffset Created { get; set; }
-        public DateTimeOffset Updated { get; set;
+        public DateTimeOffset Updated { get; set; }
     }
 }

FileService.Application/UploadFileTask/UploadFileTaskService.cs

@@ -44,6 +44,8 @@ namespace FileService.Application.UploadFileTask
 
             var res = mapper.Map<TaskInitResponse>(initRes);
             res.TaskId = task.Id;
+
+            task.StartUpload();
             reposity.Create(task);
 
             await redis.SetAsync(new StorageContracts.UploadRuntimeCache(
@@ -83,9 +85,31 @@ namespace FileService.Application.UploadFileTask
             return Result.Success(presignUrl);
         }
 
-        //public async Task<Result<UploadTaskResponse>> CompleteTaskAsync()
-        //{
-        //    var taskCache = await redis.GetAsync()
-        //}
+        public async Task<Result<UploadTaskResponse>> CompleteTaskAsync(UploadTaskCompleteCommand command, CancellationToken cancellationToken = default)
+        {
+            var taskCache = await redis.GetAsync(command.UploadSessionId);
+
+            if(taskCache is null)
+            {
+                return Result.Fail<UploadTaskResponse>(ResultCode.CHUNK_NOT_FOUND);
+            }
+
+            var task = await reposity.FindByIdAsync(Guid.Parse(taskCache.TaskId));
+            var res = await storage.CompleteUploadAsync(new CompleteUploadCommand(
+                ProviderCode: taskCache.ProviderCode,
+                Bucket: taskCache.Bucket,
+                Region: taskCache.Region,
+                ObjectKey: taskCache.ObjectKey,
+                UploadSessionId: taskCache.UploadSessionId,
+                Parts: command.Parts
+                ), cancellationToken);
+
+            task.CompleteUpload(new Domain.ValueObjects.StorageLocation(
+                    taskCache.ProviderCode, taskCache.Bucket,
+                    taskCache.ObjectKey, taskCache.Region
+                ));
+
+            return Result.Success(mapper.Map<UploadTaskResponse>(task));
+        }
     }
 }

FileService.Application/UploadFileTask/UploadTaskCompleteCommand.cs

@@ -1,4 +1,5 @@
-using System;
+using FileService.Application.StorageContracts;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,5 +7,5 @@ using System.Threading.Tasks;
 
 namespace FileService.Application.UploadFileTask
 {
-    public record UploadTaskCompleteCommand(string UploadSessionId, Guid userId,);
+    public record UploadTaskCompleteCommand(string UploadSessionId, Guid userId, IReadOnlyList<UploadPart> Parts);
 }