diff --git a/src/DevicesRestApi/Controllers/ClustersController.cs b/src/DevicesRestApi/Controllers/ClustersController.cs index 24f40a4..51e44a3 100644 --- a/src/DevicesRestApi/Controllers/ClustersController.cs +++ b/src/DevicesRestApi/Controllers/ClustersController.cs @@ -23,8 +23,8 @@ public class ClustersController : ControllerBase } [HttpGet] - [Route("~/clusters/{clusterName}/schedules")] - public IActionResult GetClusterSchedules(string clusterName) + [Route("~/clusters/{clusterName}")] + public IActionResult GetCluster(string clusterName) { _clusterConfigurationFile = null; try { @@ -48,7 +48,7 @@ public class ClustersController : ControllerBase return new NotFound("Configuration file not found"); } - var schedule = new List(); + var schedules = new List(); using (StreamReader reader = new StreamReader(filePath)) { @@ -56,7 +56,7 @@ public class ClustersController : ControllerBase while ((line = reader.ReadLine()) != null) { var s = line.Split(','); - schedule.Add( + schedules.Add( new MeasuringEvent() { Day = (MeasuringDay)int.Parse(s[0]), Time = s[1] @@ -68,14 +68,14 @@ public class ClustersController : ControllerBase return new Ok( new{ name = clusterName, - schedule = schedule, + schedules = schedules, } ); } [HttpPost] - [Route("~/clusters/{clusterName}/schedules")] - public IActionResult UpdateClusterSchedules(string clusterName, UpdateScheduleRequest request) + [Route("~/clusters/{clusterName}")] + public IActionResult UpdateCluster(string clusterName, UpdateClusterRequest request) { var message = "Cluster updated"; _clusterConfigurationFile = null; @@ -92,13 +92,13 @@ public class ClustersController : ControllerBase _clusterConfigurationFile.Create(); message = "Cluster created"; } - if (request.Schedule?.Count > 0) + if (request.Schedules?.Count > 0) { var filePath = _clusterConfigurationFile.GetFilePath(); using (StreamWriter writer = new StreamWriter(filePath)) { foreach ( - var e in request.Schedule.OrderBy(s => s.Day).ThenBy( + var e in request.Schedules.OrderBy(s => s.Day).ThenBy( s => TimeSpan.Parse(s.Time) ) ) { diff --git a/src/DevicesRestApi/Helpers/UpdateClusterRequest.cs b/src/DevicesRestApi/Helpers/UpdateClusterRequest.cs new file mode 100644 index 0000000..a7dcbc0 --- /dev/null +++ b/src/DevicesRestApi/Helpers/UpdateClusterRequest.cs @@ -0,0 +1,6 @@ +namespace DevicesRestApi.Helpers; + +public class UpdateClusterRequest +{ + public List? Schedules { get; set; } +} \ No newline at end of file diff --git a/src/DevicesRestApi/Helpers/UpdateScheduleRequest.cs b/src/DevicesRestApi/Helpers/UpdateScheduleRequest.cs deleted file mode 100644 index 2deb646..0000000 --- a/src/DevicesRestApi/Helpers/UpdateScheduleRequest.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace DevicesRestApi.Helpers; - -public class UpdateScheduleRequest -{ - public List? Schedule { get; set; } -} \ No newline at end of file