From c7f4805332b03fe952e7f93995449bce2ccd0622 Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Thu, 10 Jan 2019 10:10:56 +0100
Subject: [PATCH] Fix alarms filter, removed "type" field added "sources" field

---
 Step.Database/Controllers/AlarmsController.cs             | 4 ++--
 Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs | 2 +-
 Step/Controllers/WebApi/ApiAlarmController.cs             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Step.Database/Controllers/AlarmsController.cs b/Step.Database/Controllers/AlarmsController.cs
index 87a0b57b..e594ba71 100644
--- a/Step.Database/Controllers/AlarmsController.cs
+++ b/Step.Database/Controllers/AlarmsController.cs
@@ -28,7 +28,7 @@ namespace Step.Database.Controllers
             dbCtx.Dispose();
         }
 
-        public List<DTOAlarmHistoricModel> GetPaginatedWithFilter(string title, List<ALARM_TYPE> types, int page, int pageSize, DateTime startDate, DateTime endDate, List<int?> userIds, Dictionary<int, string> plcMessages)
+        public List<DTOAlarmHistoricModel> GetPaginatedWithFilter(string title, List<ALARM_SOURCE> sources, int page, int pageSize, DateTime startDate, DateTime endDate, List<int?> userIds, Dictionary<int, string> plcMessages)
         {
             bool ifNoUser = false;
             var index = userIds.IndexOf(-1);
@@ -55,7 +55,7 @@ namespace Step.Database.Controllers
                 .Include("Users")   
                 .Where(x =>
                     x.TimeStamp >= startDate && x.TimeStamp <= endDate // Filter by date
-                    && types.Contains(x.Type) // Type
+                    && sources.Contains(x.Source) // Check source
                     && ( (ifNoUser && x.Users.Count() == 0) || x.Users.Any(y => userIds.Any(z => z == y.UserId))) // Check user
                     && 
                     ((x.Source == ALARM_SOURCE.NC && ncAlarmDescIds.Contains(x.AlarmDescriptionId.Value)) // Check if message is contained in NC messages
diff --git a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
index a7cbeca7..53e1c9a5 100644
--- a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
+++ b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
@@ -65,7 +65,7 @@ namespace Step.Model.DTOModels.AlarmModels
         public string Title { get; set; }
 
         [Required]
-        public List<ALARM_TYPE> Type { get; set; }
+        public List<ALARM_SOURCE> Sources { get; set; }
 
         [Required]
         public DateTime? StartDate { get; set; }
diff --git a/Step/Controllers/WebApi/ApiAlarmController.cs b/Step/Controllers/WebApi/ApiAlarmController.cs
index 7339ad19..735d3c59 100644
--- a/Step/Controllers/WebApi/ApiAlarmController.cs
+++ b/Step/Controllers/WebApi/ApiAlarmController.cs
@@ -34,7 +34,7 @@ namespace Step.Controllers.WebApi
 
             using (AlarmsController alarm = new AlarmsController())
             {
-                var alarms = alarm.GetPaginatedWithFilter(filter.Title, filter.Type, filter.Page, filter.PageSize, filter.StartDate.Value, filter.EndDate, filter.UserIds, plcMessages);
+                var alarms = alarm.GetPaginatedWithFilter(filter.Title, filter.Sources, filter.Page, filter.PageSize, filter.StartDate.Value, filter.EndDate, filter.UserIds, plcMessages);
 
                 return Ok(alarms);
             }