Formatting etc

Author: Ceredron

src/Altinn.App.Core/Features/Correspondence/CorrespondenceClient.cs

@@ -53,7 +53,7 @@ public async Task<SendCorrespondenceResponse> Send(
         try
         {
             if (
-                payload.CorrespondenceRequest.Content.Attachments.Count > 0
+                payload.CorrespondenceRequest.Content.Attachments?.Count > 0
                 && payload.CorrespondenceRequest.Content.Attachments.All(a => a is CorrespondenceStreamedAttachment)
             )
             {
@@ -81,7 +81,17 @@ CorrespondenceStreamedAttachment attachment in payload.CorrespondenceRequest.Con
                         initializeAttachmentRequest,
                         cancellationToken
                     );
-                    var attachmentId = await initializeAttachmentRequest.Content.ReadAsStringAsync(cancellationToken);
+                    var initializeAttachmentContent = initializeAttachmentRequest.Content;
+                    if (initializeAttachmentContent is null)
+                    {
+                        throw new CorrespondenceRequestException(
+                            "Attachment initialization request did not return content.",
+                            null,
+                            HttpStatusCode.InternalServerError,
+                            "No content returned from attachment initialization"
+                        );
+                    }
+                    var attachmentId = await initializeAttachmentContent.ReadAsStringAsync(cancellationToken);
                     attachmentId = attachmentId.Trim('"');
                     var attachmentDataContent = new StreamContent(attachment.Data);
                     attachmentDataContent.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
@@ -155,39 +165,31 @@ CancellationToken cancellationToken
         {
             await Task.Delay(TimeSpan.FromSeconds(delaySeconds), cancellationToken);
 
-            try
-            {
-                var statusResponse = await AuthenticatedHttpRequestFactory(
-                    method: HttpMethod.Get,
-                    uri: GetUri($"attachment/{attachmentId}"),
-                    content: null,
-                    payload: payload
-                );
+            var statusResponse = await AuthenticatedHttpRequestFactory(
+                method: HttpMethod.Get,
+                uri: GetUri($"attachment/{attachmentId}"),
+                content: null,
+                payload: payload
+            );
+            var pollContent = statusResponse.Content;
 
-                var statusContent = await statusResponse.Content.ReadFromJsonAsync<AttachmentOverview>(
-                    cancellationToken
-                );
-                if (statusContent.Status == "Published")
-                {
-                    break;
-                }
+            if (pollContent is null)
+            {
+                break;
             }
-            catch (Exception ex)
+
+            var statusContent = await pollContent.ReadFromJsonAsync<AttachmentOverview>(cancellationToken);
+            if (statusContent?.Status == "Published")
             {
-                // Log the exception
-                if (attempt == maxAttempts)
-                {
-                    // Handle or rethrow the exception after all attempts failed
-                    throw;
-                }
+                return;
             }
-            throw new CorrespondenceRequestException(
-                $"Failure when uploading attachment. Attachment was not published in time. ",
-                null,
-                HttpStatusCode.InternalServerError,
-                "Polling failed"
-            );
         }
+        throw new CorrespondenceRequestException(
+            $"Failure when uploading attachment. Attachment was not published in time.",
+            null,
+            HttpStatusCode.InternalServerError,
+            "Polling failed"
+        );
     }
 
     /// <inheritdoc/>

src/Altinn.App.Core/Features/Correspondence/Models/AttachmentPayload.cs

@@ -1,29 +1,32 @@
 namespace Altinn.App.Core.Features.Correspondence.Models;
 
-public sealed record AttachmentPayload
+/// <summary>
+/// Represents the payload for sending an attachment.
+/// </summary>
+internal sealed record AttachmentPayload
 {
     /// <summary>
     /// Gets or sets the Resource Id for the correspondence service.
     /// </summary>
-    internal string ResourceId { get; set; }
+    internal required string ResourceId { get; set; }
 
     /// <summary>
     /// The name of the attachment file.
     /// </summary>
-    public string? FileName { get; set; }
+    internal string? FileName { get; set; }
 
     /// <summary>
     /// A logical name for the file, which will be shown in Altinn Inbox.
     /// </summary>
-    public string? DisplayName { get; set; }
+    internal string? DisplayName { get; set; }
 
     /// <summary>
     /// A value indicating whether the attachment is encrypted or not.
     /// </summary>
-    public bool IsEncrypted { get; set; }
+    internal required bool IsEncrypted { get; set; }
 
     /// <summary>
     /// A reference value given to the attachment by the creator.
     /// </summary>
-    public string SendersReference { get; set; }
+    internal required string SendersReference { get; set; }
 }

src/Altinn.App.Core/Features/Correspondence/Models/Response/AttachmentOverview.cs

@@ -1,34 +1,27 @@
 namespace Altinn.App.Core.Features.Correspondence.Models.Response;
 
-public class AttachmentOverview
+/// <summary>
+/// Status of an attachment
+/// </summary>
+internal sealed record AttachmentOverview
 {
     /// <summary>
     /// Unique Id for this attachment
     /// </summary>
-    public Guid AttachmentId { get; set; }
+    internal required Guid AttachmentId { get; set; }
 
     /// <summary>
     /// Current attachment status
     /// </summary>
-    public string Status { get; set; }
+    internal required string Status { get; set; }
 
     /// <summary>
     /// Current attachment status text description
     /// </summary>
-    public string StatusText { get; set; }
+    internal required string StatusText { get; set; }
 
     /// <summary>
     /// Timestamp for when the Current Attachment Status was changed
     /// </summary>
-    public DateTimeOffset StatusChanged { get; set; }
-
-    /// <summary>
-    /// List of correspondences that are using this attachment
-    /// </summary>
-    public List<Guid> CorrespondenceIds { get; set; }
-
-    /// <summary>
-    /// The attachment data type in MIME format
-    /// </summary>
-    public string DataType { get; set; }
+    internal required DateTimeOffset StatusChanged { get; set; }
 }