Merge pull request #217 from pkuehnel/develop

Develop
pkuehnel · Jul 30, 2022 · ec63136 · ec63136
2 parents bb2b8d6 + 3974e54
commit ec63136
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/TeslaSolarCharger/Server/Services/GridService.cs b/TeslaSolarCharger/Server/Services/GridService.cs
@@ -84,7 +84,7 @@ internal NodePatternType DecideNotePatternType(string? jsonPattern, string? xmlP
             pattern = xmlPattern;
         }
 
-        var power = (int?)GetValueFromResult(pattern, result, nodePatternType, false);
+        var power = (double?)GetValueFromResult(pattern, result, nodePatternType, false);
 
         return (int?)(power * (double)_configurationWrapper.CurrentInverterPowerCorrectionFactor());
     }

diff --git a/TeslaSolarCharger/Server/Services/PvValueService.cs b/TeslaSolarCharger/Server/Services/PvValueService.cs
@@ -48,11 +48,19 @@ await _telegramService.SendMessage(
         var inverterRequestUrl = _configurationWrapper.CurrentInverterPowerUrl();
         var inverterRequestHeaders = _configurationWrapper.CurrentInverterPowerHeaders();
 
+        var areInverterAndGridRequestUrlSame = string.Equals(gridRequestUrl, inverterRequestUrl,
+            StringComparison.InvariantCultureIgnoreCase);
+        _logger.LogTrace("inverter and grid request urls same: {value}", areInverterAndGridRequestUrlSame);
+
+        var areInverterAndGridHeadersSame = gridRequestHeaders.Count == inverterRequestHeaders.Count
+                && !gridRequestHeaders.Except(inverterRequestHeaders).Any();
+        _logger.LogTrace("inverter and grid headers same: {value}", areInverterAndGridHeadersSame);
+
         if (inverterRequestUrl != null
-            && (!string.Equals(gridRequestUrl, inverterRequestUrl, StringComparison.InvariantCultureIgnoreCase)
-                || !(gridRequestHeaders.Count == inverterRequestHeaders.Count
-                     && !gridRequestHeaders.Except(inverterRequestHeaders).Any())))
+            && (!areInverterAndGridRequestUrlSame
+                || !areInverterAndGridHeadersSame))
         {
+            _logger.LogTrace("Send another request for inverter power");
             httpResponse = await GetHttpResponse(inverterRequestUrl, inverterRequestHeaders).ConfigureAwait(false);
         }
 
@@ -79,6 +87,7 @@ await _telegramService.SendMessage(
 
     private async Task<HttpResponseMessage> GetHttpResponse(string? gridRequestUrl, Dictionary<string, string> requestHeaders)
     {
+        _logger.LogTrace("{method}({url}, {headers})", nameof(GetHttpResponse), gridRequestUrl, requestHeaders);
         if (string.IsNullOrEmpty(gridRequestUrl))
         {
             throw new ArgumentNullException(nameof(gridRequestUrl));