Merge pull request #884 from TManITtech/main

Author: abuzuhri

Source/FikaAmazonAPI.SampleCode/FeedsSample.cs

@@ -230,7 +230,7 @@ public async Task SubmitFeedPRICING_JSONAsync(string SKU, decimal PRICE, decimal
 
         }
 
-        public async Task SubmitInventoryJSON_Async(string SKU, int quantity, DateTime? restockDate = null)
+        public async Task SubmitInventoryJSON_Async(string SKU, int quantity, int? leadTimeToShip = null, DateTime? restockDate = null)
         {
             ConstructJSONFeedService createDocument = new ConstructJSONFeedService(amazonConnection.GetCurrentSellerID);
 
@@ -239,6 +239,7 @@ public async Task SubmitInventoryJSON_Async(string SKU, int quantity, DateTime?
             {
                 SKU = SKU,
                 Quantity = quantity,
+                FulfillmentLatency = leadTimeToShip.HasValue ? leadTimeToShip.Value.ToString() : null,
                 RestockDate = restockDate
             };
 
@@ -250,7 +251,27 @@ public async Task SubmitInventoryJSON_Async(string SKU, int quantity, DateTime?
             string feedID = await amazonConnection.Feed.SubmitFeedAsync(jsonString, FeedType.JSON_LISTINGS_FEED, null, null, ContentType.JSON);
 
             await GetJsonFeedDetails(feedID);
+        }
+
+        public async Task SubmitMerchantShippingGroupJSON_Async(string sku, string merchant_shipping_group_id)
+        {
+            ConstructJSONFeedService createDocument = new ConstructJSONFeedService(amazonConnection.GetCurrentSellerID);
+
+            var list = new List<MerchantShippingGroupMessage>();
+            var msg = new MerchantShippingGroupMessage()
+            {
+                SKU = sku, 
+                MerchantShippingGroupId = merchant_shipping_group_id
+            };
 
+            list.Add(msg);
+            createDocument.AddMerchantShippingGroupMessage(list);
+
+            var jsonString = createDocument.GetJSON();
+
+            string feedID = await amazonConnection.Feed.SubmitFeedAsync(jsonString, FeedType.JSON_LISTINGS_FEED, null, null, ContentType.JSON);
+
+            await GetJsonFeedDetails(feedID);
         }
 
         public async Task SubmitFeedPricingWithSalePrice(string sku, decimal price, decimal salePrice, DateTime startDate, DateTime endDate)

Source/FikaAmazonAPI.SampleCode/MerchantShippingTemplateSample.cs

@@ -0,0 +1,47 @@
+
+using FikaAmazonAPI.ConstructFeed.Messages;
+using FikaAmazonAPI.Parameter.ListingItem;
+using FikaAmazonAPI.Parameter.ProductTypes;
+using FikaAmazonAPI.Utils;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace FikaAmazonAPI.SampleCode
+{
+    public class MerchantShippingTemplateSample
+    {
+        private readonly AmazonConnection _amazonConnection;
+
+        public MerchantShippingTemplateSample(AmazonConnection amazonConnection)
+        {
+            _amazonConnection = amazonConnection;
+        }
+
+        public async Task PopulateMerchantShippingGroupNamesKeys()
+        {
+            var parameter = new GetDefinitionsProductTypeParameter()
+            {
+                sellerId = _amazonConnection.GetCurrentSellerID,
+                marketplaceIds = new List<string>() { MarketPlace.US.ID },
+                productTypeVersion = "LATEST",
+                requirements = Requirements.LISTING,
+                locale = AmazonSpApiSDK.Models.ProductTypes.LocaleEnum.en_US,
+                version = "LATEST",
+                productType = "PRODUCT",
+            };
+
+            await _amazonConnection.MerchantShippingTemplate.PopulateMerchantShippingGroupNamesKeysAsync(parameter);
+
+            Console.WriteLine($"MerchantShippingGroupNamesKeys populated successfully with {MerchantShippingGroupMessage.MerchantShippingGroupNamesKeys.Count} shipping templates.");
+
+            if (MerchantShippingGroupMessage.MerchantShippingGroupNamesKeys.Count > 0)
+            {
+                foreach (var template in MerchantShippingGroupMessage.MerchantShippingGroupNamesKeys)
+                {
+                    Console.WriteLine($"MerchantShippingTemplate: '{template.Key}': '{template.Value}'");
+                }
+            }
+        }
+    }
+} 

Source/FikaAmazonAPI/AmazonConnection.cs

@@ -5,6 +5,8 @@
 using System;
 using System.Globalization;
 using System.Threading;
+using System.Net.Http;
+using static FikaAmazonAPI.Utils.Constants;
 
 namespace FikaAmazonAPI
 {
@@ -49,7 +51,9 @@ public class AmazonConnection
         public VendorDirectFulfillmentOrderService VendorDirectFulfillmentOrders => this._VendorDirectFulfillmentOrders ?? throw _NoCredentials;
         public VendorOrderService VendorOrders => this._VendorOrders ?? throw _NoCredentials;
         public VendorDirectFulfillmentInventoryService VendorDirectFulfillmentInventory => this._VendorDirectFulfillmentInventory ?? throw _NoCredentials;
-        public VendorTransactionStatusService VendorTransactionStatus => this._VendorTransactionStatus ?? throw _NoCredentials;
+        public VendorTransactionStatusService VendorTransactionStatus => this._VendorTransactionStatus ?? throw _NoCredentials;        
+        public MerchantShippingTemplateService MerchantShippingTemplate => this._MerchantShippingTemplate ?? throw _NoCredentials;
+
 
         private AppIntegrationsServiceV20240401 _AppIntegrationsServiceV20240401 { get; set; }
         private OrderService _Orders { get; set; }
@@ -89,6 +93,7 @@ public class AmazonConnection
         private VendorOrderService _VendorOrders { get; set; }
         private VendorTransactionStatusService _VendorTransactionStatus { get; set; }
         private VendorDirectFulfillmentInventoryService _VendorDirectFulfillmentInventory { get; set; }
+        private MerchantShippingTemplateService _MerchantShippingTemplate { get; set; }
 
         private UnauthorizedAccessException _NoCredentials = new UnauthorizedAccessException($"Error, you cannot make calls to Amazon without credentials!");
 
@@ -154,6 +159,7 @@ private void Init(AmazonCredential Credentials)
             this._VendorOrders = new VendorOrderService(this.Credentials, _loggerFactory);
             this._VendorTransactionStatus = new VendorTransactionStatusService(this.Credentials, _loggerFactory);
             this._VendorDirectFulfillmentInventory = new VendorDirectFulfillmentInventoryService(this.Credentials, _loggerFactory);
+            this._MerchantShippingTemplate = new MerchantShippingTemplateService(this.Credentials, _loggerFactory);
 
             AmazonCredential.DebugMode = this.Credentials.IsDebugMode;
         }

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ProductTypes/SchemaLink.cs

@@ -1,3 +1,4 @@
+using FikaAmazonAPI.AmazonSpApiSDK.Models.Solicitations;
 using Newtonsoft.Json;
 using System;
 using System.Runtime.Serialization;
@@ -18,7 +19,7 @@ public class SchemaLink
         /// <value>Link to retrieve the schema.</value>
         [DataMember(Name = "link", EmitDefaultValue = false)]
         [JsonProperty(PropertyName = "link")]
-        public Object Link { get; set; }
+        public SchemaLinkObject Link { get; set; }
 
         /// <summary>
         /// Checksum hash of the schema (Base64 MD5). Can be used to verify schema contents, identify changes between schema versions, and for caching.
@@ -51,6 +52,48 @@ public string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
+    }
+
+    [DataContract]
+    public class SchemaLinkObject
+    {
+        /// <summary>
+        /// A URI for this object.
+        /// </summary>
+        /// <value>A URI for this object.</value>
+        [DataMember(Name = "resource", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "resource")]
+        public string ResourceUrl { get; set; }
+
+        /// <summary>
+        /// The HTTP Verb Method to use when calling the resource url.
+        /// </summary>
+        /// <value>The HTTP Verb Method to use when calling the resource url.</value>
+        [DataMember(Name = "verb", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "verb")]
+        public string Verb { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class " + nameof(SchemaLinkObject) + " {\n");
+            sb.Append("  ResourceUrl: ").Append(ResourceUrl).Append("\n");
+            sb.Append("  Verb: ").Append(Verb).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
 
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
     }
 }

Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/LWAClient.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics;
 
 namespace FikaAmazonAPI.AmazonSpApiSDK.Runtime
 {
@@ -67,7 +68,7 @@ public virtual async Task<TokenResponse> GetAccessTokenAsync(CancellationToken c
                 if (!IsSuccessful(response))
                 {
                     var message = string.IsNullOrEmpty(response.ErrorMessage)
-                        ? "Unsuccessful LWA token exchange"
+                        ? $"Unsuccessful LWA token exchange: {response.Content}"
                         : $"Unsuccessful LWA token exchange: {response.ErrorMessage}";
                     throw new IOException(message);
                 }
@@ -77,7 +78,8 @@ public virtual async Task<TokenResponse> GetAccessTokenAsync(CancellationToken c
             }
             catch (Exception e)
             {
-                throw new SystemException("Error getting LWA Access Token", e);
+                //Debug.WriteLine(e.Message + Environment.NewLine + e.InnerException?.Message);
+                throw new SystemException("Error getting LWA Access Token!", e);
             }
         }
 

Source/FikaAmazonAPI/ConstructFeed/ConstructJSONFeedService.cs

@@ -137,7 +137,37 @@ public void AddInventoryMessage(IList<InventoryMessage> messages)
                         {
                             op = "replace",
                             path = "/attributes/fulfillment_availability",
-                            value =new List<PatcheValueData>{ patcheValueData }
+                            value = new List<PatcheValueData>{ patcheValueData }
+                        }
+                    }
+                };
+
+                jsonMessagesData.messages.Add(msg);
+            }
+        }
+
+        public void AddMerchantShippingGroupMessage(IList<MerchantShippingGroupMessage> messages)
+        {
+            int index = jsonMessagesData.messages.Count;
+            foreach (var itm in messages)
+            {
+                var msg = new MessagesData()
+                {
+                    messageId = ++index,
+                    sku = itm.SKU,
+                    operationType = "PATCH",
+                    productType = "PRODUCT",
+                    patches = new List<PatcheData>{
+                        new PatcheData()
+                        {
+                            op = "replace",
+                            path = "/attributes/merchant_shipping_group",
+                            value = new List<PatcheValueData>{
+                                new PatcheValueData()
+                                {
+                                    value = itm.MerchantShippingGroupId
+                                }
+                            }
                         }
                     }
                 };

Source/FikaAmazonAPI/ConstructFeed/Messages/MerchantShippingGroupMessage.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+
+namespace FikaAmazonAPI.ConstructFeed.Messages
+{
+    public class MerchantShippingGroupMessage
+    {
+        /// A dictionary containing all the possible Merchant Shipping Groups. 
+        /// The dict keys = the merchant_shipping_group_name. The dict values = merchant_shipping_group enum id key.
+        /// This is meant to be set once (in the beginning) and it will reuse it every time.
+        public static Dictionary<string, string> MerchantShippingGroupNamesKeys { get; set; }
+
+        public string SKU { get; set; }
+
+        public string MerchantShippingGroupId { get; set; }
+
+        private string merchant_shipping_group_name;
+        public string MerchantShippingGroupName
+        {
+            get => merchant_shipping_group_name;
+            set
+            {
+                merchant_shipping_group_name = value;
+
+                if (MerchantShippingGroupNamesKeys?.ContainsKey(value) == true)
+                {
+                    MerchantShippingGroupId = MerchantShippingGroupNamesKeys[value];
+                }
+                else if (MerchantShippingGroupNamesKeys?.Count > 0)
+                {
+                    MerchantShippingGroupId = null;
+                    throw new Exception($"Merchant Shipping Group Id not found for '{MerchantShippingGroupName}'!");
+                }
+            } 
+        
+        }
+    }
+}

Source/FikaAmazonAPI/Parameter/ProductTypes/GetDefinitionsProductTypeParameter.cs

@@ -12,6 +12,7 @@ public class GetDefinitionsProductTypeParameter : ParameterBased
         public string sellerId { get; set; }
         public ICollection<string> marketplaceIds { get; set; } = new List<string>();
         public string productTypeVersion { get; set; }
+        public string version { get; set; }
         public Requirements? requirements { get; set; }
         public RequirementsEnforcedEnum? requirementsEnforced { get; set; }
         public LocaleEnum? locale { get; set; }

Source/FikaAmazonAPI/Services/MerchantShippingTemplateService.cs

@@ -0,0 +1,81 @@
+
+using FikaAmazonAPI.AmazonSpApiSDK.Models.ProductTypes;
+using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
+using FikaAmazonAPI.ConstructFeed.Messages;
+using FikaAmazonAPI.Parameter.ProductTypes;
+using FikaAmazonAPI.Utils;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using RestSharp;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using static FikaAmazonAPI.Utils.Constants;
+
+namespace FikaAmazonAPI.Services
+{
+    public class MerchantShippingTemplateService : RequestService
+    { 
+        private readonly HttpClient _httpClient = new HttpClient();
+        private ProductTypeService _ProductType;
+
+        public MerchantShippingTemplateService(AmazonCredential amazonCredential, ILoggerFactory? loggerFactory) : base(amazonCredential, loggerFactory)
+        {
+            this._ProductType = new ProductTypeService(amazonCredential, loggerFactory);
+        }
+
+
+        public Dictionary<string, string> GetMerchantShippingTemplates(GetDefinitionsProductTypeParameter parameter) =>
+            Task.Run(() => GetMerchantShippingTemplatesAsync(parameter)).ConfigureAwait(false).GetAwaiter().GetResult();
+
+        public async Task<Dictionary<string, string>> GetMerchantShippingTemplatesAsync(GetDefinitionsProductTypeParameter parameter, CancellationToken cancellationToken = default)
+        {
+            var productTypeDefinition = await _ProductType.GetDefinitionsProductTypeAsync(parameter, cancellationToken);
+
+            if (productTypeDefinition.Schema == null || string.IsNullOrEmpty(productTypeDefinition.Schema.Link.ResourceUrl))
+            {
+                throw new Exception("Could not retrieve schema link resource url from the Product Type Definition!");
+            }
+
+            var schemaUrl = productTypeDefinition.Schema.Link.ResourceUrl;
+            var schemaJson = await _httpClient.GetStringAsync(schemaUrl);
+            var schema = JObject.Parse(schemaJson);
+
+            var shippingGroup = schema["properties"]?["merchant_shipping_group"];
+            if (shippingGroup == null)
+            {
+                return new Dictionary<string, string>(); // Or throw an exception if this is unexpected
+            }
+
+            var valueProperties = shippingGroup["items"]?["properties"]?["value"];
+            if (valueProperties == null)
+            {
+                return new Dictionary<string, string>();
+            }
+
+            var enums = valueProperties["enum"]?.ToObject<List<string>>();
+            var enumNames = valueProperties["enumNames"]?.ToObject<List<string>>();
+
+            if (enums == null || enumNames == null || enums.Count() != enumNames.Count())
+            {
+                return new Dictionary<string, string>(); // Data is not as expected
+            }
+
+            var merchantShippingGroups = Enumerable.Range(0, enums.Count()).ToDictionary(i => enumNames[i], i => enums[i]);
+
+            return merchantShippingGroups;
+        }        
+
+        public async Task PopulateMerchantShippingGroupNamesKeysAsync(GetDefinitionsProductTypeParameter parameter, CancellationToken cancellationToken = default)
+        {
+            var merchantShippingGroups = await GetMerchantShippingTemplatesAsync(parameter, cancellationToken);
+            MerchantShippingGroupMessage.MerchantShippingGroupNamesKeys = merchantShippingGroups;
+        }
+    }
+} 

Source/FikaAmazonAPI/Services/ProductTypeService.cs

@@ -30,8 +30,8 @@ public async Task<ProductTypeList> SearchDefinitionsProductTypesAsync(SearchDefi
 
 
         public ProductTypeDefinition GetDefinitionsProductType(GetDefinitionsProductTypeParameter parameter) =>
-            Task.Run(() => SearchDefinitionsProductTypesAsync(parameter)).ConfigureAwait(false).GetAwaiter().GetResult();
-        public async Task<ProductTypeDefinition> SearchDefinitionsProductTypesAsync(GetDefinitionsProductTypeParameter parameter, CancellationToken cancellationToken = default)
+            Task.Run(() => GetDefinitionsProductTypeAsync(parameter)).ConfigureAwait(false).GetAwaiter().GetResult();
+        public async Task<ProductTypeDefinition> GetDefinitionsProductTypeAsync(GetDefinitionsProductTypeParameter parameter, CancellationToken cancellationToken = default)
         {
             if (parameter.marketplaceIds == null || parameter.marketplaceIds.Count == 0)
                 parameter.marketplaceIds.Add(AmazonCredential.MarketPlace.ID);