Merge pull request #775 from Baros6647/main

"Expiration" field for Item and ItemInput models changed to DateTime. Fixed GenerateShipmentContentUpdatePreviewsRequest model. An example of using the ItemInput model has been updated.

Author: abuzuhri

Source/FikaAmazonAPI.SampleCode/FulFillmentInboundv20240320Sample .cs

@@ -36,7 +36,8 @@ public void CreateShipmentPlan()
             oInboundShipmentPlanRequestItem.Quantity = 1;
             oInboundShipmentPlanRequestItem.LabelOwner = AmazonSpApiSDK.Models.FulfillmentInboundv20240320.LabelOwner.SELLER;
             oInboundShipmentPlanRequestItem.PrepOwner = AmazonSpApiSDK.Models.FulfillmentInboundv20240320.PrepOwner.SELLER;
-          
+            oInboundShipmentPlanRequestItem.Expiration = DateTime.Now.AddDays(110);
+
             var oResult = amazonConnection.FulFillmentInboundv20240320.CreateInboundPlan(oCreateInboundShipmentPlanRequest);
 
         }

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInboundv20240320/GenerateShipmentContentUpdatePreviewsRequest.cs

@@ -68,7 +68,7 @@ public GenerateShipmentContentUpdatePreviewsRequest() { }
         /// A list of all items that will be present in the shipment after the update.
         /// </summary>
         /// <value>A list of all items that will be present in the shipment after the update.</value>
-        [DataMember(Name= "items ", EmitDefaultValue=false)]
+        [DataMember(Name= "items", EmitDefaultValue=false)]
         public List<ItemInput> Items { get; set; }
 
         /// <summary>

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInboundv20240320/Item.cs

@@ -43,7 +43,7 @@ public Item() { }
         /// <param name="prepInstructions">Special preparations that are required for an item. (required).</param>
         /// <param name="quantity">The number of the specified MSKU. (required).</param>
         public Item(string asin = default(string),
-                    string expiration = default(string),
+                    DateTime? expiration = default(DateTime?),
                     string fnsku = default(string),
                     LabelOwner labelOwner = default(LabelOwner),
                     string manufacturingLotCode = default(string),
@@ -121,7 +121,7 @@ public Item() { }
         /// </summary>
         /// <value>The expiration date of the MSKU in ISO 8601 format. The same MSKU with different expiration dates cannot go into the same box.</value>
         [DataMember(Name="expiration", EmitDefaultValue=false)]
-        public string Expiration { get; set; }
+        public DateTime? Expiration { get; set; }
 
         /// <summary>
         /// A unique identifier assigned by Amazon to products stored in and fulfilled from an Amazon fulfillment center.
@@ -305,12 +305,6 @@ public override int GetHashCode()
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Asin, length must be greater than 1.", new [] { "Asin" });
             }
 
-            // Expiration (string) pattern
-            Regex regexExpiration = new Regex(@"^([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$", RegexOptions.CultureInvariant);
-            if (false == regexExpiration.Match(this.Expiration).Success)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Expiration, must match a pattern of " + regexExpiration, new [] { "Expiration" });
-            }
 
             // Fnsku (string) maxLength
             if(this.Fnsku != null && this.Fnsku.Length > 10)

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInboundv20240320/ItemInput.cs

@@ -8,6 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
+using FikaAmazonAPI.Utils;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -39,7 +40,7 @@ public ItemInput() { }
         /// <param name="msku">The merchant SKU. (required).</param>
         /// <param name="prepOwner">In some situations, special preparations are required for items and this field reflects the owner of the preparations. Options include AMAZON, SELLER or NONE. (required).</param>
         /// <param name="quantity">The number of units of the specified MSKU that will be shipped. (required).</param>
-        public ItemInput(string expiration = default(string),
+        public ItemInput(DateTime? expiration = default(DateTime?),
                          LabelOwner labelOwner = default(LabelOwner),
                          string manufacturingLotCode = default(string),
                          string msku = default(string),
@@ -90,8 +91,10 @@ public ItemInput() { }
         /// The expiration date of the MSKU in ISO 8601 format. The same MSKU with different expiration dates cannot go into the same box.
         /// </summary>
         /// <value>The expiration date of the MSKU in ISO 8601 format. The same MSKU with different expiration dates cannot go into the same box.</value>
+        [JsonConverter(typeof(Iso8601DateConverter))]
         [DataMember(Name="expiration", EmitDefaultValue=false)]
-        public string Expiration { get; set; }
+
+        public DateTime? Expiration { get; set; }
 
         /// <summary>
         /// Specifies who will label the items. Options include AMAZON, SELLER or NONE.
@@ -238,12 +241,6 @@ public override int GetHashCode()
         /// <returns>Validation Result</returns>
         IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
         {
-            // Expiration (string) pattern
-            Regex regexExpiration = new Regex(@"^([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$", RegexOptions.CultureInvariant);
-            if (false == regexExpiration.Match(this.Expiration).Success)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Expiration, must match a pattern of " + regexExpiration, new [] { "Expiration" });
-            }
 
             // ManufacturingLotCode (string) maxLength
             if(this.ManufacturingLotCode != null && this.ManufacturingLotCode.Length > 256)

Source/FikaAmazonAPI/Utils/JsonConverters.cs

@@ -7,4 +7,12 @@ public Iso8601DateTimeConverter()
             base.DateTimeFormat = "yyyy-MM-ddTHH:mm:ssZ";
         }
     }
+
+    class Iso8601DateConverter : Newtonsoft.Json.Converters.IsoDateTimeConverter
+    {
+        public Iso8601DateConverter()
+        {
+            base.DateTimeFormat = "yyyy-MM-dd";
+        }
+    }
 }