Merge branch 'main' of https://github.com/abuzuhri/Amazon-SP-API-CSharp

abuzuhri · abuzuhri · commit c1917bc30891 · 2024-12-16T18:07:24.000+01:00
diff --git a/Source/FikaAmazonAPI.SampleCode/FikaAmazonAPI.SampleCode.csproj b/Source/FikaAmazonAPI.SampleCode/FikaAmazonAPI.SampleCode.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="RestSharp" Version="111.2.0" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
     <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="111.2.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
diff --git a/Source/FikaAmazonAPI/FikaAmazonAPI.csproj b/Source/FikaAmazonAPI/FikaAmazonAPI.csproj
@@ -36,7 +36,7 @@
     <PackageReference Include="AWSSDK.SQS" Version="3.7.301.19" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="RestSharp" Version="111.2.0" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
     <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="111.2.0" />
     <PackageReference Include="StandardSocketsHttpHandler" Version="2.2.0.8" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
diff --git a/Source/FikaAmazonAPI/Parameter/CamelCaseAttribute.cs b/Source/FikaAmazonAPI/Parameter/CamelCaseAttribute.cs
@@ -0,0 +1,10 @@
+﻿using System;
+
+namespace FikaAmazonAPI.Parameter
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property)]
+    public class CamelCaseAttribute : Attribute
+    {
+    }
+
+}
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/ParameterGetLabels.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/ParameterGetLabels.cs
@@ -7,6 +7,8 @@ namespace FikaAmazonAPI.Parameter.FulFillmentInbound
     public class ParameterGetLabels : ParameterBased
     {
         public string MarketplaceId { get; set; }
+
+        [CamelCase]
         public string ShipmentId { get; set; }
         public PageType PageType { get; set; }
         public LabelType LabelType { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterConfirmPackingOption.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterConfirmPackingOption.cs
@@ -2,6 +2,7 @@
 
 namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterConfirmPackingOption : ParameterBased 
     {
         public string InboundPlanId { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListInboundPlanBase.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListInboundPlanBase.cs
@@ -1,5 +1,6 @@
 ﻿namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterListInboundPlanBase : PaginationParameter
     {
         public string InboundPlanId { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListInboundPlans.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListInboundPlans.cs
@@ -3,6 +3,7 @@
 
 namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterListInboundPlans : PaginationParameter
     {
         public string PaginationToken { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListPackingGroupBoxes.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListPackingGroupBoxes.cs
@@ -1,7 +1,8 @@
 ﻿namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterListPackingGroupBoxes : PaginationParameter
-    { 
+    {
         public string InboundPlanId { get; set; }
         public string PackingGroupId { get; set; }
         public string PaginationToken { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListPackingGroupItems.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListPackingGroupItems.cs
@@ -1,7 +1,8 @@
 ﻿namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterListPackingGroupItems : PaginationParameter
-    { 
+    {
         public string InboundPlanId { get; set; }
         public string PackingGroupId { get; set; }
         public string PaginationToken { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListPrepDetails.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListPrepDetails.cs
@@ -3,6 +3,7 @@
 
 namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterListPrepDetails : ParameterBased
     {
         public string MarketplaceId { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListShipmentBase.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListShipmentBase.cs
@@ -1,7 +1,8 @@
 ﻿namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterListShipmentBase : PaginationParameter
-    { 
+    {
         public string InboundPlanId { get; set; }
         public string ShipmentId { get; set; }
         public string PaginationToken { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListTransportationOptions.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterListTransportationOptions.cs
@@ -1,5 +1,6 @@
 ﻿namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterListTransportationOptions : PaginationParameter
     {
         public string PlacementOptionId { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterUpdateItemComplianceDetails.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParameterUpdateItemComplianceDetails.cs
@@ -2,6 +2,7 @@
 
 namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParameterUpdateItemComplianceDetails : ParameterBased
     {
         public string MarketplaceId { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParematerListItemComplianceDetails.cs b/Source/FikaAmazonAPI/Parameter/FulFillmentInbound/v20240320/ParematerListItemComplianceDetails.cs
@@ -3,6 +3,7 @@
 
 namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320
 {
+    [CamelCase]
     public class ParematerListItemComplianceDetails : ParameterBased
     {
         public ICollection<string> MSkus { get; set; }
diff --git a/Source/FikaAmazonAPI/Parameter/ParameterBased.cs b/Source/FikaAmazonAPI/Parameter/ParameterBased.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Xml.Linq;
 
 namespace FikaAmazonAPI.Search
 {
@@ -21,6 +22,9 @@ public class ParameterBased
 
         public virtual List<KeyValuePair<string, string>> getParameters()
         {
+            // Check if the class is marked with the CamelCase attribute
+            var isClassCamelCase = Attribute.IsDefined(this.GetType(), typeof(CamelCaseAttribute));
+
             List<KeyValuePair<string, string>> queryParameters = new List<KeyValuePair<string, string>>();
             if (!string.IsNullOrEmpty(TestCase))
             {
@@ -76,8 +80,9 @@ public virtual List<KeyValuePair<string, string>> getParameters()
                         output = JsonConvert.SerializeObject(value, settings);
                     }
 
-                    // Convert to cammelCase to avoid issues with properties not being properly mapped
-                    var propName = char.ToLowerInvariant(p.Name[0]) + p.Name.Substring(1);
+                    // Check if property should be converted to cammel case
+                    var isPropertyCamelCase = isClassCamelCase || Attribute.IsDefined(p, typeof(CamelCaseAttribute));
+                    var propName = isPropertyCamelCase ? char.ToLowerInvariant(p.Name[0]) + p.Name.Substring(1) : p.Name;
 
                     queryParameters.Add(new KeyValuePair<string, string>(propName, output));
                 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ namespace FikaAmazonAPI.Parameter.FulFillmentInbound`
`7`	`7`	`public class ParameterGetLabels : ParameterBased`
`8`	`8`	`{`
`9`	`9`	`public string MarketplaceId { get; set; }`
	`10`	`+`
	`11`	`+ [CamelCase]`
`10`	`12`	`public string ShipmentId { get; set; }`
`11`	`13`	`public PageType PageType { get; set; }`
`12`	`14`	`public LabelType LabelType { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320`
`4`	`4`	`{`
	`5`	`+ [CamelCase]`
`5`	`6`	`public class ParameterConfirmPackingOption : ParameterBased`
`6`	`7`	`{`
`7`	`8`	`public string InboundPlanId { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320`
`2`	`2`	`{`
	`3`	`+ [CamelCase]`
`3`	`4`	`public class ParameterListInboundPlanBase : PaginationParameter`
`4`	`5`	`{`
`5`	`6`	`public string InboundPlanId { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace FikaAmazonAPI.Parameter.FulFillmentInbound.v20240320`
`5`	`5`	`{`
	`6`	`+ [CamelCase]`
`6`	`7`	`public class ParameterListInboundPlans : PaginationParameter`
`7`	`8`	`{`
`8`	`9`	`public string PaginationToken { get; set; }`