ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-18 01:25:38 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

Add endpoint to get several bucketed values

Browse Source
This commit is contained in:
Chris Kaczor
2019-10-01 18:45:28 -04:00
parent 69b72e1435
commit 0ac5208409
5 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,5 +37,11 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers
{
return (await _database.GetReadingValueHistory(weatherValueType, start, end, bucketMinutes)).ToList();
}
[HttpGet("history-grouped")]
public async Task<ActionResult<List<WeatherReadingGrouped>>> GetHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes = 2)
{
return (await _database.GetReadingHistoryGrouped(start, end, bucketMinutes)).ToList();
}
}
}

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

@@ -108,5 +108,15 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
return await connection.QueryAsync<WeatherValue>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes });
}
public async Task<IEnumerable<WeatherReadingGrouped>> GetReadingHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes)
{
await using var connection = CreateConnection();
var query = ResourceReader.GetString("ChrisKaczor.HomeMonitor.Weather.Service.Data.Resources.GetReadingHistoryGrouped.sql");
return await connection.QueryAsync<WeatherReadingGrouped>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes });
}
}
}

20
Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql Normal file
View File

@@ -0,0 +1,20 @@
SELECT bucket,
AVG(HumidityTemperature) AS AverageHumidityTemperature,
AVG(Humidity) AS AverageHumidity,
AVG(PressureTemperature) AS AveragePressureTemperature,
AVG(Pressure) / 100 AS AveragePressure,
AVG(LightLevel) AS AverageLightLevel
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,
HumidityTemperature,
Humidity,
PressureTemperature,
Pressure,
LightLevel
FROM Reading
WHERE Timestamp BETWEEN @Start AND @End
) AS Data
GROUP BY Bucket
ORDER BY Bucket

21
Weather/Service/Models/WeatherReadingGrouped.cs Normal file
View File

@@ -0,0 +1,21 @@
using JetBrains.Annotations;
using System;
namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
{
[PublicAPI]
public class WeatherReadingGrouped
{
public DateTimeOffset Bucket { get; set; }
public decimal AverageHumidityTemperature { get; set; }
public decimal AverageHumidity { get; set; }
public decimal AveragePressureTemperature { get; set; }
public decimal AveragePressure { get; set; }
public decimal AverageLightLevel { get; set; }
}
}

2
Weather/Service/Service.csproj
View File

@@ -11,6 +11,7 @@
<ItemGroup>
<None Remove="Data\Resources\CreateReading.sql" />
<None Remove="Data\Resources\GetReadingHistory.sql" />
<None Remove="Data\Resources\GetReadingHistoryGrouped.sql" />
<None Remove="Data\Resources\GetReadingValueHistory.sql" />
<None Remove="Data\Resources\GetRecentReading.sql" />
<None Remove="Data\Resources\Schema.sql" />
@@ -18,6 +19,7 @@
<ItemGroup>
<EmbeddedResource Include="Data\Resources\GetReadingHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetReadingHistoryGrouped.sql" />
<EmbeddedResource Include="Data\Resources\GetReadingValueHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetRecentReading.sql" />
<EmbeddedResource Include="Data\Resources\CreateReading.sql" />