cleanup warnings (#97)

Co-authored-by: Hammerbeck <[email protected]>
Altinn · Jun 4, 2024 · 7cf2121 · 7cf2121
1 parent 4feee01
commit 7cf2121
Show file tree

Hide file tree

Showing 45 changed files with 141 additions and 116 deletions.
diff --git a/src/Altinn.Correspondence.API/Controllers/CorrespondenceController.cs b/src/Altinn.Correspondence.API/Controllers/CorrespondenceController.cs
@@ -72,7 +72,7 @@ public async Task<ActionResult<CorrespondenceOverviewExt>> InitializeCorresponde
                 {
                     CorrespondenceId = Guid.NewGuid(),
                     Recipient = initializeCorrespondence.Recipient,
-                    Content = (CorrespondenceContentExt)initializeCorrespondence.Content,
+                    Content = initializeCorrespondence.Content != null ? (CorrespondenceContentExt)initializeCorrespondence.Content : null,
                     ResourceId = initializeCorrespondence.ResourceId,
                     Sender = initializeCorrespondence.Sender,
                     SendersReference = initializeCorrespondence.SendersReference,

diff --git a/src/Altinn.Correspondence.API/Controllers/HealthController.cs b/src/Altinn.Correspondence.API/Controllers/HealthController.cs
@@ -12,7 +12,7 @@ public HealthController()
         }
 
         [HttpGet]
-        public async Task<ActionResult> HealthCheckAsync()
+        public ActionResult HealthCheckAsync()
         {
             return Ok("Environment properly configured");
         }

diff --git a/src/Altinn.Correspondence.API/Mappers/AttachmentDetailsMapper.cs b/src/Altinn.Correspondence.API/Mappers/AttachmentDetailsMapper.cs
@@ -13,7 +13,7 @@ internal static AttachmentDetailsExt MapToExternal(GetAttachmentDetailsCommandRe
         var attachment = new AttachmentDetailsExt
         {
             AttachmentId = AttachmentDetails.AttachmentId,
-            Name = AttachmentDetails.Name,
+            Name = AttachmentDetails.Name ?? string.Empty,
             Status = (AttachmentStatusExt)AttachmentDetails.Status,
             StatusText = AttachmentDetails.StatusText,
             StatusChanged = AttachmentDetails.StatusChanged,

diff --git a/src/Altinn.Correspondence.API/Mappers/AttachmentOverviewMapper.cs b/src/Altinn.Correspondence.API/Mappers/AttachmentOverviewMapper.cs
@@ -13,7 +13,7 @@ internal static AttachmentOverviewExt MapToExternal(GetAttachmentOverviewCommand
         var attachment = new AttachmentOverviewExt
         {
             AttachmentId = attachmentOverview.AttachmentId,
-            Name = attachmentOverview.Name,
+            Name = attachmentOverview.Name ?? string.Empty,
             Status = (AttachmentStatusExt)attachmentOverview.Status,
             StatusText = attachmentOverview.StatusText,
             StatusChanged = attachmentOverview.StatusChanged,

diff --git a/src/Altinn.Correspondence.API/Mappers/CorrespondenceNotificationMapper.cs b/src/Altinn.Correspondence.API/Mappers/CorrespondenceNotificationMapper.cs
@@ -8,7 +8,7 @@ internal static class CorrespondenceNotificationMapper
 
     internal static CorrespondenceNotificationDetailsExt MapToExternal(CorrespondenceNotificationEntity correspondenceNotification)
     {
-        var latestStatus = correspondenceNotification?.Statuses.OrderByDescending(s => s.StatusChanged).FirstOrDefault();
+        var latestStatus = correspondenceNotification.Statuses.OrderByDescending(s => s.StatusChanged).First();
         var notification = new CorrespondenceNotificationDetailsExt
         {
             NotificationTemplate = correspondenceNotification.NotificationTemplate,
@@ -18,13 +18,10 @@ internal static CorrespondenceNotificationDetailsExt MapToExternal(Correspondenc
             Created = correspondenceNotification.Created,
             NotificationId = correspondenceNotification.Id,
             StatusHistory = correspondenceNotification.Statuses != null ? CorrespondenceNotificationStatusMapper.MapListToExternal(correspondenceNotification.Statuses) : new List<NotificationStatusEventExt>(),
+            Status = latestStatus.Status,
+            StatusText = latestStatus.StatusText ?? string.Empty,
+            StatusChanged = latestStatus.StatusChanged
         };
-        if (latestStatus != null)
-        {
-            notification.Status = latestStatus.Status;
-            notification.StatusText = latestStatus.StatusText;
-            notification.StatusChanged = latestStatus.StatusChanged;
-        }
         return notification;
     }
 

diff --git a/src/Altinn.Correspondence.API/Mappers/InitializeCorrespondenceMapper.cs b/src/Altinn.Correspondence.API/Mappers/InitializeCorrespondenceMapper.cs
@@ -22,14 +22,15 @@ internal static InitializeCorrespondenceCommandRequest MapToRequest(InitializeCo
             ReplyOptions = CorrespondenceReplyOptionsMapper.MapListToEntities(initializeCorrespondenceExt.ReplyOptions),
             IsReservable = initializeCorrespondenceExt.IsReservable,
             Notifications = InitializeCorrespondenceNotificationMapper.MapListToEntities(initializeCorrespondenceExt.Notifications),
+            Statuses = new List<CorrespondenceStatusEntity>(),
             Created = DateTimeOffset.UtcNow,
-            Content = new CorrespondenceContentEntity
+            Content = initializeCorrespondenceExt.Content != null ? new CorrespondenceContentEntity
             {
                 Language = initializeCorrespondenceExt.Content.Language,
                 MessageTitle = initializeCorrespondenceExt.Content.MessageTitle,
                 MessageSummary = initializeCorrespondenceExt.Content.MessageSummary,
                 Attachments = InitializeCorrespondenceAttachmentMapper.MapListToEntities(initializeCorrespondenceExt.Content.Attachments)
-            }
+            } : null,
         };
         return new InitializeCorrespondenceCommandRequest()
         {

diff --git a/src/Altinn.Correspondence.API/Models/AttachmentDetailsExt.cs b/src/Altinn.Correspondence.API/Models/AttachmentDetailsExt.cs
@@ -13,6 +13,6 @@ public class AttachmentDetailsExt : AttachmentOverviewExt
         /// The Status history for the Attachment
         /// </summary>
         [JsonPropertyName("statusHistory")]
-        public List<AtachmentStatusEvent> StatusHistory { get; set; }
+        public List<AtachmentStatusEvent> StatusHistory { get; set; } = new List<AtachmentStatusEvent>();
     }
 }
diff --git a/src/Altinn.Correspondence.API/Models/AttachmentOverviewExt.cs b/src/Altinn.Correspondence.API/Models/AttachmentOverviewExt.cs
@@ -26,18 +26,18 @@ public class AttachmentOverviewExt : InitializeAttachmentExt
         /// Current attachment status
         /// </summary>
         [JsonPropertyName("status")]
-        public AttachmentStatusExt Status { get; set; }
+        public required AttachmentStatusExt Status { get; set; }
 
         /// <summary>
         /// Current attachment status text description
         /// </summary>
         [JsonPropertyName("statusText")]
-        public string StatusText { get; set; } = string.Empty;
+        public required string StatusText { get; set; }
 
         /// <summary>
         /// Timestamp for when the Current Attachment Status was changed
         /// </summary>
         [JsonPropertyName("statusChanged")]
-        public DateTimeOffset? StatusChanged { get; set; }
+        public required DateTimeOffset StatusChanged { get; set; }
     }
 }
diff --git a/src/Altinn.Correspondence.API/Models/CorrespondenceContentExt.cs b/src/Altinn.Correspondence.API/Models/CorrespondenceContentExt.cs
@@ -15,6 +15,6 @@ public class CorrespondenceContentExt : InitializeCorrespondenceContentExt
         /// TODO: Number restriction?
         /// </remarks>
         [JsonPropertyName("attachments")]
-        public new List<CorrespondenceAttachmentOverviewExt> Attachments { get; set; }
+        public required new List<CorrespondenceAttachmentOverviewExt> Attachments { get; set; }
     }
 }
