Merge pull request #4167 from cisagov/feature/CSET-2882

Cleaned up compile warnings
cisagov · Oct 16, 2024 · 8d60475 · 8d60475
2 parents 9027262 + ad300e6
commit 8d60475
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 77 deletions.
diff --git a/CSETWebApi/CSETWebCore.AutoResponder/EmailHelper.cs b/CSETWebApi/CSETWebCore.AutoResponder/EmailHelper.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using System.Net.Mail;
 using System.Net;
+using NLog;
 
 namespace CSETWebCore.AutoResponder
 {
@@ -22,6 +23,11 @@ public EmailHelper(IConfiguration configuration, IResourceHelper resourceHelper)
             this._resourceHelper = resourceHelper;
 
         }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
         public void SendFollowUp(string email, string firstName, string lastName)
         {
             string templateFile = @"App_Data\assessmentFollowUpTemplate_CF.html";
@@ -34,14 +40,27 @@ public void SendFollowUp(string email, string firstName, string lastName)
             message.Subject = "CSET Assessment Follow-up for Cybersecure Florida";
             message.Body = bodyHtml;
             message.To.Add(new MailAddress(email));
-            message.From = new MailAddress(
-            emailConfig.FirstOrDefault(x => x.Key == "Email:SenderEmail").Value,
-            emailConfig.FirstOrDefault(x => x.Key == "Email:SenderDisplayName").Value);
+
+            var configFromEmail = emailConfig.FirstOrDefault(x => x.Key == "Email:SenderEmail");
+            if (configFromEmail.Value == null)
+            {
+                // Don't send email because we don't have a "From:" address configured
+                LogManager.GetCurrentClassLogger().Error("No configuration for Email:SenderEmail");
+                return;
+            }
+
+            message.From = new MailAddress(configFromEmail.Value,
+                emailConfig.FirstOrDefault(x => x.Key == "Email:SenderDisplayName").Value);
 
             message.IsBodyHtml = true;
 
             SendMail(message);
         }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
         public void SendWeekly(string attachmentPath, string email, string firstName, string lastName)
         {
             string templateFile = @"App_Data\weeklyTemplate_CF.html";
@@ -54,16 +73,25 @@ public void SendWeekly(string attachmentPath, string email, string firstName, st
             message.Subject = "New Weekly Contacts for Cybersecure Florida";
             message.Body = bodyHtml;
             message.To.Add(new MailAddress(email));
-            message.From = new MailAddress(
-            emailConfig.FirstOrDefault(x => x.Key == "Email:SenderEmail").Value,
-            emailConfig.FirstOrDefault(x => x.Key == "Email:SenderDisplayName").Value);
+
+            var configFromEmail = emailConfig.FirstOrDefault(x => x.Key == "Email:SenderEmail");
+            if (configFromEmail.Value == null)
+            {
+                // Don't send email because we don't have a "From:" address configured
+                LogManager.GetCurrentClassLogger().Error("No configuration for Email:SenderEmail");
+                return;
+            }
+
+            message.From = new MailAddress(configFromEmail.Value,
+                emailConfig.FirstOrDefault(x => x.Key == "Email:SenderDisplayName").Value);
 
             message.IsBodyHtml = true;
             message.Attachments.Add(new Attachment(attachmentPath));
 
             SendMail(message);
         }
 
+
         // <summary>
         /// Sends a MailMessage using the configured SmtpClient.
         /// See class level note (top of the file)
@@ -81,11 +109,21 @@ public void SendMail(MailMessage mail)
             string footerCF = _resourceHelper.GetEmbeddedResource(@"App_Data\EmailFooter_CF.html");
             mail.Body = mail.Body.Replace("{{email-footer-CF}}", footerCF);
 
+            var configSmtpHost = emailConfig.FirstOrDefault(x => x.Key == "Email:SmtpHost");
+
+            // if no mail host defined, don't send the email
+            if (configSmtpHost.Value == null)
+            {
+                LogManager.GetCurrentClassLogger().Error("No configuration for Email:SmtpHost");
+                return;
+            }
+
+
             SmtpClient client = new SmtpClient
             {
                 DeliveryMethod = SmtpDeliveryMethod.Network,
-                Host = emailConfig.FirstOrDefault(x => x.Key == "Email:SmtpHost").Value,
-                Port = int.Parse(emailConfig.FirstOrDefault(x => x.Key == "Email:SmtpPort").Value),
+                Host = configSmtpHost.Value,
+                Port = int.Parse(emailConfig.FirstOrDefault(x => x.Key == "Email:SmtpPort").Value ?? "25"),
                 UseDefaultCredentials = false
             };
 

diff --git a/CSETWebApi/CSETWebCore.AutoResponder/ExcelProcess.cs b/CSETWebApi/CSETWebCore.AutoResponder/ExcelProcess.cs
@@ -1,4 +1,5 @@
 using CSETWebCore.DataLayer.Model;
+using NLog;
 using System.Runtime.InteropServices;
 using Excel = Microsoft.Office.Interop.Excel;
 
@@ -43,6 +44,7 @@ join d in context.DEMOGRAPHIC_ANSWERS on a.Assessment_Id equals d.Assessment_Id
             return clist.ToList();
         }
 
