ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-02-16 10:58:32 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

Tweaks to aggregation

Browse Source
This commit is contained in:
Chris Kaczor
2021-05-29 22:30:11 -04:00
parent 4cb2ebe75a
commit 70c73cc6b3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,9 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers
[HttpGet("aggregate")] [HttpGet("aggregate")]
public async Task<ActionResult<WeatherAggregate>> GetHistoryAggregate(DateTimeOffset start, DateTimeOffset end) public async Task<ActionResult<WeatherAggregate>> GetHistoryAggregate(DateTimeOffset start, DateTimeOffset end)
{ {
var readings = await _database.GetReadingHistory(start, end); var readings = (await _database.GetReadingHistory(start, end)).ToList();
return new WeatherAggregate(readings); return readings.Any() ? new WeatherAggregate(readings) : null;
} }
[HttpGet("value-history")] [HttpGet("value-history")]

9
Weather/Service/Models/WeatherAggregate.cs
View File

@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using ChrisKaczor.HomeMonitor.Weather.Models; using ChrisKaczor.HomeMonitor.Weather.Models;
using JetBrains.Annotations; using JetBrains.Annotations;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace ChrisKaczor.HomeMonitor.Weather.Service.Models namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
{ {
@@ -19,13 +21,14 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
public ReadingAggregate WindSpeed { get; set; } public ReadingAggregate WindSpeed { get; set; }
[JsonConverter(typeof(StringEnumConverter))]
public WindDirection WindDirectionAverage { get; set; } public WindDirection WindDirectionAverage { get; set; }
public decimal RainTotal { get; set; } public decimal RainTotal { get; set; }
private static readonly List<int> _windDirectionValues = ((WindDirection[])Enum.GetValues(typeof(WindDirection))).Select(e => (int)e).ToList(); private static readonly List<int> WindDirectionValues = ((WindDirection[])Enum.GetValues(typeof(WindDirection))).Select(e => (int)e).ToList();
public WeatherAggregate(IEnumerable<WeatherReading> readings) public WeatherAggregate(List<WeatherReading> readings)
{ {
if (!readings.Any()) if (!readings.Any())
return; return;
@@ -41,7 +44,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
WindSpeed = new ReadingAggregate(readings, r => r.WindSpeed, 1); WindSpeed = new ReadingAggregate(readings, r => r.WindSpeed, 1);
var windDirectionAverage = readings.Average(r => (decimal)r.WindDirection); var windDirectionAverage = readings.Average(r => (decimal)r.WindDirection);
WindDirectionAverage = (WindDirection)_windDirectionValues.Aggregate((x, y) => Math.Abs(x - windDirectionAverage) < Math.Abs(y - windDirectionAverage) ? x : y); WindDirectionAverage = (WindDirection)WindDirectionValues.Aggregate((x, y) => Math.Abs(x - windDirectionAverage) < Math.Abs(y - windDirectionAverage) ? x : y);
RainTotal = readings.Sum(r => r.Rain); RainTotal = readings.Sum(r => r.Rain);
} }