ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-13 17:22:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add grouped weather value API

Browse Source
This commit is contained in:
Chris Kaczor
2019-10-16 20:21:08 -04:00
parent 3abeca9a79
commit 1186f9179d
5 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,12 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers
return (await _database.GetReadingValueHistory(weatherValueType, start, end)).ToList();
}
[HttpGet("value-history-grouped")]
public async Task<ActionResult<List<WeatherValueGrouped>>> GetValueHistoryGrouped(WeatherValueType weatherValueType, DateTimeOffset start, DateTimeOffset end, int bucketMinutes = 2)
{
return (await _database.GetReadingValueHistoryGrouped(weatherValueType, start, end, bucketMinutes)).ToList();
}
[HttpGet("history-grouped")]
public async Task<ActionResult<List<WeatherReadingGrouped>>> GetHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes = 2)
{

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

@@ -109,6 +109,17 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
return await connection.QueryAsync<WeatherValue>(query, new { Start = start, End = end });
}
public async Task<IEnumerable<WeatherValueGrouped>> GetReadingValueHistoryGrouped(WeatherValueType weatherValueType, DateTimeOffset start, DateTimeOffset end, int bucketMinutes)
{
await using var connection = CreateConnection();
var query = ResourceReader.GetString("ChrisKaczor.HomeMonitor.Weather.Service.Data.Resources.GetReadingValueHistoryGrouped.sql");
query = query.Replace("@Value", weatherValueType.ToString());
return await connection.QueryAsync<WeatherValueGrouped>(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();

12
Weather/Service/Data/Resources/GetReadingValueHistoryGrouped.sql Normal file
View File

@@ -0,0 +1,12 @@
SELECT Bucket,
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
FROM Reading
WHERE Timestamp BETWEEN @Start AND @End
) AS Data
GROUP BY Bucket
ORDER BY Bucket

13
Weather/Service/Models/WeatherValueGrouped.cs Normal file
View File

@@ -0,0 +1,13 @@
using JetBrains.Annotations;
using System;
namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
{
[PublicAPI]
public class WeatherValueGrouped
{
public DateTimeOffset Bucket { get; set; }
public decimal AverageValue { get; set; }
}
}

2
Weather/Service/Service.csproj
View File

@@ -13,6 +13,7 @@
<None Remove="Data\Resources\GetReadingHistory.sql" />
<None Remove="Data\Resources\GetReadingHistoryGrouped.sql" />
<None Remove="Data\Resources\GetReadingValueHistory.sql" />
<None Remove="Data\Resources\GetReadingValueHistoryGrouped.sql" />
<None Remove="Data\Resources\GetRecentReading.sql" />
<None Remove="Data\Resources\GetWindHistoryGrouped.sql" />
<None Remove="Data\Resources\Schema.sql" />
@@ -21,6 +22,7 @@
<ItemGroup>
<EmbeddedResource Include="Data\Resources\GetReadingHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetReadingHistoryGrouped.sql" />
<EmbeddedResource Include="Data\Resources\GetReadingValueHistoryGrouped.sql" />
<EmbeddedResource Include="Data\Resources\GetReadingValueHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetRecentReading.sql" />
<EmbeddedResource Include="Data\Resources\CreateReading.sql" />