+
         private string CreateACopyOfTheFile()
         {
             string excelFile = @"Survey contacts.xlsx";
@@ -57,9 +59,9 @@ private string CreateACopyOfTheFile()
 
         private void BuildContactsSheet(string excelFile, List<ContactData> data, string password)
         {
-            Excel.Application excel = null;
-            Excel.Workbook workbook = null;
-            Excel.Worksheet worksheet = null;
+            Excel.Application? excel = null;
+            Excel.Workbook? workbook = null;
+            Excel.Worksheet? worksheet = null;
             try
             {
                 excel = new Excel.Application { Visible = false, DisplayAlerts = false };
@@ -84,6 +86,7 @@ private void BuildContactsSheet(string excelFile, List<ContactData> data, string
             catch (Exception ex) // Or System.Runtime.InteropServices.COMException
             {
                 // Handle it or log or do nothing
+                LogManager.GetCurrentClassLogger().Error(ex);
             }
             finally
             {
@@ -101,9 +104,9 @@ public ContactData()
         {
         }
 
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public string OrganizationName { get; set; }
-        public string Email { get; set; }
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+        public string? OrganizationName { get; set; }
+        public string? Email { get; set; }
     }
 }
diff --git a/CSETWebApi/CSETWebCore.AutoResponderTests/DailyEmailProcessWorkerTests.cs b/CSETWebApi/CSETWebCore.AutoResponderTests/DailyEmailProcessWorkerTests.cs
@@ -18,7 +18,7 @@ namespace CSETWebCore.AutoResponder.Tests
     [TestClass()]
     public class DailyEmailProcessWorkerTests
     {
-        private CSETContext context;
+        private CSETContext? context;
 
         [TestInitialize()]
         public void Initialize()

diff --git a/...CSETWeb_Api/CSETWebCore.BusinessTests/AssessmentIO/Export/AssessmentExportManagerTests.cs b/...CSETWeb_Api/CSETWebCore.BusinessTests/AssessmentIO/Export/AssessmentExportManagerTests.cs
@@ -14,7 +14,7 @@ namespace CSETWebCore.Business.AssessmentIO.Export.Tests
     [TestClass()]
     public class AssessmentExportManagerTests
     {
-        private CSETContext context;
+        private CSETContext? context;
 
         [TestInitialize()]
         public void Initialize()

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Conversion/ConversionBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Conversion/ConversionBusinessTests.cs
@@ -16,7 +16,7 @@ namespace CSETWebCore.Business.Contact.Tests
     [TestClass()]
     public class ConversionBusinessTests
     {
-        private CSETContext context;
+        private CSETContext? context;
 
         [TestInitialize()]
         public void Initialize()
@@ -31,20 +31,27 @@ public void Initialize()
 
         }
 
+
         [TestMethod()]
         public void IsEntryCFTest()
         {
             var db = this.context;
+
+            if (db == null)
+            {
+                throw new Exception("Database context is null");
+            }
+
             IAssessmentUtil util = new TestAssessmentUtil();
             ConversionBusiness conversionBusiness = new ConversionBusiness(db,util);
             var mm = db.MATURITY_MODELS.FirstOrDefault();
             List<int> ids =  db.ASSESSMENTS.Select(x=> x.Assessment_Id).ToList();
             List<CFEntry> entries =  conversionBusiness.IsEntryCF(ids);
             Assert.IsTrue(entries.Count > 0);
-
         }
     }
 
+
     internal class TestAssessmentUtil : IAssessmentUtil
     {
         public void TouchAssessment(int assessmentId)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryEditorTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryEditorTests.cs
@@ -21,7 +21,7 @@ namespace CSETWebCore.Business.GalleryParser.Tests
     [TestClass()]
     public class GalleryEditorTests
     {
-        private CSETContext context;
+        private CSETContext? context;
 
         [TestInitialize()]
         public void Initialize()

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
@@ -19,7 +19,7 @@ public void GetMalcolmJsonDataTest()
             {
                 string jsonString = File.ReadAllText(file);
                 var malcolmData = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
-                datalist.Add(malcolmData);
+                datalist.Add(malcolmData ?? new MalcolmData());
             }
 
             MalcolmBusiness tst = new MalcolmBusiness(new DataLayer.Model.CSETContext());
@@ -46,7 +46,7 @@ public void GetMalcolmJsonDataTest()
                 }
             }
             Assert.IsTrue(AllNodes.Count == nodesList.Count);
-            TempNode parent = null;
+            TempNode? parent = null;
             foreach (String item  in assertFile)
             {
                 /**
@@ -58,7 +58,7 @@ public void GetMalcolmJsonDataTest()
                  */
                 if (item.StartsWith("            "))
                 {
-                    Assert.IsTrue(parent.ChildrenKeys.Contains(item.Trim()));
+                    Assert.IsTrue(parent?.ChildrenKeys.Contains(item.Trim()));
                     Assert.IsTrue(nodesList.ContainsKey(item.Trim()));
                 }
                 else
@@ -80,7 +80,7 @@ public void TestMalcomTreeWalk()
             {
                 string jsonString = File.ReadAllText(file);
                 var malcolmData = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
-                datalist.Add(malcolmData);
+                datalist.Add(malcolmData ?? new MalcolmData());
             }
             MalcolmBusiness tst = new MalcolmBusiness(new DataLayer.Model.CSETContext());
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MatRelevantAnswers.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MatRelevantAnswers.cs
@@ -13,12 +13,9 @@ namespace CSETWebCore.Model.Maturity
 {
     public class MatRelevantAnswers
     {
-        public MatRelevantAnswers()
-        {
-        }
 
-        public ANSWER ANSWER { get; set; }
-        public MATURITY_QUESTIONS Mat { get; set; }
+        public ANSWER? ANSWER { get; set; }
+        public MATURITY_QUESTIONS? Mat { get; set; }
 
         // This should have a defined getter since as a property is ascertainable
         // but that getter would ping the database, and the GetMissingParents() function
@@ -45,21 +42,22 @@ public MatAnsweredQuestionDomain()
         {
         }
 
-        public string Title { get; set; }
+        public string? Title { get; set; }
         public bool IsDeficient { get; set; }
         public bool AreFactorQuestionsDeficient { get; set; }
-        public List<MaturityAnsweredQuestionsAssesment> AssessmentFactors { get; set; }
+        public List<MaturityAnsweredQuestionsAssesment>? AssessmentFactors { get; set; }
     }
 
     public class MaturityAnsweredQuestionsAssesment
     {
         public MaturityAnsweredQuestionsAssesment()
         {
         }
-        public string Title { get; set; }
+
+        public string? Title { get; set; }
         public bool IsDeficient { get; set; }
         public bool AreQuestionsDeficient { get; set; }
-        public List<MaturityAnsweredQuestionsComponent> Components { get; set; }
+        public List<MaturityAnsweredQuestionsComponent>? Components { get; set; }
         public List<MaturityAnsweredQuestions>? Questions { get; set; }
 
     }
@@ -68,26 +66,26 @@ public class MaturityAnsweredQuestionsComponent
         public MaturityAnsweredQuestionsComponent()
         {
         }
-        public string Title { get; set; }
+        public string? Title { get; set; }
         public bool IsDeficient { get; set; }
-        public List<MaturityAnsweredQuestions> Questions { get; set; }
+        public List<MaturityAnsweredQuestions>? Questions { get; set; }
     }
 
     public class MaturityAnsweredQuestions
     {
         public MaturityAnsweredQuestions()
         {
         }
-        public string Title { get; set; }
-        public string QuestionText { get; set; }
-        public string MaturityLevel { get; set; }
-        public string Comments { get; set; }
-        public string AnswerText { get; set; }
+        public string? Title { get; set; }
+        public string? QuestionText { get; set; }
+        public string? MaturityLevel { get; set; }
+        public string? Comments { get; set; }
+        public string? AnswerText { get; set; }
         public bool MarkForReview { get; set; }
-        public string Comment { get; set; }
+        public string? Comment { get; set; }
         public int MatQuestionId { get; set; }
-        public string FreeResponseText { get; set; }
-        public List<DocumentWithAnswerId> Documents { get; set; }
+        public string? FreeResponseText { get; set; }
+        public List<DocumentWithAnswerId>? Documents { get; set; }
         public bool Visible { get; set; }
     }
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityResponse.cs
@@ -18,12 +18,12 @@ public class MaturityResponse
         /// <summary>
         /// The name of the maturity model.
         /// </summary>
-        public string ModelName { get; set; }
+        public string ModelName { get; set; } = "";
 
         /// <summary>
         /// The name of the current grouping represented in the response;
         /// </summary>
-        public string Title { get; set; }
+        public string? Title { get; set; }
 
         /// <summary>
         /// Lists the display names of the maturity levels in this assessment's maturity model.
@@ -48,7 +48,7 @@ public class MaturityResponse
         /// <summary>
         /// If the maturity model refers to 'questions' by another name, this is that name.
         /// </summary>
-        public string QuestionsAlias { get; set; }
+        public string? QuestionsAlias { get; set; }
 
         /// <summary>
         /// The top level of groupings.  This will usually be Domains.