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 some initial history APIs

Browse Source
This commit is contained in:
Chris Kaczor
2019-09-06 17:30:01 -04:00
parent 23d1e779c1
commit 1f1f54706c
6 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,8 @@
using System;
using ChrisKaczor.HomeMonitor.Weather.Models;
using ChrisKaczor.HomeMonitor.Weather.Models;
using ChrisKaczor.HomeMonitor.Weather.Service.Data;
using ChrisKaczor.HomeMonitor.Weather.Service.Models;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -30,5 +31,11 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers
{
return (await _database.GetReadingHistory(start, end)).ToList();
}
[HttpGet("value-history")]
public async Task<ActionResult<List<WeatherValue>>> GetValueHistory(WeatherValueType weatherValueType, DateTimeOffset start, DateTimeOffset end, int bucketMinutes = 2)
{
return (await _database.GetReadingValueHistory(weatherValueType, start, end, bucketMinutes)).ToList();
}
}
}

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

@@ -1,4 +1,5 @@
using ChrisKaczor.HomeMonitor.Weather.Models;
using ChrisKaczor.HomeMonitor.Weather.Service.Models;
using Dapper;
using Microsoft.Extensions.Configuration;
using System;
@@ -96,5 +97,16 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
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)
{
await using var connection = CreateConnection();
var query = ResourceReader.GetString("ChrisKaczor.HomeMonitor.Weather.Service.Data.Resources.GetReadingValueHistory.sql");
query = query.Replace("@Value", weatherValueType.ToString());
return await connection.QueryAsync<WeatherValue>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes });
}
}
}

12
Weather/Service/Data/Resources/GetReadingValueHistory.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/WeatherValue.cs Normal file
View File

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

19
Weather/Service/Models/WeatherValueType.cs Normal file
View File

@@ -0,0 +1,19 @@
using JetBrains.Annotations;
namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
{
[PublicAPI]
public enum WeatherValueType
{
WindSpeed,
Humidity,
HumidityTemperature,
Rain,
Pressure,
PressureTemperature,
BatteryLevel,
LightLevel,
Altitude,
SatelliteCount
}
}

2
Weather/Service/Service.csproj
View File

@@ -11,12 +11,14 @@
<ItemGroup>
<None Remove="Data\Resources\CreateReading.sql" />
<None Remove="Data\Resources\GetReadingHistory.sql" />
<None Remove="Data\Resources\GetReadingValueHistory.sql" />
<None Remove="Data\Resources\GetRecentReading.sql" />
<None Remove="Data\Resources\Schema.sql" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Data\Resources\GetReadingHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetReadingValueHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetRecentReading.sql" />
<EmbeddedResource Include="Data\Resources\CreateReading.sql" />
<EmbeddedResource Include="Data\Resources\Schema.sql" />