Transferhistory updates

src/apps/Odin.Hosting/Cli/CommandLine.cs

@@ -3,6 +3,7 @@
 using System.Net.Sockets;
 using Odin.Core.Configuration;
 using Odin.Core.Storage.SQLite.Migrations;
+using Odin.Core.Storage.SQLite.Migrations.TransferHistory;
 
 namespace Odin.Hosting.Cli;
 
@@ -180,6 +181,25 @@ public static (bool didHandle, int exitCode) HandleCommandLineArgs(string[] args
         //     return (true, 0);
         // }
 
+        //
+        // Command line: convert header files to database
+        //
+        // examples:
+        //
+        //   dotnet run -- --header2database
+        //
+        //   Note: arg[1] is path to registrations root (i.e. /identity-host/data/tenants)
+        //   ASPNETCORE_ENVIRONMENT=Production ./Odin.Hosting --localapptags /identity-host/data/tenants  
+        //
+        //    launchSettings.json :"commandLineArgs": "--transferhistory /Users/taud/tmp/dotyou/tenants/"
+        //
+
+        if (args.Length == 2 && args[0] == "--transferhistory")
+        {
+            TransferHistoryMigration.Execute(args[1]);
+            return (true, 0);
+        }
+
         return (false, 0);
     }
 }

src/apps/Odin.Hosting/Controllers/Base/Drive/DriveStorageControllerBase.cs

@@ -83,6 +83,22 @@ protected async Task<IActionResult> GetFileHeaderByGlobalTransitId(GlobalTransit
             return new JsonResult(result);
         }
 
+        protected async Task<FileTransferHistoryResponse> GetFileTransferHistory(ExternalFileIdentifier file)
+        {
+            var storage = GetHttpFileSystemResolver().ResolveFileSystem().Storage;
+            var (count, history) = await storage.GetTransferHistory(this.MapToInternalFile(file), WebOdinContext);
+            if (history == null)
+            {
+                return null;
+            }
+
+            return new FileTransferHistoryResponse()
+            {
+                OriginalRecipientCount = count,
+                History = history
+            };
+        }
+
         /// <summary>
         /// Returns the payload for a given file
         /// </summary>
@@ -195,7 +211,8 @@ protected async Task<SendReadReceiptResult> SendReadReceipt(SendReadReceiptReque
             }
 
             var internalFiles = request.Files.Select(MapToInternalFile).ToList();
-            return await peerOutgoingTransferService.SendReadReceipt(internalFiles, WebOdinContext, this.GetHttpFileSystemResolver().GetFileSystemType());
+            return await peerOutgoingTransferService.SendReadReceipt(internalFiles, WebOdinContext,
+                this.GetHttpFileSystemResolver().GetFileSystemType());
         }
 
         /// <summary>
@@ -396,4 +413,4 @@ private async Task<DeleteFileResult> PerformFileDelete(DeleteFileRequest request
             return result;
         }
     }
-}
+}

src/apps/Odin.Hosting/Controllers/Base/Drive/FileTransferHistoryResponse.cs

@@ -0,0 +1,17 @@
+using System.Linq;
+using Odin.Core;
+using Odin.Core.Identity;
+using Odin.Services.Drives.DriveCore.Storage;
+
+namespace Odin.Hosting.Controllers.Base.Drive;
+
+public class FileTransferHistoryResponse
+{
+    public int OriginalRecipientCount { get; set; }
+    public PagedResult<RecipientTransferHistoryItem> History { get; set; }
+
+    public RecipientTransferHistoryItem GetHistoryItem(OdinId recipient)
+    {
+        return this.History?.Results.SingleOrDefault(h => h.Recipient == recipient);
+    }
+}

src/apps/Odin.Hosting/Controllers/ClientToken/Shared/Drive/AppClientTokenDriveStorageController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -54,15 +55,36 @@ public async Task<IActionResult> GetFileHeaderAsGetRequest([FromQuery] Guid file
                 });
         }
 
