Merge pull request #10 from f2calv/alexv/fix-int-to-decimal-and-enum

add enum description for 3PInverterData - and fix datatype bugs

Author: SeanoNET

FroniusSolarClient/Entities/SolarAPI/V1/InverterRealtimeData/CommonInverterData.cs

@@ -13,7 +13,7 @@ public class CommonInverterData
         /// AC power 
         /// </summary>
         [JsonProperty("PAC")]
-        public UnitValue<int> AcPower { get; set; }
+        public UnitValue<decimal> AcPower { get; set; }
 
         /// <summary>
         /// AC current 

FroniusSolarClient/Entities/SolarAPI/V1/InverterRealtimeData/CumulationInverterData.cs

@@ -15,7 +15,7 @@ public class CumulationInverterData
         /// AC power 
         /// </summary>
         [JsonProperty("PAC")]
-        public UnitValue<int> AcPower { get; set; }
+        public UnitValue<decimal> AcPower { get; set; }
 
         /// <summary>
         ///  Energy generated on current day 

FroniusSolarClient/Entities/SolarAPI/V1/InverterRealtimeData/DataCollection.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Text;
 
 namespace FroniusSolarClient.Entities.SolarAPI.V1.InverterRealtimeData
@@ -9,6 +10,10 @@ public enum DataCollection
         CumulationInverterData,
         CommonInverterData,
         MinMaxInverterData,
+        /// <summary>
+        /// 3PInverterData, but Enum cannot start with number.
+        /// </summary>
+        [Description("3PInverterData")]
         P3InverterData
     }
 }

FroniusSolarClient/Extensions/EnumExtensions.cs

@@ -0,0 +1,29 @@
+using System;
+using System.ComponentModel;
+
+namespace FroniusSolarClient.Extensions
+{
+    public static class EnumHelper
+    {
+        public static string GetDescription<T>(this T enumValue)
+            where T : struct, IConvertible
+        {
+            if (!typeof(T).IsEnum)
+                return null;
+
+            var description = enumValue.ToString();
+            var fieldInfo = enumValue.GetType().GetField(enumValue.ToString());
+
+            if (fieldInfo != null)
+            {
+                var attrs = fieldInfo.GetCustomAttributes(typeof(DescriptionAttribute), true);
+                if (attrs != null && attrs.Length > 0)
+                {
+                    description = ((DescriptionAttribute)attrs[0]).Description;
+                }
+            }
+
+            return description;
+        }
+    }
+}

FroniusSolarClient/Services/InverterRealtimeDataService.cs

@@ -1,8 +1,7 @@
 using FroniusSolarClient.Entities.SolarAPI.V1;
 using FroniusSolarClient.Entities.SolarAPI.V1.InverterRealtimeData;
+using FroniusSolarClient.Extensions;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace FroniusSolarClient.Services
 {
@@ -13,12 +12,11 @@ internal class InverterRealtimeDataService : BaseDataService
     {
         private readonly string _cgi = "GetInverterRealtimeData.cgi";
 
-        public InverterRealtimeDataService(RestClient restClient) 
+        public InverterRealtimeDataService(RestClient restClient)
             : base(restClient)
         {
         }
 
-
         /// <summary>
         /// Builds the query string for the request
         /// </summary>
@@ -27,35 +25,34 @@ public InverterRealtimeDataService(RestClient restClient)
         protected string BuildQueryString(int deviceId, Scope scope, DataCollection dataCollection)
         {
             //TODO: Support list of string dictionary to build HTTP query string
-            return $"?Scope={scope}&DeviceId={deviceId}&DataCollection={dataCollection}";
+            return $"?Scope={scope}&DeviceId={deviceId}&DataCollection={dataCollection.GetDescription()}";
         }
 
         public Response<CumulationInverterData> GetCumulationInverterData(int deviceId = 1, Scope scope = Scope.Device)
         {
-            string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.CumulationInverterData);           
+            string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.CumulationInverterData);
             return GetDataServiceResponse<CumulationInverterData>(baseEndpointURL);
         }
 
         public Response<CommonInverterData> GetCommonInverterData(int deviceId = 1, Scope scope = Scope.Device)
         {
             string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.CommonInverterData);
-            return GetDataServiceResponse<CommonInverterData>(baseEndpointURL); 
+            return GetDataServiceResponse<CommonInverterData>(baseEndpointURL);
         }
 
-
-        public Response<P3InverterData> GetP3InverterData(int deviceId = 1, Scope scope = Scope.Device)
+        public Response<P3InverterData> Get3PInverterData(int deviceId = 1, Scope scope = Scope.Device)
         {
-            string param = $"?Scope={scope.ToString()}&DeviceId={deviceId}&DataCollection=P3InverterData";
-            string baseEndpointURL = _cgi + param;
+            string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.P3InverterData);
             return GetDataServiceResponse<P3InverterData>(baseEndpointURL);
         }
 
+        [Obsolete("use Get3PInverterData")]
+        public Response<P3InverterData> GetP3InverterData(int deviceId = 1, Scope scope = Scope.Device) => Get3PInverterData(deviceId, scope);
 
         public Response<MinMaxInverterData> GetMinMaxInverterData(int deviceId = 1, Scope scope = Scope.Device)
         {
             string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.MinMaxInverterData);
             return GetDataServiceResponse<MinMaxInverterData>(baseEndpointURL);
         }
-
     }
 }