Updated FroniusSolarClient and added GetPowerFlowRealtimeData

Author: SeanoNET

FroniusSolarApi.Poller/CLI/FetchPowerFlowRealtimeDataOptions.cs

@@ -0,0 +1,26 @@
+using CommandLine;
+using CommandLine.Text;
+using FroniusSolarClient.Entities.SolarAPI.V1;
+using FroniusSolarClient.Entities.SolarAPI.V1.InverterRealtimeData;
+using System.Collections.Generic;
+
+namespace FroniusSolarApi.Poller.CLI
+{
+    [Verb("fetchPowerFlow", HelpText = "Provides detailed information about the local energy grid.")]
+    internal class FetchPowerFlowRealtimeDataOptions : Options
+    {
+        [Option('s', longName: "Store", HelpText = "Where to save the data.", Required = true)]
+        public DataStore Store { get; set; }
+
+        [Usage(ApplicationAlias = "poller")]
+        public static IEnumerable<Example> Examples
+        {
+            get
+            {
+                return new List<Example>() {
+                new Example("Fetch GetPowerFlowRealtimeData and output to the console", new FetchPowerFlowRealtimeDataOptions { Store = DataStore.Console })
+            };
+            }
+        }
+    }
+}

FroniusSolarApi.Poller/FroniusSolarApi.Poller.csproj

@@ -4,16 +4,16 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <StartupObject>FroniusSolarApi.Poller.Program</StartupObject>
-    <AssemblyVersion>0.0.2.1</AssemblyVersion>
-    <FileVersion>0.0.2.1</FileVersion>
-    <Version>0.0.2</Version>
+    <AssemblyVersion>0.0.3.0</AssemblyVersion>
+    <FileVersion>0.0.3.0</FileVersion>
+    <Version>0.0.3</Version>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AssemblyName>SolarApiPoller</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.5.0" />
-    <PackageReference Include="FroniusSolarClient.Core" Version="0.2.0" />
+    <PackageReference Include="FroniusSolarClient.Core" Version="0.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />

FroniusSolarApi.Poller/PollerApp.cs

@@ -154,5 +154,40 @@ public int FetchAndSaveArchiveData(FetchInverterArchiveDataOptions opt)
                 return 1;
             }        
         }
-    }
+
+        public int FetchAndSavePowerFlowRealtimeData(FetchPowerFlowRealtimeDataOptions opt)
+        {
+            if (ConfigureRepository(opt.Store))
+            {
+                bool result = false;
+                try
+                {
+                    var powerFlowRealtimeDataResponse = _solarClient.GetPowerFlowRealtimeData();
+                    _logger.LogInformation($"Fetched PowerFlowRealtimeData - Status: {powerFlowRealtimeDataResponse.Head.Status.Code} at {powerFlowRealtimeDataResponse.Head.Timestamp}");
+                    result = _repositoryService.SaveData(powerFlowRealtimeDataResponse.Body.Data);
+
+                    if (result)
+                    {
+                        _logger.LogInformation($"Saved successfully");
+                        return 0;
+                    }
+                    else
+                    {
+                        _logger.LogError($"Save was unsuccessful");
+                        return 1;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "An error occured.");
+                    return 1;
+                }
+            }
+            else
+            {
+                // Configure repository failed
+                return 1;
+            }
+        }
+    } 
 }

FroniusSolarApi.Poller/Program.cs

@@ -54,11 +54,12 @@ static int Main(string[] args)
                 with.HelpWriter = null; 
             });
 