diff --git a/src/Altinn.Correspondence.API/Models/CorrespondenceDetailsExt.cs b/src/Altinn.Correspondence.API/Models/CorrespondenceDetailsExt.cs
@@ -11,18 +11,18 @@ public class CorrespondenceDetailsExt : CorrespondenceOverviewExt
         /// The Status history for the Corrrespondence
         /// </summary>
         [JsonPropertyName("statusHistory")]
-        public List<CorrespondenceStatusEventExt> StatusHistory { get; set; }
+        public List<CorrespondenceStatusEventExt> StatusHistory { get; set; } = new List<CorrespondenceStatusEventExt>();
 
         /// <summary>
         /// Notifications directly related to this Correspondence.
         /// </summary>
         [JsonPropertyName("notifications")]
-        public new List<CorrespondenceNotificationDetailsExt>? Notifications { get; set; }
+        public new List<CorrespondenceNotificationDetailsExt>? Notifications { get; set; } = new List<CorrespondenceNotificationDetailsExt>();
 
         /// <summary>
         /// The Status history for the Notifications
         /// </summary>
         [JsonPropertyName("notificationStatusHistory")]
-        public List<NotificationStatusEventExt> NotificationStatusHistory { get; set; }
+        public List<NotificationStatusEventExt> NotificationStatusHistory { get; set; } = new List<NotificationStatusEventExt>();
     }
 }
