UNOV/mycorerepository
1
0
Fork 0
mirror of https://bitbucket.org/myhomie/mycorerepository.git synced 2025-12-06 01:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add actions to alarm detail + add device detail to automation detail

Browse Source
This commit is contained in:
Fransolet Thomas 2023-03-23 18:24:52 +01:00
parent 971aa63229
commit d212510392
6 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MyCore.Interfaces/DTO/MyControlPanel/AlarmModeDTO.cs
View File

@ -26,6 +26,7 @@ namespace MyCore.Interfaces.DTO
public class AlarmModeDetailDTO : AlarmModeDTO public class AlarmModeDetailDTO : AlarmModeDTO
{ {
public List<Trigger> Triggers { get; set; } public List<Trigger> Triggers { get; set; }
public List<MyCore.Interfaces.Models.Action> Actions { get; set; }
public List<DeviceDetailDTO> Devices { get; set; } public List<DeviceDetailDTO> Devices { get; set; }
public ProgrammedMode ProgrammedMode { get; set; } public ProgrammedMode ProgrammedMode { get; set; }
public GeolocalizedMode GeolocalizedMode { get; set; } public GeolocalizedMode GeolocalizedMode { get; set; }

1
MyCore.Interfaces/DTO/MyControlPanel/AutomationDTO.cs
View File

@ -22,5 +22,6 @@ namespace MyCore.Interfaces.DTO
public List<Condition> Conditions { get; set; } public List<Condition> Conditions { get; set; }
public List<MyCore.Interfaces.Models.Action> Actions { get; set; } public List<MyCore.Interfaces.Models.Action> Actions { get; set; }
public List<string> DevicesIds { get; set; } public List<string> DevicesIds { get; set; }
public List<DeviceDetailDTO> Devices { get; set; }
} }
} }

1
MyCore.Interfaces/Models/MyControlPanel/Database/AlarmMode.cs
View File

@ -100,6 +100,7 @@ namespace MyCore.Interfaces.Models
CreatedDate = CreatedDate, CreatedDate = CreatedDate,
UpdatedDate = UpdatedDate, UpdatedDate = UpdatedDate,
Triggers = Triggers, Triggers = Triggers,
Actions = Actions,
Devices = devicesDetail, Devices = devicesDetail,
ProgrammedMode = ProgrammedMode, ProgrammedMode = ProgrammedMode,
GeolocalizedMode = GeolocalizedMode GeolocalizedMode = GeolocalizedMode

5
MyCore.Interfaces/Models/MyControlPanel/Database/Automation.cs
View File

@ -58,7 +58,7 @@ namespace MyCore.Interfaces.Models
}; };
} }
public AutomationDetailDTO ToDetailDTO() public AutomationDetailDTO ToDetailDTO(List<DeviceDetailDTO> devicesDetail)
{ {
return new AutomationDetailDTO() return new AutomationDetailDTO()
{ {
@ -71,7 +71,8 @@ namespace MyCore.Interfaces.Models
Triggers = Triggers, Triggers = Triggers,
Conditions = Conditions, Conditions = Conditions,
Actions = Actions, Actions = Actions,
DevicesIds = DevicesIds DevicesIds = DevicesIds,
Devices = devicesDetail
}; };
} }
} }

16
MyCore/Controllers/AutomationController.cs
View File

@ -24,13 +24,15 @@ namespace MyCore.Service.Controllers
public class AutomationController : ControllerBase public class AutomationController : ControllerBase
{ {
private HomeDatabaseService _HomeDatabaseService; private HomeDatabaseService _HomeDatabaseService;
private DeviceDatabaseService _DeviceDatabaseService;
private AutomationDatabaseService _AutomationDatabaseService; private AutomationDatabaseService _AutomationDatabaseService;
private readonly IMqttClientService _mqttClientService; private readonly IMqttClientService _mqttClientService;
//private readonly IMqttOnlineClientService _mqttOnlineClientService; //private readonly IMqttOnlineClientService _mqttOnlineClientService;
public AutomationController(HomeDatabaseService homeDatabaseService, AutomationDatabaseService automationDatabaseService, MqttClientServiceProvider provider)//, MqttClientOnlineServiceProvider onlineProvider) public AutomationController(HomeDatabaseService homeDatabaseService, DeviceDatabaseService deviceDatabaseService, AutomationDatabaseService automationDatabaseService, MqttClientServiceProvider provider)//, MqttClientOnlineServiceProvider onlineProvider)
{ {
this._HomeDatabaseService = homeDatabaseService; this._HomeDatabaseService = homeDatabaseService;
this._DeviceDatabaseService = deviceDatabaseService;
this._AutomationDatabaseService = automationDatabaseService; this._AutomationDatabaseService = automationDatabaseService;
this._mqttClientService = provider.MqttClientService; this._mqttClientService = provider.MqttClientService;
//this._mqttOnlineClientService = onlineProvider.MqttOnlineClientService; //this._mqttOnlineClientService = onlineProvider.MqttOnlineClientService;
@ -80,7 +82,17 @@ namespace MyCore.Service.Controllers
if (automation == null) if (automation == null)
throw new KeyNotFoundException("Automation not found"); throw new KeyNotFoundException("Automation not found");
return new OkObjectResult(automation.ToDetailDTO()); List<Device> devices = new List<Device>();
foreach (var deviceId in automation.DevicesIds)
{
Device device = _DeviceDatabaseService.GetById(deviceId);
if (device != null)
{
devices.Add(device);
}
}
return new OkObjectResult(automation.ToDetailDTO(devices.Select(d => d.ToDTO()).ToList()));
} }
catch (ArgumentNullException ex) catch (ArgumentNullException ex)
{ {

10
MyCore/Services/AlarmService.cs
View File

@ -54,8 +54,12 @@ namespace MyCore.Service.Services
break; break;
} }
List<string> devicesIds = alarmModeCreateOrUpdateDetailDTO.Triggers.Select(t => t.DeviceId).ToList(); List<string> devicesIdsTriggers = alarmModeCreateOrUpdateDetailDTO.Triggers.Select(t => t.DeviceId).ToList();
alarmMode.DevicesIds = devicesIds; alarmMode.DevicesIds = devicesIdsTriggers;
List<string> devicesIdsActions = alarmModeCreateOrUpdateDetailDTO.Actions.Select(t => t.DeviceId).ToList();
alarmMode.DevicesIds.AddRange(devicesIdsActions);
if (create) if (create)
alarmMode = _AlarmDatabaseService.Create(alarmMode); alarmMode = _AlarmDatabaseService.Create(alarmMode);
else else
@ -63,7 +67,7 @@ namespace MyCore.Service.Services
// List devices for DTO (only) // List devices for DTO (only)
List<Device> devices = new List<Device>(); List<Device> devices = new List<Device>();
foreach (var deviceId in devicesIds) foreach (var deviceId in alarmMode.DevicesIds)
{ {
Device device = _DeviceDatabaseService.GetById(deviceId); Device device = _DeviceDatabaseService.GetById(deviceId);
if (device != null) if (device != null)