ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-02-16 10:58:32 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

Change value history to not group

Browse Source
This commit is contained in:
Chris Kaczor
2019-10-06 19:01:35 -04:00
parent 67aa3def4b
commit d593c0095f
4 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Weather/Service/Controllers/ReadingsController.cs
View File

@@ -33,9 +33,9 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers
} }
[HttpGet("value-history")] [HttpGet("value-history")]
public async Task<ActionResult<List<WeatherValue>>> GetValueHistory(WeatherValueType weatherValueType, DateTimeOffset start, DateTimeOffset end, int bucketMinutes = 2) public async Task<ActionResult<List<WeatherValue>>> GetValueHistory(WeatherValueType weatherValueType, DateTimeOffset start, DateTimeOffset end)
{ {
return (await _database.GetReadingValueHistory(weatherValueType, start, end, bucketMinutes)).ToList(); return (await _database.GetReadingValueHistory(weatherValueType, start, end)).ToList();
} }
[HttpGet("history-grouped")] [HttpGet("history-grouped")]

4
Weather/Service/Data/Database.cs
View File

@@ -98,7 +98,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
return await connection.QueryAsync<WeatherReading>(query, new { Start = start, End = end }); return await connection.QueryAsync<WeatherReading>(query, new { Start = start, End = end });
} }
public async Task<IEnumerable<WeatherValue>> GetReadingValueHistory(WeatherValueType weatherValueType, DateTimeOffset start, DateTimeOffset end, int bucketMinutes) public async Task<IEnumerable<WeatherValue>> GetReadingValueHistory(WeatherValueType weatherValueType, DateTimeOffset start, DateTimeOffset end)
{ {
await using var connection = CreateConnection(); await using var connection = CreateConnection();
@@ -106,7 +106,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
query = query.Replace("@Value", weatherValueType.ToString()); query = query.Replace("@Value", weatherValueType.ToString());
return await connection.QueryAsync<WeatherValue>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes }); return await connection.QueryAsync<WeatherValue>(query, new { Start = start, End = end });
} }
public async Task<IEnumerable<WeatherReadingGrouped>> GetReadingHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes) public async Task<IEnumerable<WeatherReadingGrouped>> GetReadingHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes)

14
Weather/Service/Data/Resources/GetReadingValueHistory.sql
View File

@@ -1,12 +1,4 @@
SELECT bucket, SELECT Timestamp,
AVG(Value) AS AverageValue
FROM (
SELECT CAST(FORMAT(Timestamp, 'yyyy-MM-ddTHH:') +
RIGHT('00' + CAST(DATEPART(MINUTE, Timestamp) / @BucketMinutes * @BucketMinutes AS VARCHAR), 2)
+ ':00+00:00' AS DATETIMEOFFSET) AS Bucket,
@Value AS Value @Value AS Value
FROM Reading FROM Reading
WHERE Timestamp BETWEEN @Start AND @End WHERE Timestamp BETWEEN @Start AND @End
) AS Data
GROUP BY Bucket
ORDER BY Bucket

4
Weather/Service/Models/WeatherValue.cs
View File

@@ -6,8 +6,8 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
[PublicAPI] [PublicAPI]
public class WeatherValue public class WeatherValue
{ {
public DateTimeOffset Bucket { get; set; } public DateTimeOffset Timestamp { get; set; }
public decimal AverageValue { get; set; } public decimal Value { get; set; }
} }
} }