diff --git a/src/Altinn.Correspondence.API/Models/CorrespondenceNotificationDetailsExt.cs b/src/Altinn.Correspondence.API/Models/CorrespondenceNotificationDetailsExt.cs
@@ -11,7 +11,7 @@ public class CorrespondenceNotificationDetailsExt : CorrespondenceNotificationOv
         /// Current status for the notification
         /// </summary>        
         [JsonPropertyName("status")]
-        public string Status { get; set; }
+        public required string Status { get; set; }
 
         /// <summary>
         /// Current status text for the notification
@@ -29,12 +29,12 @@ public class CorrespondenceNotificationDetailsExt : CorrespondenceNotificationOv
         /// Completed Status history for the Notification
         /// </summary>
         [JsonPropertyName("statusHistory")]
-        public List<NotificationStatusEventExt> StatusHistory { get; set; }
+        public List<NotificationStatusEventExt> StatusHistory { get; set; } = new List<NotificationStatusEventExt>();
 
         /// <summary>
         /// Created timestamp for the notification
         /// </summary>
         [JsonPropertyName("created")]
-        public DateTimeOffset Created { get; set; }
+        public new DateTimeOffset Created { get; set; }
     }
 }
diff --git a/src/Altinn.Correspondence.API/Models/CorrespondenceOverviewExt.cs b/src/Altinn.Correspondence.API/Models/CorrespondenceOverviewExt.cs
@@ -18,7 +18,7 @@ public class CorrespondenceOverviewExt : InitializeCorrespondenceExt
         /// The correspondence content. Contains information about the Correspondence body, subject etc.
         /// </summary>
         [JsonPropertyName("content")]
-        public new CorrespondenceContentExt Content { get; set; }
+        public new CorrespondenceContentExt? Content { get; set; }
 
         /// <summary>
         /// When the correspondence was created

diff --git a/src/Altinn.Correspondence.API/Models/CorrespondenceReplyOptionExt.cs b/src/Altinn.Correspondence.API/Models/CorrespondenceReplyOptionExt.cs
@@ -9,11 +9,11 @@ public class CorrespondenceReplyOptionExt
         /// <summary>
         /// Gets or sets the URL to be used as a reply/response to a correspondence. 
         /// </summary>
-        public string LinkURL { get; set; }
+        public required string LinkURL { get; set; }
 
         /// <summary>
         /// Gets or sets the url text.
         /// </summary>
-        public string LinkText { get; set; }
+        public string? LinkText { get; set; }
     }
 }
diff --git a/src/Altinn.Correspondence.API/Models/InitializeCorrespondenceContentExt.cs b/src/Altinn.Correspondence.API/Models/InitializeCorrespondenceContentExt.cs
@@ -14,7 +14,7 @@ public class InitializeCorrespondenceContentExt
         /// </summary>
         [JsonPropertyName("language")]
         [ISO6391]
-        public string Language { get; set; }
+        public required string Language { get; set; }
 
         /// <summary>
         /// Gets or sets the correspondence message title. Subject.
@@ -23,7 +23,7 @@ public class InitializeCorrespondenceContentExt
         /// TODO: Length restriction?
         /// </remarks>
         [JsonPropertyName("messageTitle")]
-        public string MessageTitle { get; set; }
+        public required string MessageTitle { get; set; }
 
         /// <summary>
         /// Gets or sets a summary text of the correspondence.
@@ -32,7 +32,7 @@ public class InitializeCorrespondenceContentExt
         /// TODO: Length restriction?
         /// </remarks>
         [JsonPropertyName("messageSummary")]
-        public string MessageSummary { get; set; }
+        public required string MessageSummary { get; set; }
 
         /// <summary>
         /// Gets or sets a list of attachments.
@@ -41,7 +41,7 @@ public class InitializeCorrespondenceContentExt
         /// TODO: Number restriction?
         /// </remarks>
         [JsonPropertyName("attachments")]
