Merge pull request #66 from tougher/feature/monta-24-hours

MattJeanes · Oct 28, 2024 · 448b461 · 448b461
2 parents 6fb4d1d + 47f305e
commit 448b461
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/TeslaMateAgile.Tests/Services/MontaServiceTests.cs b/TeslaMateAgile.Tests/Services/MontaServiceTests.cs
@@ -56,7 +56,9 @@ public async Task GetCharges_ShouldIncludeChargePointIdQueryParameter_WhenSetInM
             _handler.SetupRequest(HttpMethod.Post, "https://public-api.monta.com/api/v1/auth/token")
                 .ReturnsResponse(JsonSerializer.Serialize(accessTokenResponse), "application/json");
 
-            _handler.SetupRequest(HttpMethod.Get, $"https://public-api.monta.com/api/v1/charges?state=completed&fromDate={from.UtcDateTime:o}&toDate={to.UtcDateTime:o}&chargePointId=123")
+            var fromDate = from.AddHours(MontaService.FetchHoursBeforeFrom).UtcDateTime;
+            var toDate = to.AddHours(MontaService.FetchHoursAfterTo).UtcDateTime;
+            _handler.SetupRequest(HttpMethod.Get, $"https://public-api.monta.com/api/v1/charges?state=completed&fromDate={fromDate:o}&toDate={toDate:o}&chargePointId=123")
                 .ReturnsResponse(JsonSerializer.Serialize(chargesResponse), "application/json");
 
             var charges = await _subject.GetCharges(from, to);
@@ -103,7 +105,9 @@ public async Task GetCharges_ShouldNotIncludeChargePointIdQueryParameter_WhenNot
             _handler.SetupRequest(HttpMethod.Post, "https://public-api.monta.com/api/v1/auth/token")
                 .ReturnsResponse(JsonSerializer.Serialize(accessTokenResponse), "application/json");
 
-            _handler.SetupRequest(HttpMethod.Get, $"https://public-api.monta.com/api/v1/charges?state=completed&fromDate={from.UtcDateTime:o}&toDate={to.UtcDateTime:o}")
+            var fromDate = from.AddHours(MontaService.FetchHoursBeforeFrom).UtcDateTime;
+            var toDate = to.AddHours(MontaService.FetchHoursAfterTo).UtcDateTime;
+            _handler.SetupRequest(HttpMethod.Get, $"https://public-api.monta.com/api/v1/charges?state=completed&fromDate={fromDate:o}&toDate={toDate:o}")
                 .ReturnsResponse(JsonSerializer.Serialize(chargesResponse), "application/json");
 
             var charges = await _subject.GetCharges(from, to);

diff --git a/TeslaMateAgile/Services/MontaService.cs b/TeslaMateAgile/Services/MontaService.cs
@@ -13,6 +13,9 @@ public class MontaService : IWholePriceDataService
         private readonly HttpClient _client;
         private readonly MontaOptions _options;
 
+        public const int FetchHoursBeforeFrom = -24;
+        public const int FetchHoursAfterTo = 24;
+
         public MontaService(HttpClient client, IOptions<MontaOptions> options)
         {
             _client = client;
@@ -53,6 +56,9 @@ private async Task<string> GetAccessToken()
 
         private async Task<Charge[]> GetCharges(string accessToken, DateTimeOffset from, DateTimeOffset to)
         {
+            from = from.AddHours(FetchHoursBeforeFrom);
+            to = to.AddHours(FetchHoursAfterTo);
+
             var requestUri = $"{_options.BaseUrl}/charges?state=completed&fromDate={from.UtcDateTime:o}&toDate={to.UtcDateTime:o}";
             if (_options.ChargePointId.HasValue)
             {