Expanded GetFiles / File Search with RecipientFileStatus

Test/Altinn.Broker.Tests/FileControllerTests.cs

@@ -235,4 +235,60 @@ public async Task Search_SearchFileWith_To_Status_Success()
         // Assert
         Assert.Contains(fileId, contentstring);
     }
+
+    [Fact]
+    public async Task Search_SearchFileWith_RecipientStatus_Success()
+    {
+        // Arrange
+        string status = "Published";
+        string recipientStatus = "Initialized";
+        var initializeFileResponse = await _senderClient.PostAsJsonAsync("broker/api/v1/file", FileInitializeExtTestFactory.BasicFile());
+        var fileId = await initializeFileResponse.Content.ReadAsStringAsync();
+        var initializedFile = await _senderClient.GetFromJsonAsync<FileOverviewExt>($"broker/api/v1/file/{fileId}", _responseSerializerOptions);
+        Assert.NotNull(initializedFile);
+        var uploadedFileBytes = Encoding.UTF8.GetBytes("This is the contents of the uploaded file");
+        using (var content = new ByteArrayContent(uploadedFileBytes))
+        {
+            content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
+            var uploadResponse = await _senderClient.PostAsync($"broker/api/v1/file/{fileId}/upload", content);
+            Assert.True(uploadResponse.IsSuccessStatusCode);
+        }
+        var uploadedFile = await _senderClient.GetFromJsonAsync<FileOverviewExt>($"broker/api/v1/file/{fileId}", _responseSerializerOptions);
+
+        // Act
+        var searchResult = await _recipientClient.GetAsync($"broker/api/v1/file?status={status}&recipientStatus={recipientStatus}");
+        string contentstring = await searchResult.Content.ReadAsStringAsync();
+
+        // Assert
+        Assert.Contains(fileId, contentstring);
+    }
+
+    [Fact]
+    public async Task Search_SearchFileWith_RecipientStatus_NotFound()
+    {
+        // Arrange
+        string status = "Published";
+        string recipientStatus = "DownloadConfirmed";
+        DateTimeOffset dateTimeFrom = DateTime.Now.AddMinutes(-2);
+        var initializeFileResponse = await _senderClient.PostAsJsonAsync("broker/api/v1/file", FileInitializeExtTestFactory.BasicFile());
+        DateTimeOffset dateTimeTo = DateTime.Now.AddMinutes(2);
+        var fileId = await initializeFileResponse.Content.ReadAsStringAsync();
+        var initializedFile = await _senderClient.GetFromJsonAsync<FileOverviewExt>($"broker/api/v1/file/{fileId}", _responseSerializerOptions);
+        Assert.NotNull(initializedFile);
+        var uploadedFileBytes = Encoding.UTF8.GetBytes("This is the contents of the uploaded file");
+        using (var content = new ByteArrayContent(uploadedFileBytes))
+        {
+            content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
+            var uploadResponse = await _senderClient.PostAsync($"broker/api/v1/file/{fileId}/upload", content);
+            Assert.True(uploadResponse.IsSuccessStatusCode);
+        }
+        var uploadedFile = await _senderClient.GetFromJsonAsync<FileOverviewExt>($"broker/api/v1/file/{fileId}", _responseSerializerOptions);
+
+        // Act
+        var searchResult = await _recipientClient.GetAsync($"broker/api/v1/file?status={status}&recipientStatus={recipientStatus}");
+        string contentstring = await searchResult.Content.ReadAsStringAsync();
+
+        // Assert
+        Assert.DoesNotContain(fileId, contentstring);
+    }
 }

src/Altinn.Broker.Application/GetFilesQuery/GetFilesQueryHandler.cs

@@ -1,5 +1,6 @@
 using Altinn.Broker.Core.Application;
 using Altinn.Broker.Core.Domain;
+using Altinn.Broker.Core.Domain.Enums;
 using Altinn.Broker.Core.Repositories;
 
 using Microsoft.Extensions.Logging;