-        public List<InitializeCorrespondenceAttachmentExt> Attachments { get; set; }
+        public List<InitializeCorrespondenceAttachmentExt> Attachments { get; set; } = new List<InitializeCorrespondenceAttachmentExt>();
 
         /// <summary>
         /// Ids of the attachments that are to be included in the correspondence.
@@ -57,7 +57,7 @@ public ISO6391Attribute()
         {
         }
 
-        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
         {
             var stringValue = value as string;
             if (string.IsNullOrWhiteSpace(stringValue))

diff --git a/src/Altinn.Correspondence.API/Models/InitializeCorrespondenceExt.cs b/src/Altinn.Correspondence.API/Models/InitializeCorrespondenceExt.cs
@@ -49,7 +49,7 @@ public class InitializeCorrespondenceExt
         /// The correspondence content. Contains information about the Correspondence body, subject etc.
         /// </summary>
         [JsonPropertyName("content")]
-        public InitializeCorrespondenceContentExt Content { get; set; }
+        public InitializeCorrespondenceContentExt? Content { get; set; }
 
         /// <summary>
         /// When the correspondence should become visible to the recipient.
@@ -90,14 +90,14 @@ public class InitializeCorrespondenceExt
         /// Options for how the recipient can reply to the correspondence
         /// </summary>
         [JsonPropertyName("replyOptions")]
-        public List<CorrespondenceReplyOptionExt>? ReplyOptions { get; set; }
+        public List<CorrespondenceReplyOptionExt> ReplyOptions { get; set; } = new List<CorrespondenceReplyOptionExt>();
 
         /// <summary>
         /// Notifications directly related to this Correspondence.
         /// </summary>
         [JsonPropertyName("notifications")]
         [MaxLength(6, ErrorMessage = "Notifications can contain at most 6 notifcations")]
-        public List<InitializeCorrespondenceNotificationExt>? Notifications { get; set; }
+        public List<InitializeCorrespondenceNotificationExt> Notifications { get; set; } = new List<InitializeCorrespondenceNotificationExt>();
 
         /// <summary>
         /// Specifies whether the correspondence can override reservation against digital comminication in KRR
@@ -113,7 +113,7 @@ public PropertyListAttribute()
         {
         }
 
-        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
         {
             if (value == null)
             {

diff --git a/src/Altinn.Correspondence.API/Models/InitializeCorrespondenceNotificationExt.cs b/src/Altinn.Correspondence.API/Models/InitializeCorrespondenceNotificationExt.cs
@@ -18,7 +18,7 @@ public class InitializeCorrespondenceNotificationExt
         /// Reminders sent after 14 days if Correspondence not confirmed
         /// </remarks>
         [JsonPropertyName("notificationTemplate")]
-        public string NotificationTemplate { get; set; }
+        public required string NotificationTemplate { get; set; }
 
         /// <summary>
         /// Single custom text token that can be inserted into the notification template

diff --git a/src/Altinn.Correspondence.API/Models/MD5ChecksumAttribute.cs b/src/Altinn.Correspondence.API/Models/MD5ChecksumAttribute.cs
@@ -8,7 +8,7 @@ public MD5ChecksumAttribute()
         {
         }
 
-        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
         {
             var stringValue = value as string;
             if (string.IsNullOrWhiteSpace(stringValue))

diff --git a/src/Altinn.Correspondence.API/Models/NotificationStatusEventExt.cs b/src/Altinn.Correspondence.API/Models/NotificationStatusEventExt.cs
@@ -9,21 +9,21 @@ namespace Altinn.Correspondence.API.Models
     public class NotificationStatusEventExt
     {
         /// <summary>
-        /// Notificatipn Status code
+        /// Notification Status code
         /// </summary>
         [JsonPropertyName("status")]
-        public string Status { get; set; }
+        public required string Status { get; set; }
 
         /// <summary>
         /// Notification Status Text description
         /// </summary>
         [JsonPropertyName("statusText")]
-        public string StatusText { get; set; } = string.Empty;
+        public required string StatusText { get; set; }
 
         /// <summary>
         /// Timestamp for when this Correspondence Status Event occurred
         /// </summary>
         [JsonPropertyName("statusChanged")]
-        public DateTimeOffset StatusChanged { get; set; }
+        public required DateTimeOffset StatusChanged { get; set; }
     }
 }
diff --git a/...inn.Correspondence.Application/GetAttachmentDetails/GetAttachmentDetailsCommandHandler.cs b/...inn.Correspondence.Application/GetAttachmentDetails/GetAttachmentDetailsCommandHandler.cs
@@ -18,20 +18,20 @@ public GetAttachmentDetailsCommandHandler(IAttachmentStatusRepository attachment
     public async Task<OneOf<GetAttachmentDetailsCommandResponse, Error>> Process(Guid attachmentId, CancellationToken cancellationToken)
     {
         var attachment = await _attachmentRepository.GetAttachmentById(attachmentId, true, cancellationToken);
-        var attachmentStatus = attachment?.Statuses.OrderByDescending(s => s.StatusChanged).FirstOrDefault();
         if (attachment == null)
         {
             return Errors.AttachmentNotFound;
         }
+        var attachmentStatus = attachment.Statuses.OrderByDescending(s => s.StatusChanged).First();
 
         var response = new GetAttachmentDetailsCommandResponse
         {
             AttachmentId = attachment.Id,
             DataLocationUrl = attachment.DataLocationUrl,
             Name = attachment.FileName,
-            Status = attachmentStatus?.Status,
+            Status = attachmentStatus.Status,
             Statuses = attachment.Statuses,
-            StatusChanged = attachmentStatus?.StatusChanged,
+            StatusChanged = attachmentStatus.StatusChanged,
             DataLocationType = attachment.DataLocationType,
             DataType = attachment.DataType,
             IntendedPresentation = attachment.IntendedPresentation,

diff --git a/...nn.Correspondence.Application/GetAttachmentDetails/GetAttachmentDetailsCommandResponse.cs b/...nn.Correspondence.Application/GetAttachmentDetails/GetAttachmentDetailsCommandResponse.cs
@@ -11,11 +11,11 @@ public class GetAttachmentDetailsCommandResponse
 
     public string? DataLocationUrl { get; set; }
 
-    public AttachmentStatus? Status { get; set; }
+    public AttachmentStatus Status { get; set; }
 
-    public string? StatusText { get; set; } = string.Empty;
+    public string StatusText { get; set; } = string.Empty;
 
-    public DateTimeOffset? StatusChanged { get; set; }
+    public DateTimeOffset StatusChanged { get; set; }
 
     public string? Name { get; set; } = string.Empty;
 

diff --git a/...n.Correspondence.Application/GetAttachmentOverview/GetAttachmentOverviewCommandHandler.cs b/...n.Correspondence.Application/GetAttachmentOverview/GetAttachmentOverviewCommandHandler.cs
@@ -17,20 +17,20 @@ public GetAttachmentOverviewCommandHandler(IAttachmentStatusRepository attachmen
     public async Task<OneOf<GetAttachmentOverviewCommandResponse, Error>> Process(Guid attachmentId, CancellationToken cancellationToken)
     {
         var attachment = await _attachmentRepository.GetAttachmentById(attachmentId, false, cancellationToken);
-        var attachmentStatus = await _attachmentStatusRepository.GetLatestStatusByAttachmentId(attachmentId, cancellationToken);
         if (attachment == null)
         {
             return Errors.AttachmentNotFound;
         }
+        var attachmentStatus = await _attachmentStatusRepository.GetLatestStatusByAttachmentId(attachmentId, cancellationToken);
 
         var response = new GetAttachmentOverviewCommandResponse
         {
             AttachmentId = attachment.Id,
             DataLocationUrl = attachment.DataLocationUrl,
             Name = attachment.FileName,
-            Status = attachmentStatus?.Status,
-            StatusText = attachmentStatus?.StatusText,
-            StatusChanged = attachmentStatus?.StatusChanged,
+            Status = attachmentStatus.Status,
+            StatusText = attachmentStatus.StatusText,
+            StatusChanged = attachmentStatus.StatusChanged,
             DataLocationType = attachment.DataLocationType,
             DataType = attachment.DataType,
             IntendedPresentation = attachment.IntendedPresentation,

diff --git a/....Correspondence.Application/GetAttachmentOverview/GetAttachmentOverviewCommandResponse.cs b/....Correspondence.Application/GetAttachmentOverview/GetAttachmentOverviewCommandResponse.cs
@@ -10,11 +10,11 @@ public class GetAttachmentOverviewCommandResponse
 
     public string? DataLocationUrl { get; set; }
 
-    public AttachmentStatus? Status { get; set; }
+    public AttachmentStatus Status { get; set; }
 
-    public string? StatusText { get; set; } = string.Empty;
+    public required string StatusText { get; set; }
 
-    public DateTimeOffset? StatusChanged { get; set; }
+    public DateTimeOffset StatusChanged { get; set; }
 
     public string? Name { get; set; } = string.Empty;