-            var result = parser.ParseArguments<FetchInverterRealtimeDataOptions, FetchInverterArchiveDataOptions, object>(args);
+            var result = parser.ParseArguments<FetchInverterRealtimeDataOptions, FetchInverterArchiveDataOptions, FetchPowerFlowRealtimeDataOptions, object>(args);
 
             return result.MapResult(
                         (FetchInverterRealtimeDataOptions opts) => poller.FetchAndSaveInverterRealtimeData(opts),
                         (FetchInverterArchiveDataOptions opts) => poller.FetchAndSaveArchiveData(opts),
+                        (FetchPowerFlowRealtimeDataOptions opts) => poller.FetchAndSavePowerFlowRealtimeData(opts),
                     errs => {
                         var helpText = HelpText.AutoBuild(result, h =>
                         {

FroniusSolarApi.Repository/Console/ConsoleRepository.cs

@@ -3,6 +3,7 @@
 using System.Text;
 using FroniusSolarClient.Entities.SolarAPI.V1.ArchiveData;
 using FroniusSolarClient.Entities.SolarAPI.V1.InverterRealtimeData;
+using FroniusSolarClient.Entities.SolarAPI.V1.PowerFlowRealtimeData;
 
 namespace FroniusSolarApi.Repository.ConsoleOut
 {
@@ -43,5 +44,11 @@ public bool SaveArchiveData(Dictionary<string, ArchiveData> data)
             return true;
         }
 
+        public bool SavePowerFlowRealtimeData(PowerFlowRealtimeData data)
+        {
+            var writer = new ConsoleWriter<PowerFlowRealtimeData>();
+            writer.WriteConsole(data);
+            return true;
+        }
     }
 }

FroniusSolarApi.Repository/Csv/CsvRepository.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using FroniusSolarClient.Entities.SolarAPI.V1.ArchiveData;
 using FroniusSolarClient.Entities.SolarAPI.V1.InverterRealtimeData;
+using FroniusSolarClient.Entities.SolarAPI.V1.PowerFlowRealtimeData;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
@@ -52,5 +53,10 @@ public bool SaveArchiveData(Dictionary<string, ArchiveData> data)
             return writer.WriteCsv(data, _csvConfiguration.GetSaveLocation("ArchiveData"));
         }
 
+        public bool SavePowerFlowRealtimeData(PowerFlowRealtimeData data)
+        {
+            var writer = new CsvWriter<PowerFlowRealtimeData>();
+            return writer.WriteCsv(data, _csvConfiguration.GetSaveLocation("PowerFlowRealtimeData"));
+        }
     }
 }

FroniusSolarApi.Repository/FroniusSolarApi.Repository.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FroniusSolarClient.Core" Version="0.2.0" />
+    <PackageReference Include="FroniusSolarClient.Core" Version="0.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />

FroniusSolarApi.Repository/IDataRepository.cs

@@ -1,5 +1,6 @@
 using FroniusSolarClient.Entities.SolarAPI.V1.ArchiveData;
 using FroniusSolarClient.Entities.SolarAPI.V1.InverterRealtimeData;
+using FroniusSolarClient.Entities.SolarAPI.V1.PowerFlowRealtimeData;
 using System;
 using System.Collections.Generic;
 
@@ -16,5 +17,7 @@ public interface IDataRepository
         bool SaveMinMaxInverterData(MinMaxInverterData data);
 
         bool SaveArchiveData(Dictionary<string, ArchiveData> data);
+
+        bool SavePowerFlowRealtimeData(PowerFlowRealtimeData data);
     }
 }

FroniusSolarApi.Repository/RepositoryService.cs

@@ -1,5 +1,6 @@
 using FroniusSolarClient.Entities.SolarAPI.V1.InverterRealtimeData;
 using FroniusSolarClient.Entities.SolarAPI.V1.ArchiveData;
+using FroniusSolarClient.Entities.SolarAPI.V1.PowerFlowRealtimeData;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
@@ -41,5 +42,10 @@ public bool SaveData(Dictionary<string, ArchiveData> data)
         {
             return _dataRepository.SaveArchiveData(data);
         }
+
+        public bool SaveData(PowerFlowRealtimeData data)
+        {
+            return _dataRepository.SavePowerFlowRealtimeData(data);
+        }
     }
 }