Fix for Database Conversion Executables

udotdevelopment · Nov 28, 2018 · d0ba0b6 · d0ba0b6
1 parent be0b833
commit d0ba0b6
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 36 deletions.
diff --git a/Database Conversion Executable/Caseiro.Mvc.PagedList.dll b/Database Conversion Executable/Caseiro.Mvc.PagedList.dll
diff --git a/Database Conversion Executable/ConvertDBForHistoricalConfigurations.exe b/Database Conversion Executable/ConvertDBForHistoricalConfigurations.exe
diff --git a/Database Conversion Executable/MOE.Common.dll b/Database Conversion Executable/MOE.Common.dll
diff --git a/MOE.Common/Business/WatchDog/WatchDogScan.cs b/MOE.Common/Business/WatchDog/WatchDogScan.cs
@@ -418,37 +418,37 @@ private string SortAndAddToMessage(ConcurrentBag<SPMWatchDogErrorEvent> errors)
             var ErrorMessage = "";
             foreach (var error in SortedErrors)
             {
-                if (!Settings.EmailAllErrors)
-                {
-                    //List<SPMWatchDogErrorEvent> RecordsFromTheDayBefore = new List<SPMWatchDogErrorEvent>();
-                    //compare to error log to see if this was failing yesterday
-                    if (Settings.WeekdayOnly && ScanDate.DayOfWeek == DayOfWeek.Monday)
-                        RecordsFromTheDayBefore =
-                            watchDogErrorEventRepository.GetSPMWatchDogErrorEventsBetweenDates(ScanDate.AddDays(-3),
-                                ScanDate.AddDays(-2).AddMinutes(-1));
-                    else
-                        RecordsFromTheDayBefore =
-                            watchDogErrorEventRepository.GetSPMWatchDogErrorEventsBetweenDates(ScanDate.AddDays(-1),
-                                ScanDate.AddMinutes(-1));
-                }
-                if (Settings.EmailAllErrors || FindMatchingErrorInErrorTable(error) == false )
-                {
-                    var signalRepository = SignalsRepositoryFactory.Create();
-                    var signal = signalRepository.GetLatestVersionOfSignalBySignalID(error.SignalID);
-                    //   Add to email if it was not failing yesterday
-                    ErrorMessage += error.SignalID;
-                    ErrorMessage += " - ";
-                    ErrorMessage += signal.PrimaryName;
-                    ErrorMessage += " & ";
-                    ErrorMessage += signal.SecondaryName;
-                    if (error.Phase > 0)
-                    {
-                        ErrorMessage += " - Phase ";
-                        ErrorMessage += error.Phase;
-                    }
-                    ErrorMessage += " (" + error.Message + ")";
-                    ErrorMessage += "\n";
-                }
+                //if (!Settings.EmailAllErrors)
+                //{
+                //    //List<SPMWatchDogErrorEvent> RecordsFromTheDayBefore = new List<SPMWatchDogErrorEvent>();
+                //    //compare to error log to see if this was failing yesterday
+                //    if (Settings.WeekdayOnly && ScanDate.DayOfWeek == DayOfWeek.Monday)
+                //        RecordsFromTheDayBefore =
+                //            watchDogErrorEventRepository.GetSPMWatchDogErrorEventsBetweenDates(ScanDate.AddDays(-3),
+                //                ScanDate.AddDays(-2).AddMinutes(-1));
+                //    else
+                //        RecordsFromTheDayBefore =
+                //            watchDogErrorEventRepository.GetSPMWatchDogErrorEventsBetweenDates(ScanDate.AddDays(-1),
+                //                ScanDate.AddMinutes(-1));
+                //}
+                //if (Settings.EmailAllErrors || FindMatchingErrorInErrorTable(error) == false )
+                //{
+                //    var signalRepository = SignalsRepositoryFactory.Create();
+                //    var signal = signalRepository.GetLatestVersionOfSignalBySignalID(error.SignalID);
+                //    //   Add to email if it was not failing yesterday
+                //    ErrorMessage += error.SignalID;
+                //    ErrorMessage += " - ";
+                //    ErrorMessage += signal.PrimaryName;
+                //    ErrorMessage += " & ";
+                //    ErrorMessage += signal.SecondaryName;
+                //    if (error.Phase > 0)
+                //    {
+                //        ErrorMessage += " - Phase ";
+                //        ErrorMessage += error.Phase;
+                //    }
+                //    ErrorMessage += " (" + error.Message + ")";
+                //    ErrorMessage += "\n";
+                //}
             }
             try
             {

diff --git a/MOE.Common/Migrations/201709281716540_DataAggregation.cs b/MOE.Common/Migrations/201709281716540_DataAggregation.cs
@@ -19,7 +19,7 @@ public override void Up()
             DropIndex("dbo.ApproachRouteDetail", new[] { "ApproachID" });
             DropIndex("dbo.Detectors", "IX_DetectorIDUnique");
             DropIndex("dbo.SPMWatchDogErrorEvents", new[] { "SignalID" });
-            DropPrimaryKey("Signals", "PK_Signals");
+            DropPrimaryKey("Signals", "PK_dbo.Signals");
 
             //}
 

diff --git a/MOE.Common/Migrations/Configuration.cs b/MOE.Common/Migrations/Configuration.cs
@@ -1034,7 +1034,7 @@ We estimate that each signal will generate 11.4 MB of data per day.
                     ScanDayStartHour = 1,
                     WeekdayOnly = true,
                     MaximumPedestrianEvents = 200,
-                    EmailAllErrors = false
+                   // EmailAllErrors = false
                 }
             );
 

diff --git a/MOE.Common/Models/WatchDogApplicationSettings.cs b/MOE.Common/Models/WatchDogApplicationSettings.cs
@@ -48,8 +48,8 @@ public class WatchDogApplicationSettings : ApplicationSettings
 
         [Display(Name = "Ped Actuations Threshold (Ped Alarm)")]
         public int MaximumPedestrianEvents { get; set; }
-        [Display(Name = "Email All Watch Dog Errors")]
-        public bool EmailAllErrors { get; set; }
+        //[Display(Name = "Email All Watch Dog Errors")]
+        //public bool EmailAllErrors { get; set; }
 
         //public WatchDogApplicationSettings()
         //{

diff --git a/SPM/Controllers/AggregateDataExportController.cs b/SPM/Controllers/AggregateDataExportController.cs
@@ -10,7 +10,7 @@
 using System.Web.Mvc;
 using System.Web.UI.DataVisualization.Charting;
 using System.Xml;
-using Ionic.Zip;
+//using Ionic.Zip;
 using MOE.Common.Business;
 using MOE.Common.Business.Bins;
 using MOE.Common.Business.FilterExtensions;