Merge pull request #957 from bcgov/main-DV-FOIMOD-3127

attachment MSG size and lastModified updated
bcgov · Apr 26, 2024 · 9adcf21 · 9adcf21
2 parents ed71a0d + b8397e3
commit 9adcf21
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/MCS.FOI.S3FileConversion/MCS.FOI.MSGToPDF/MSGFileProcessor.cs b/MCS.FOI.S3FileConversion/MCS.FOI.MSGToPDF/MSGFileProcessor.cs
@@ -67,10 +67,20 @@ public MSGFileProcessor(Stream sourceStream)
                                             filename = Path.GetFileNameWithoutExtension(filename) + '1' + extension;
                                         }
                                         fileNameHash.Add(filename, true);
+
+                                        var lastModified = _attachment.LastModificationTime.ToString();
+                                        var sentOn = _attachment.SentOn.ToString();
+                                        if (!string.IsNullOrEmpty(sentOn))
+                                            lastModified = sentOn;
+
+                                        var attachmentSize = attachmentStream.Length.ToString();
+                                        if (string.IsNullOrEmpty(attachmentSize))
+                                            attachmentSize = attachmentStream.Capacity.ToString();
+
                                         attachmentInfo.Add("filename", _attachment.FileName);
                                         attachmentInfo.Add("s3filename", filename);
-                                        attachmentInfo.Add("size", attachmentStream.Capacity.ToString());
-                                        attachmentInfo.Add("lastmodified", _attachment.LastModificationTime.ToString());
+                                        attachmentInfo.Add("size", attachmentStream.Length.ToString());
+                                        attachmentInfo.Add("lastmodified", lastModified);
                                         attachmentInfo.Add("created", _attachment.CreationTime.ToString());
                                         attachmentsObj.Add(attachmentStream, attachmentInfo);
                                     }