From 8e92490c8f6bafb9f5bc5cc95e793ae9eef5140d Mon Sep 17 00:00:00 2001 From: Tijmen van Nesselrooij Date: Sun, 3 Sep 2023 11:59:56 +0200 Subject: [PATCH] Use date only for days endpoint model --- src/Electricity.Api/Models/Day.cs | 6 +++--- src/Electricity.Api/Services/ElectricityService.cs | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Electricity.Api/Models/Day.cs b/src/Electricity.Api/Models/Day.cs index a51ff5b..c704fea 100644 --- a/src/Electricity.Api/Models/Day.cs +++ b/src/Electricity.Api/Models/Day.cs @@ -2,19 +2,19 @@ using Electricity.Api.Extensions; namespace Electricity.Api.Models; -public record Day(uint DateTime, double TotalPowerUse, double TotalPowerReturn, double TotalGasUse) +public record Day(string Date, double TotalPowerUse, double TotalPowerReturn, double TotalGasUse) { public static Day Empty(DateOnly date) { return new Day( - date.ToDateTime(new TimeOnly(0, 0), DateTimeKind.Utc).ToEpoch(), + date.ToString(Constants.isoDateFormat), 0, 0, 0); } public static Day FromEntity(Entities.ElectricityLog entity) { return new Day( - DateTime: entity.GetDateTime().ToEpoch(), + Date: entity.Date, TotalPowerUse: entity.TotalPowerConsumptionDay + entity.TotalPowerConsumptionNight, TotalPowerReturn: entity.TotalPowerReturnDay + entity.TotalPowerReturnNight, TotalGasUse: entity.GasConsumptionInCubicMeters diff --git a/src/Electricity.Api/Services/ElectricityService.cs b/src/Electricity.Api/Services/ElectricityService.cs index 7fcea70..5e4e5bb 100644 --- a/src/Electricity.Api/Services/ElectricityService.cs +++ b/src/Electricity.Api/Services/ElectricityService.cs @@ -56,9 +56,8 @@ public class ElectricityService } var lastAsModel = Day.FromEntity(last); - // TODO fix UTC issues here (just return the date, don't use timestamps) return new Day( - lastAsModel.DateTime, + lastAsModel.Date, lastAsModel.TotalPowerUse - firstAsModel.TotalPowerUse, lastAsModel.TotalPowerReturn - firstAsModel.TotalPowerReturn, lastAsModel.TotalGasUse - firstAsModel.TotalGasUse