From ca9ee503323c6f743fbbb37f1333397ccfbb5038 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 7 Mar 2022 23:01:49 +0000 Subject: [PATCH] --- server/AyaNova/biz/JobsBiz.cs | 4 ++-- server/AyaNova/util/Mailer.cs | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/AyaNova/biz/JobsBiz.cs b/server/AyaNova/biz/JobsBiz.cs index 6a9b92b1..f3a763a1 100644 --- a/server/AyaNova/biz/JobsBiz.cs +++ b/server/AyaNova/biz/JobsBiz.cs @@ -211,9 +211,9 @@ namespace AyaNova.Biz //BACKUP await CoreJobBackup.DoWorkAsync(); if (!KeepOnWorking()) return; - + //NOTIFICATIONS - TaskUtil.Forget(Task.Run(() => CoreJobNotify.DoWorkAsync())); + TaskUtil.Forget(Task.Run(() => CoreJobNotify.DoWorkAsync()));//must fire and forget as it will call a report render job. In fact probably all of these can be fire and forget // await CoreJobNotify.DoWorkAsync(); if (!KeepOnWorking()) return; diff --git a/server/AyaNova/util/Mailer.cs b/server/AyaNova/util/Mailer.cs index 9d405849..597c4271 100644 --- a/server/AyaNova/util/Mailer.cs +++ b/server/AyaNova/util/Mailer.cs @@ -9,7 +9,7 @@ namespace AyaNova.Util { public interface IMailer { - Task SendEmailAsync(string email, string subject, string body, AyaNova.Models.GlobalOpsNotificationSettings smtpSettings, string attachPDF = null); + Task SendEmailAsync(string email, string subject, string body, AyaNova.Models.GlobalOpsNotificationSettings smtpSettings, string attachPDF = null, string forceFileName = null); } public class Mailer : IMailer @@ -19,7 +19,7 @@ namespace AyaNova.Util } - public async Task SendEmailAsync(string email, string subject, string body, AyaNova.Models.GlobalOpsNotificationSettings smtpSettings, string attachPDFPath = null) + public async Task SendEmailAsync(string email, string subject, string body, AyaNova.Models.GlobalOpsNotificationSettings smtpSettings, string attachPDFPath = null, string forceFileName = null) { try { @@ -29,17 +29,18 @@ namespace AyaNova.Util message.Subject = subject; if (!string.IsNullOrWhiteSpace(attachPDFPath)) - { + { var attachment = new MimePart("application/pdf", "pdf") { Content = new MimeContent(File.OpenRead(attachPDFPath), ContentEncoding.Default), ContentDisposition = new ContentDisposition(ContentDisposition.Attachment), ContentTransferEncoding = ContentEncoding.Base64, - FileName = Path.GetFileName("test.pdf") - //FileName = Path.GetFileName(attachPDFPath) + FileName = Path.GetFileName(attachPDFPath) }; - + if (!string.IsNullOrWhiteSpace(forceFileName)) + attachment.FileName = forceFileName; + var multipart = new Multipart("mixed"); if (!string.IsNullOrWhiteSpace(body)) multipart.Add(new TextPart(TextFormat.Plain) { Text = body });