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

Rework wind history API

Browse Source
This commit is contained in:
Chris Kaczor
2019-10-11 16:26:21 -04:00
parent 7d1c3dced0
commit 618688ed08
8 changed files with 33 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,16 +44,10 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers
return (await _database.GetReadingHistoryGrouped(start, end, bucketMinutes)).ToList();
}
[HttpGet("wind-speed-history-grouped")]
public async Task<ActionResult<List<WindSpeedReadingGrouped>>> GetWindSpeedHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes = 2)
[HttpGet("wind-history-grouped")]
public async Task<ActionResult<List<WindHistoryGrouped>>> GetWindHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes = 60)
{
return (await _database.GetWindSpeedHistoryGrouped(start, end, bucketMinutes)).ToList();
}
[HttpGet("wind-direction-history-grouped")]
public async Task<ActionResult<List<WindDirectionReadingGrouped>>> GetWindDirectionHistoryGrouped(DateTimeOffset start, DateTimeOffset end)
{
return (await _database.GetWindDirectionHistoryGrouped(start, end)).ToList();
return (await _database.GetWindHistoryGrouped(start, end, bucketMinutes)).ToList();
}
}
}

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

@@ -118,22 +118,13 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
return await connection.QueryAsync<WeatherReadingGrouped>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes });
}
public async Task<IEnumerable<WindSpeedReadingGrouped>> GetWindSpeedHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes)
public async Task<IEnumerable<WindHistoryGrouped>> GetWindHistoryGrouped(DateTimeOffset start, DateTimeOffset end, int bucketMinutes)
{
await using var connection = CreateConnection();
var query = ResourceReader.GetString("ChrisKaczor.HomeMonitor.Weather.Service.Data.Resources.GetWindSpeedHistory.sql");
var query = ResourceReader.GetString("ChrisKaczor.HomeMonitor.Weather.Service.Data.Resources.GetWindHistoryGrouped.sql");
return await connection.QueryAsync<WindSpeedReadingGrouped>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes });
}
public async Task<IEnumerable<WindDirectionReadingGrouped>> GetWindDirectionHistoryGrouped(DateTimeOffset start, DateTimeOffset end)
{
await using var connection = CreateConnection();
var query = ResourceReader.GetString("ChrisKaczor.HomeMonitor.Weather.Service.Data.Resources.GetWindDirectionHistory.sql");
return await connection.QueryAsync<WindDirectionReadingGrouped>(query, new { Start = start, End = end });
return await connection.QueryAsync<WindHistoryGrouped>(query, new { Start = start, End = end, BucketMinutes = bucketMinutes });
}
}
}

5
Weather/Service/Data/Resources/GetWindDirectionHistory.sql
View File

@@ -1,5 +0,0 @@
SELECT WindDirection, COUNT(WindDirection) AS Count
FROM Reading
WHERE Timestamp BETWEEN @Start AND @End
AND WindDirection != -1
GROUP BY WindDirection

10
Weather/Service/Data/Resources/GetWindSpeedHistory.sql → Weather/Service/Data/Resources/GetWindHistoryGrouped.sql
View File

@@ -1,12 +1,14 @@
SELECT Bucket,
MIN(WindSpeed) AS Minimum,
AVG(WindSpeed) AS Average,
MAX(WindSpeed) AS Maximum
MIN(WindSpeed) AS MinimumSpeed,
AVG(WindSpeed) AS AverageSpeed,
MAX(WindSpeed) AS MaximumSpeed,
AVG(WindDirection) AS AverageDirection
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,
WindSpeed
WindSpeed,
WindDirection
FROM Reading
WHERE Timestamp BETWEEN @Start AND @End
) AS Data

12
Weather/Service/Models/WindDirectionReadingGrouped.cs
View File

@@ -1,12 +0,0 @@
using JetBrains.Annotations;
namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
{
[PublicAPI]
public class WindDirectionReadingGrouped
{
public int WindDirection { get; set; }
public int Count { get; set; }
}
}

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

@@ -0,0 +1,19 @@
using JetBrains.Annotations;
using System;
namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
{
[PublicAPI]
public class WindHistoryGrouped
{
public DateTimeOffset Bucket { get; set; }
public decimal MinimumSpeed { get; set; }
public decimal AverageSpeed { get; set; }
public decimal MaximumSpeed { get; set; }
public decimal AverageDirection { get; set; }
}
}

17
Weather/Service/Models/WindSpeedReadingGrouped.cs
View File

@@ -1,17 +0,0 @@
using JetBrains.Annotations;
using System;
namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
{
[PublicAPI]
public class WindSpeedReadingGrouped
{
public DateTimeOffset Bucket { get; set; }
public decimal Minimum { get; set; }
public decimal Average { get; set; }
public decimal Maximum { get; set; }
}
}

6
Weather/Service/Service.csproj
View File

@@ -14,9 +14,8 @@
<None Remove="Data\Resources\GetReadingHistoryGrouped.sql" />
<None Remove="Data\Resources\GetReadingValueHistory.sql" />
<None Remove="Data\Resources\GetRecentReading.sql" />
<None Remove="Data\Resources\GetWindHistoryGrouped.sql" />
<None Remove="Data\Resources\Schema.sql" />
<None Remove="Data\Resources\GetWindDirectionHistory.sql" />
<None Remove="Data\Resources\GetWindSpeedHistory.sql" />
</ItemGroup>
<ItemGroup>
@@ -26,8 +25,7 @@
<EmbeddedResource Include="Data\Resources\GetRecentReading.sql" />
<EmbeddedResource Include="Data\Resources\CreateReading.sql" />
<EmbeddedResource Include="Data\Resources\Schema.sql" />
<EmbeddedResource Include="Data\Resources\GetWindDirectionHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetWindSpeedHistory.sql" />
<EmbeddedResource Include="Data\Resources\GetWindHistoryGrouped.sql" />
</ItemGroup>
<ItemGroup>