mirror of
https://github.com/ckaczor/HomeMonitor.git
synced 2026-02-16 10:58:32 -05:00
Add endpoint to get several bucketed values
This commit is contained in:
@@ -37,5 +37,11 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers
|
|||||||
{
|
{
|
||||||
return (await _database.GetReadingValueHistory(weatherValueType, start, end, bucketMinutes)).ToList();
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -108,5 +108,15 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
|
|||||||
|
|
||||||
return await connection.QueryAsync<WeatherValue>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes });
|
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
20
Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql
Normal 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
21
Weather/Service/Models/WeatherReadingGrouped.cs
Normal 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; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="Data\Resources\CreateReading.sql" />
|
<None Remove="Data\Resources\CreateReading.sql" />
|
||||||
<None Remove="Data\Resources\GetReadingHistory.sql" />
|
<None Remove="Data\Resources\GetReadingHistory.sql" />
|
||||||
|
<None Remove="Data\Resources\GetReadingHistoryGrouped.sql" />
|
||||||
<None Remove="Data\Resources\GetReadingValueHistory.sql" />
|
<None Remove="Data\Resources\GetReadingValueHistory.sql" />
|
||||||
<None Remove="Data\Resources\GetRecentReading.sql" />
|
<None Remove="Data\Resources\GetRecentReading.sql" />
|
||||||
<None Remove="Data\Resources\Schema.sql" />
|
<None Remove="Data\Resources\Schema.sql" />
|
||||||
@@ -18,6 +19,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="Data\Resources\GetReadingHistory.sql" />
|
<EmbeddedResource Include="Data\Resources\GetReadingHistory.sql" />
|
||||||
|
<EmbeddedResource Include="Data\Resources\GetReadingHistoryGrouped.sql" />
|
||||||
<EmbeddedResource Include="Data\Resources\GetReadingValueHistory.sql" />
|
<EmbeddedResource Include="Data\Resources\GetReadingValueHistory.sql" />
|
||||||
<EmbeddedResource Include="Data\Resources\GetRecentReading.sql" />
|
<EmbeddedResource Include="Data\Resources\GetRecentReading.sql" />
|
||||||
<EmbeddedResource Include="Data\Resources\CreateReading.sql" />
|
<EmbeddedResource Include="Data\Resources\CreateReading.sql" />
|
||||||
|
|||||||
Reference in New Issue
Block a user