@@ -52,7 +53,14 @@ public async Task<OneOf<List<Guid>, Error>> Process(GetFilesQueryRequest request
             fileSearchEntity.To = new DateTimeOffset(request.To.Value.UtcDateTime, TimeSpan.Zero);
         }
 
-        var files = await _fileRepository.GetFilesAssociatedWithActor(fileSearchEntity);
-        return files;
+        if (request.RecipientStatus.HasValue)
+        {
+            fileSearchEntity.RecipientStatus = request.RecipientStatus;
+            return await _fileRepository.GetFilesForRecipientWithRecipientStatus(fileSearchEntity);
+        }
+        else
+        {
+            return await _fileRepository.GetFilesAssociatedWithActor(fileSearchEntity);
+        }
     }
 }

src/Altinn.Broker.Application/GetFilesQuery/GetFilesQueryRequest.cs

@@ -7,6 +7,7 @@ public class GetFilesQueryRequest
     public string Consumer { get; set; }
     public string Supplier { get; set; }
     public FileStatus? Status { get; set; }
+    public ActorFileStatus? RecipientStatus { get; set; }
     public DateTimeOffset? From { get; set; }
     public DateTimeOffset? To { get; set; }
 }

src/Altinn.Broker.Core/Domain/FileSearchEntity.cs

@@ -6,6 +6,7 @@ public class FileSearchEntity
 {
     public ActorEntity Actor { get; set; }
     public FileStatus? Status { get; set; }
+    public ActorFileStatus? RecipientStatus { get; set; }
     public DateTimeOffset? From { get; set; }
     public DateTimeOffset? To { get; set; }
 }

src/Altinn.Broker.Core/Repositories/IFileRepository.cs

@@ -15,6 +15,7 @@ Task<Guid> AddFile(
         string? checksum);
     Task<Domain.FileEntity?> GetFile(Guid fileId);
     Task<List<Guid>> GetFilesAssociatedWithActor(FileSearchEntity fileSearch);
+    Task<List<Guid>> GetFilesForRecipientWithRecipientStatus(FileSearchEntity fileSearch);
     Task SetStorageReference(
         Guid fileId,
         long storageProviderId,

src/Altinn.Broker.Persistence/Repositories/FileRepository.cs

@@ -261,6 +261,57 @@ public async Task<List<Guid>> GetFilesAssociatedWithActor(FileSearchEntity fileS
         }
     }
 