+        [HttpGet("files/transfer-history")]
+        public async Task<FileTransferHistoryResponse> GetFileTransferHistory([FromQuery] Guid fileId, [FromQuery] Guid alias,
+            [FromQuery] Guid type)
+        {
+            var result = await base.GetFileTransferHistory(new ExternalFileIdentifier()
+            {
+                FileId = fileId,
+                TargetDrive = new TargetDrive()
+                {
+                    Alias = alias,
+                    Type = type
+                }
+            });
+
+            if (null == result)
+            {
+                Response.StatusCode = (int)HttpStatusCode.NotFound;
+                return null;
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// Retrieves a file's header and metadata by globalTransitId
         /// </summary>
         [HttpGet("files/header_byglobaltransitid")]
         public async Task<IActionResult> GetFileHeaderByGlobalTransitId([FromQuery] Guid globalTransitId, [FromQuery] Guid alias,
             [FromQuery] Guid type)
         {
-
-
             return await base.GetFileHeaderByGlobalTransitId(
                 new GlobalTransitIdFileIdentifier()
                 {
@@ -84,7 +106,6 @@ public async Task<IActionResult> GetFileHeaderByGlobalTransitId([FromQuery] Guid
         [HttpPost("files/payload")]
         public new async Task<IActionResult> GetPayloadStream([FromBody] GetPayloadRequest request)
         {
-
             return await base.GetPayloadStream(request);
         }
 
@@ -95,7 +116,7 @@ public async Task<IActionResult> GetPayloadAsGetRequest([FromQuery] Guid fileId,
             [FromQuery] int? chunkStart, [FromQuery] int? chunkLength)
         {
             FileChunk chunk = this.GetChunk(chunkStart, chunkLength);
-            
+
             return await base.GetPayloadStream(
                 new GetPayloadRequest()
                 {
@@ -120,7 +141,6 @@ public async Task<IActionResult> GetPayloadAsGetRequest([FromQuery] Guid fileId,
         [HttpPost("files/thumb")]
         public new async Task<IActionResult> GetThumbnail([FromBody] GetThumbnailRequest request)
         {
-
             return await base.GetThumbnail(request);
         }
 
@@ -155,31 +175,27 @@ public async Task<IActionResult> GetThumbnailAsGetRequest([FromQuery] Guid fileI
         [HttpPost("files/delete")]
         public new async Task<IActionResult> DeleteFile([FromBody] DeleteFileRequest request)
         {
-
             return await base.DeleteFile(request);
         }
 
         [SwaggerOperation(Tags = new[] { ControllerConstants.ClientTokenDrive })]
         [HttpPost("files/deletefileidbatch")]
         public new async Task<IActionResult> DeleteFileIdBatch([FromBody] DeleteFileIdBatchRequest request)
         {
-
             return await base.DeleteFileIdBatch(request);
         }
 
         [SwaggerOperation(Tags = new[] { ControllerConstants.ClientTokenDrive })]
         [HttpPost("files/deletegroupidbatch")]
         public new async Task<IActionResult> DeleteFilesByGroupIdBatch([FromBody] DeleteFilesByGroupIdBatchRequest request)
         {
-
             return await base.DeleteFilesByGroupIdBatch(request);
         }
 
         [SwaggerOperation(Tags = new[] { ControllerConstants.ClientTokenDrive })]
         [HttpPost("files/deletepayload")]
         public async Task<DeletePayloadResult> DeletePayloadC(DeletePayloadRequest request)
         {
-
             return await base.DeletePayload(request);
         }
 
@@ -190,17 +206,15 @@ public async Task<DeletePayloadResult> DeletePayloadC(DeletePayloadRequest reque
         [HttpPost("files/harddelete")]
         public async Task<IActionResult> HardDeleteFileC([FromBody] DeleteFileRequest request)
         {
-
             return await base.HardDeleteFile(request);
         }
 
         [SwaggerOperation(Tags = new[] { ControllerConstants.ClientTokenDrive })]
         [HttpPost("files/send-read-receipt")]
         public new async Task<IActionResult> SendReadReceipt(SendReadReceiptRequest request)
         {
-
             var result = await base.SendReadReceipt(request);
             return new JsonResult(result);
         }
     }
-}
+}

src/apps/Odin.Hosting/Controllers/OwnerToken/Drive/OwnerDriveStorageController.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -33,7 +34,6 @@ public class OwnerDriveStorageController(
         [HttpPost("header")]
         public new async Task<IActionResult> GetFileHeader([FromBody] ExternalFileIdentifier request)
         {
-
             return await base.GetFileHeader(request);
         }
 
@@ -43,7 +43,6 @@ public class OwnerDriveStorageController(
         [HttpGet("header")]
         public async Task<IActionResult> GetFileHeaderAsGetRequest([FromQuery] Guid fileId, [FromQuery] Guid alias, [FromQuery] Guid type)
         {
-
             return await base.GetFileHeader(
                 new ExternalFileIdentifier()
                 {
@@ -56,15 +55,36 @@ public async Task<IActionResult> GetFileHeaderAsGetRequest([FromQuery] Guid file
                 });
         }
 
+        [HttpGet("transfer-history")]
+        public async Task<FileTransferHistoryResponse> GetFileTransferHistory([FromQuery] Guid fileId, [FromQuery] Guid alias,
+            [FromQuery] Guid type)
+        {
+            var result = await base.GetFileTransferHistory(new ExternalFileIdentifier()
+            {
+                FileId = fileId,
+                TargetDrive = new TargetDrive()
+                {
+                    Alias = alias,
+                    Type = type
+                }
+            });
+
+            if (null == result)
+            {
+                Response.StatusCode = (int)HttpStatusCode.NotFound;
+                return null;
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// Retrieves a file's header and metadata by globalTransitId
         /// </summary>
         [HttpGet("header_byglobaltransitid")]
         public async Task<IActionResult> GetFileHeaderByGlobalTransitId([FromQuery] Guid globalTransitId, [FromQuery] Guid alias,
             [FromQuery] Guid type)
         {
-
-
             return await base.GetFileHeaderByGlobalTransitId(
                 new GlobalTransitIdFileIdentifier()
                 {
@@ -84,7 +104,6 @@ public async Task<IActionResult> GetFileHeaderByGlobalTransitId([FromQuery] Guid
         [HttpPost("payload")]
         public new async Task<IActionResult> GetPayloadStream([FromBody] GetPayloadRequest request)
         {
-
             return await base.GetPayloadStream(request);
         }
 
@@ -94,10 +113,11 @@ public async Task<IActionResult> GetFileHeaderByGlobalTransitId([FromQuery] Guid
         /// </summary>
         [SwaggerOperation(Tags = new[] { ControllerConstants.ClientTokenDrive })]
         [HttpGet("payload")]
-        public async Task<IActionResult> GetPayloadAsGetRequest([FromQuery] Guid fileId, [FromQuery] Guid alias, [FromQuery] Guid type, [FromQuery] string key)
+        public async Task<IActionResult> GetPayloadAsGetRequest([FromQuery] Guid fileId, [FromQuery] Guid alias, [FromQuery] Guid type,
+            [FromQuery] string key)
         {
             FileChunk chunk = this.GetChunk(null, null);
-            
+
             return await base.GetPayloadStream(
                 new GetPayloadRequest()
                 {
@@ -124,7 +144,6 @@ public async Task<IActionResult> GetPayloadAsGetRequest([FromQuery] Guid fileId,
         [HttpPost("thumb")]
         public new async Task<IActionResult> GetThumbnail([FromBody] GetThumbnailRequest request)
         {
-
             return await base.GetThumbnail(request);
         }
 
@@ -134,11 +153,11 @@ public async Task<IActionResult> GetPayloadAsGetRequest([FromQuery] Guid fileId,
         /// See GET files/header
         /// </summary>
         [HttpGet("thumb")]
-        public async Task<IActionResult> GetThumbnailAsGetRequest([FromQuery] Guid fileId, [FromQuery] string payloadKey, [FromQuery] Guid alias,
+        public async Task<IActionResult> GetThumbnailAsGetRequest([FromQuery] Guid fileId, [FromQuery] string payloadKey,
+            [FromQuery] Guid alias,
             [FromQuery] Guid type, [FromQuery] int width,
             [FromQuery] int height)
         {
-
             return await base.GetThumbnail(new GetThumbnailRequest()
             {
                 File = new ExternalFileIdentifier()
@@ -164,31 +183,27 @@ public async Task<IActionResult> GetThumbnailAsGetRequest([FromQuery] Guid fileI
         [HttpPost("delete")]
         public new async Task<IActionResult> DeleteFile([FromBody] DeleteFileRequest request)
         {
-
             return await base.DeleteFile(request);
         }
 
         [SwaggerOperation(Tags = new[] { ControllerConstants.OwnerDrive })]
         [HttpPost("deletefileidbatch")]
         public new async Task<IActionResult> DeleteFileIdBatch([FromBody] DeleteFileIdBatchRequest request)
         {
-
             return await base.DeleteFileIdBatch(request);
         }
 
         [SwaggerOperation(Tags = new[] { ControllerConstants.OwnerDrive })]
         [HttpPost("deletegroupidbatch")]
         public new async Task<IActionResult> DeleteFilesByGroupIdBatch([FromBody] DeleteFilesByGroupIdBatchRequest request)
         {
-
             return await base.DeleteFilesByGroupIdBatch(request);
         }
 
         [SwaggerOperation(Tags = new[] { ControllerConstants.OwnerDrive })]
         [HttpPost("deletepayload")]
         public async Task<DeletePayloadResult> DeletePayloadC(DeletePayloadRequest request)
         {
-
             return await base.DeletePayload(request);
         }
 
@@ -199,16 +214,14 @@ public async Task<DeletePayloadResult> DeletePayloadC(DeletePayloadRequest reque
         [HttpPost("harddelete")]
         public async Task<IActionResult> HardDeleteFileC([FromBody] DeleteFileRequest request)
         {
-
             return await base.HardDeleteFile(request);
         }
 
         [HttpPost("send-read-receipt")]
         public new async Task<IActionResult> SendReadReceipt(SendReadReceiptRequest request)
         {
-
             var result = await base.SendReadReceipt(request);
             return new JsonResult(result);
         }
     }
-}
+}

src/apps/Odin.Hosting/Properties/launchSettings.json

@@ -7,7 +7,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "commandLineArgs": ""
+      "commandLineArgs": "--transferhistory /Users/todd/tmp/dotyou/tenants"
     }
   }
 }