+    public async Task<List<Guid>> GetFilesForRecipientWithRecipientStatus(FileSearchEntity fileSearch)
+    {
+        StringBuilder commandString = new StringBuilder();
+        commandString.AppendLine("SELECT DISTINCT f.file_id_pk");
+        commandString.AppendLine("FROM broker.file f");
+        commandString.AppendLine("INNER JOIN LATERAL (SELECT afs.actor_file_status_id_fk FROM broker.actor_file_status afs WHERE afs.file_id_fk = f.file_id_pk AND afs.actor_id_fk = @recipientId ORDER BY afs.actor_file_status_id_fk desc LIMIT 1) AS recipientfilestatus ON true");
+        commandString.AppendLine("INNER JOIN LATERAL (SELECT fs.file_status_description_id_fk FROM broker.file_status fs where fs.file_id_fk = f.file_id_pk ORDER BY fs.file_status_id_pk desc LIMIT 1 ) AS filestatus ON true");
+        commandString.AppendLine("WHERE actor_file_status_id_fk = @recipientFileStatus");
+        if (fileSearch.Status.HasValue)
+        {
+            commandString.AppendLine("AND file_status_description_id_fk = @fileStatus");
+        }
+        if (fileSearch.From.HasValue && fileSearch.To.HasValue)
+        {
+            commandString.AppendLine("AND f.created between @from AND @to");
+        }
+        else if (fileSearch.From.HasValue)
+        {
+            commandString.AppendLine("AND f.created > @from");
+        }
+        else if (fileSearch.To.HasValue)
+        {
+            commandString.AppendLine("AND f.created < @to");
+        }
+
+        await using (var command = await _connectionProvider.CreateCommand(
+            commandString.ToString()))
+        {
+            command.Parameters.AddWithValue("@recipientId", fileSearch.Actor.ActorId);
+            if (fileSearch.From.HasValue)
+                command.Parameters.AddWithValue("@From", fileSearch.From);
+            if (fileSearch.To.HasValue)
+                command.Parameters.AddWithValue("@To", fileSearch.To);
+            if (fileSearch.Status.HasValue)
+                command.Parameters.AddWithValue("@fileStatus", (int)fileSearch.Status);
+            if (fileSearch.RecipientStatus.HasValue)
+                command.Parameters.AddWithValue("@recipientFileStatus", (int)fileSearch.RecipientStatus);
+
+            var files = new List<Guid>();
+            using (var reader = await command.ExecuteReaderAsync())
+            {
+                while (await reader.ReadAsync())
+                {
+                    var fileId = reader.GetGuid(0);
+                    files.Add(fileId);
+                }
+            }
+            return files;
+        }
+    }
+
     public async Task SetStorageReference(Guid fileId, long storageProviderId, string fileLocation)
     {
         await using (var command = await _connectionProvider.CreateCommand(

src/Altinn.Broker/Controllers/FileController.cs

@@ -184,9 +184,10 @@ public async Task<ActionResult<FileStatusDetailsExt>> GetFileDetails(
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Authorize(Policy = "Sender")]
+        [Authorize(Policy = "SenderOrRecipient")]
         public async Task<ActionResult<List<Guid>>> GetFiles(
             [FromQuery] FileStatusExt? status,
+            [FromQuery] RecipientFileStatusExt? recipientStatus,
             [FromQuery] DateTimeOffset? from,
             [FromQuery] DateTimeOffset? to,
             [ModelBinder(typeof(MaskinportenModelBinder))] MaskinportenToken token,
@@ -199,6 +200,7 @@ public async Task<ActionResult<List<Guid>>> GetFiles(
                 Consumer = token.Consumer,
                 Supplier = token.Supplier,
                 Status = status is not null ? (FileStatus)status : null,
+                RecipientStatus = recipientStatus is not null ? (ActorFileStatus)recipientStatus : null,
                 From = from,
                 To = to
             });

src/Altinn.Broker/Controllers/LegacyFileController.cs

@@ -100,6 +100,7 @@ public async Task<ActionResult<FileStatusDetailsExt>> GetFileDetails(
         [HttpGet]
         public async Task<ActionResult<List<Guid>>> GetFiles(
             [FromQuery] FileStatusExt? status,
+            [FromQuery] RecipientFileStatusExt? recipientStatus,
             [FromQuery] DateTimeOffset? from,
             [FromQuery] DateTimeOffset? to,
             [ModelBinder(typeof(MaskinportenModelBinder))] MaskinportenToken token,

src/Altinn.Broker/Program.cs

@@ -141,8 +141,9 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config
 
     services.AddAuthorization(options =>
     {
-        options.AddPolicy("Sender", policy => policy.RequireClaim("scope", ["altinn:broker.write"]));
+        options.AddPolicy("Sender", policy => policy.RequireClaim("scope", ["altinn:broker.write", "altinn:broker.write altinn:broker.read"]));
         options.AddPolicy("Recipient", policy => policy.RequireClaim("scope", ["altinn:broker.read", "altinn:broker.write altinn:broker.read"]));
+        options.AddPolicy("SenderOrRecipient", policy => policy.RequireClaim("scope", ["altinn:broker.read", "altinn:broker.write", "altinn:broker.write altinn:broker.read"]));
         options.AddPolicy("Legacy", policy => policy.RequireClaim("scope", ["altinn:broker.legacy"]));
     });