FulFillmentOutbound fixes + deprecation improvements

Author: R Hudylko

Source/FikaAmazonAPI.SampleCode/CatalogItemsSample.cs

@@ -1,4 +1,5 @@
 using FikaAmazonAPI.Utils;
+using System.ComponentModel;
 using static FikaAmazonAPI.Utils.Constants;
 
 namespace FikaAmazonAPI.SampleCode
@@ -12,7 +13,7 @@ public CatalogItemsSample(AmazonConnection amazonConnection)
         }
 
         [Obsolete("This method deprecated in June 2022. Please use GetCatalogItem(ParameterGetCatalogItem parameterListCatalogItem) instead.", true)]
-        public void GetCatalogItemAsync()
+		public void GetCatalogItemAsync()
         {
             var item = amazonConnection.CatalogItem.GetCatalogItem("B00CZC5F0G");
 
@@ -25,7 +26,7 @@ public void ListCatalogCategories()
         }
 
         [Obsolete("This method deprecated in June 2022. Please use SearchCatalogItems202204 instead.", true)]
-        public void ListCatalogItems()
+		public void ListCatalogItems()
         {
             var items = amazonConnection.CatalogItem.ListCatalogItems(new Parameter.CatalogItems.ParameterListCatalogItems()
             {

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/CreateFulfillmentOrderRequest.cs

@@ -11,6 +11,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Runtime.Serialization;
@@ -29,11 +30,19 @@ public partial class CreateFulfillmentOrderRequest : IEquatable<CreateFulfillmen
         /// </summary>
         /// <value>The shipping method for the fulfillment order.</value>
         [DataMember(Name = "shippingSpeedCategory", EmitDefaultValue = false)]
-        public string ShippingSpeedCategory { get; set; }
-        /// <summary>
-        /// Gets or Sets FulfillmentAction
-        /// </summary>
-        [DataMember(Name = "fulfillmentAction", EmitDefaultValue = false)]
+		[Obsolete("Use ShippingSpeedCategoryMethod instead")]
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public string ShippingSpeedCategory { get; set; }
+		public ShippingSpeedCategory ShippingSpeedCategoryMethod {
+#pragma warning disable 0618
+            get => (ShippingSpeedCategory)Enum.Parse(typeof(ShippingSpeedCategory), ShippingSpeedCategory, true);
+            set => ShippingSpeedCategory = value.ToString();
+#pragma warning restore 0618
+		}
+		/// <summary>
+		/// Gets or Sets FulfillmentAction
+		/// </summary>
+		[DataMember(Name = "fulfillmentAction", EmitDefaultValue = false)]
         public FulfillmentAction? FulfillmentAction { get; set; }
         /// <summary>
         /// Gets or Sets FulfillmentPolicy
@@ -63,7 +72,7 @@ public CreateFulfillmentOrderRequest() { }
         /// <param name="ShipFromCountryCode">The two-character country code for the country from which the fulfillment order ships. Must be in ISO 3166-1 alpha-2 format..</param>
         /// <param name="NotificationEmailList">NotificationEmailList.</param>
         /// <param name="Items">A list of items to include in the fulfillment order preview, including quantity. (required).</param>
-        public CreateFulfillmentOrderRequest(string MarketplaceId = default(string), string SellerFulfillmentOrderId = default(string), string DisplayableOrderId = default(string), DateTime DisplayableOrderDate = default(DateTime), string DisplayableOrderComment = default(string), string ShippingSpeedCategory = null, DeliveryWindow DeliveryWindow = default(DeliveryWindow), Address DestinationAddress = default(Address), FulfillmentAction? FulfillmentAction = default(FulfillmentAction?), FulfillmentPolicy? FulfillmentPolicy = default(FulfillmentPolicy?), string FulfillmentMethod = default(string), CODSettings CODSettings = default(CODSettings), string ShipFromCountryCode = default(string), NotificationEmailList NotificationEmails = default(NotificationEmailList), CreateFulfillmentOrderItemList Items = default(CreateFulfillmentOrderItemList))
+        public CreateFulfillmentOrderRequest(string MarketplaceId = default(string), string SellerFulfillmentOrderId = default(string), string DisplayableOrderId = default(string), DateTime? DisplayableOrderDate = default(DateTime?), string DisplayableOrderComment = default(string), string ShippingSpeedCategory = null, DeliveryWindow DeliveryWindow = default(DeliveryWindow), Address DestinationAddress = default(Address), FulfillmentAction? FulfillmentAction = default(FulfillmentAction?), FulfillmentPolicy? FulfillmentPolicy = default(FulfillmentPolicy?), string FulfillmentMethod = default(string), CODSettings CODSettings = default(CODSettings), string ShipFromCountryCode = default(string), NotificationEmailList NotificationEmails = default(NotificationEmailList), CreateFulfillmentOrderItemList Items = default(CreateFulfillmentOrderItemList))
         {
             // to ensure "SellerFulfillmentOrderId" is required (not null)
             if (SellerFulfillmentOrderId == null)
@@ -90,7 +99,7 @@ public CreateFulfillmentOrderRequest() { }
             }
             else
             {
-                this.DisplayableOrderDate = DisplayableOrderDate;
+                this.DisplayableOrderDate = DisplayableOrderDate.Value;
             }
             // to ensure "DisplayableOrderComment" is required (not null)
             if (DisplayableOrderComment == null)
@@ -108,10 +117,12 @@ public CreateFulfillmentOrderRequest() { }
             }
             else
             {
-                this.ShippingSpeedCategory = ShippingSpeedCategory;
-            }
-            // to ensure "DestinationAddress" is required (not null)
-            if (DestinationAddress == null)
+#pragma warning disable 0618
+				this.ShippingSpeedCategory = ShippingSpeedCategory;
+#pragma warning restore 0618
+			}
+			// to ensure "DestinationAddress" is required (not null)
+			if (DestinationAddress == null)
             {
                 throw new InvalidDataException("DestinationAddress is a required property for CreateFulfillmentOrderRequest and cannot be null");
             }
@@ -132,7 +143,6 @@ public CreateFulfillmentOrderRequest() { }
             this.DeliveryWindow = DeliveryWindow;
             this.FulfillmentAction = FulfillmentAction;
             this.FulfillmentPolicy = FulfillmentPolicy;
-            this.FulfillmentMethod = FulfillmentMethod;
             this.CODSettings = CODSettings;
             this.ShipFromCountryCode = ShipFromCountryCode;
             this.NotificationEmails = NotificationEmails;
@@ -189,13 +199,6 @@ public CreateFulfillmentOrderRequest() { }
 
 
 
-        /// <summary>
-        /// Indicates the intended recipient channel for the order.
-        /// </summary>
-        /// <value>Indicates the intended recipient channel for the order.</value>
-        [DataMember(Name = "FulfillmentMethod", EmitDefaultValue = false)]
-        public string FulfillmentMethod { get; set; }
-
         /// <summary>
         /// Gets or Sets CODSettings
         /// </summary>
@@ -235,12 +238,13 @@ public override string ToString()
             sb.Append("  DisplayableOrderId: ").Append(DisplayableOrderId).Append("\n");
             sb.Append("  DisplayableOrderDate: ").Append(DisplayableOrderDate).Append("\n");
             sb.Append("  DisplayableOrderComment: ").Append(DisplayableOrderComment).Append("\n");
-            sb.Append("  ShippingSpeedCategory: ").Append(ShippingSpeedCategory).Append("\n");
-            sb.Append("  DeliveryWindow: ").Append(DeliveryWindow).Append("\n");
+#pragma warning disable 0618
+			sb.Append("  ShippingSpeedCategory: ").Append(ShippingSpeedCategory).Append("\n");
+#pragma warning restore 0618
+			sb.Append("  DeliveryWindow: ").Append(DeliveryWindow).Append("\n");
             sb.Append("  DestinationAddress: ").Append(DestinationAddress).Append("\n");
             sb.Append("  FulfillmentAction: ").Append(FulfillmentAction).Append("\n");
             sb.Append("  FulfillmentPolicy: ").Append(FulfillmentPolicy).Append("\n");
-            sb.Append("  FulfillmentMethod: ").Append(FulfillmentMethod).Append("\n");
             sb.Append("  CODSettings: ").Append(CODSettings).Append("\n");
             sb.Append("  ShipFromCountryCode: ").Append(ShipFromCountryCode).Append("\n");
             sb.Append("  NotificationEmails: ").Append(NotificationEmails).Append("\n");
@@ -305,10 +309,12 @@ public bool Equals(CreateFulfillmentOrderRequest input)
                     this.DisplayableOrderComment.Equals(input.DisplayableOrderComment))
                 ) &&
                 (
-                    this.ShippingSpeedCategory == input.ShippingSpeedCategory ||
+#pragma warning disable 0618
+					this.ShippingSpeedCategory == input.ShippingSpeedCategory ||
                     (this.ShippingSpeedCategory != null &&
                     this.ShippingSpeedCategory.Equals(input.ShippingSpeedCategory))
-                ) &&
+#pragma warning restore 0618
+				) &&
                 (
                     this.DeliveryWindow == input.DeliveryWindow ||
                     (this.DeliveryWindow != null &&
@@ -329,11 +335,6 @@ public bool Equals(CreateFulfillmentOrderRequest input)
                     (this.FulfillmentPolicy != null &&
                     this.FulfillmentPolicy.Equals(input.FulfillmentPolicy))
                 ) &&
-                (
-                    this.FulfillmentMethod == input.FulfillmentMethod ||
-                    (this.FulfillmentMethod != null &&
-                    this.FulfillmentMethod.Equals(input.FulfillmentMethod))
-                ) &&
                 (
                     this.CODSettings == input.CODSettings ||
                     (this.CODSettings != null &&
@@ -375,18 +376,18 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.DisplayableOrderDate.GetHashCode();
                 if (this.DisplayableOrderComment != null)
                     hashCode = hashCode * 59 + this.DisplayableOrderComment.GetHashCode();
-                if (this.ShippingSpeedCategory != null)
+#pragma warning disable 0618
+				if (this.ShippingSpeedCategory != null)
                     hashCode = hashCode * 59 + this.ShippingSpeedCategory.GetHashCode();
-                if (this.DeliveryWindow != null)
+#pragma warning restore 0618
+				if (this.DeliveryWindow != null)
                     hashCode = hashCode * 59 + this.DeliveryWindow.GetHashCode();
                 if (this.DestinationAddress != null)
                     hashCode = hashCode * 59 + this.DestinationAddress.GetHashCode();
                 if (this.FulfillmentAction != null)
                     hashCode = hashCode * 59 + this.FulfillmentAction.GetHashCode();
                 if (this.FulfillmentPolicy != null)
                     hashCode = hashCode * 59 + this.FulfillmentPolicy.GetHashCode();
-                if (this.FulfillmentMethod != null)
-                    hashCode = hashCode * 59 + this.FulfillmentMethod.GetHashCode();
                 if (this.CODSettings != null)
                     hashCode = hashCode * 59 + this.CODSettings.GetHashCode();
                 if (this.ShipFromCountryCode != null)

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/FulfillmentPreviewShipment.cs

@@ -37,7 +37,7 @@ public FulfillmentPreviewShipment() { }
         /// <param name="EarliestArrivalDate">The earliest date that the shipment is expected to arrive at its destination. (required).</param>
         /// <param name="LatestArrivalDate">The latest date that the shipment is expected to arrive at its destination, in ISO 8601 date time format. (required).</param>
         /// <param name="FulfillmentPreviewItems">Information about the items in the shipment. (required).</param>
-        public FulfillmentPreviewShipment(Timestamp EarliestShipDate = default(Timestamp), Timestamp LatestShipDate = default(Timestamp), Timestamp EarliestArrivalDate = default(Timestamp), Timestamp LatestArrivalDate = default(Timestamp), FulfillmentPreviewItemList FulfillmentPreviewItems = default(FulfillmentPreviewItemList))
+        public FulfillmentPreviewShipment(DateTime? EarliestShipDate = default(DateTime?), DateTime? LatestShipDate = default(DateTime?), DateTime? EarliestArrivalDate = default(DateTime?), DateTime? LatestArrivalDate = default(DateTime?), FulfillmentPreviewItemList FulfillmentPreviewItems = default(FulfillmentPreviewItemList))
         {
             // to ensure "EarliestShipDate" is required (not null)
             if (EarliestShipDate == null)
@@ -46,7 +46,7 @@ public FulfillmentPreviewShipment() { }
             }
             else
             {
-                this.EarliestShipDate = EarliestShipDate;
+                this.EarliestShipDate = EarliestShipDate.Value;
             }
             // to ensure "LatestShipDate" is required (not null)
             if (LatestShipDate == null)
@@ -55,7 +55,7 @@ public FulfillmentPreviewShipment() { }
             }
             else
             {
-                this.LatestShipDate = LatestShipDate;
+                this.LatestShipDate = LatestShipDate.Value;
             }
             // to ensure "EarliestArrivalDate" is required (not null)
             if (EarliestArrivalDate == null)
@@ -64,7 +64,7 @@ public FulfillmentPreviewShipment() { }
             }
             else
             {
-                this.EarliestArrivalDate = EarliestArrivalDate;
+                this.EarliestArrivalDate = EarliestArrivalDate.Value;
             }
             // to ensure "LatestArrivalDate" is required (not null)
             if (LatestArrivalDate == null)
@@ -73,7 +73,7 @@ public FulfillmentPreviewShipment() { }
             }
             else
             {
-                this.LatestArrivalDate = LatestArrivalDate;
+                this.LatestArrivalDate = LatestArrivalDate.Value;
             }
             // to ensure "FulfillmentPreviewItems" is required (not null)
             if (FulfillmentPreviewItems == null)
@@ -91,28 +91,28 @@ public FulfillmentPreviewShipment() { }
         /// </summary>
         /// <value>The earliest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.</value>
         [DataMember(Name = "EarliestShipDate", EmitDefaultValue = false)]
-        public Timestamp EarliestShipDate { get; set; }
+        public DateTime EarliestShipDate { get; set; }
 
         /// <summary>
         /// The latest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.
         /// </summary>
         /// <value>The latest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.</value>
         [DataMember(Name = "LatestShipDate", EmitDefaultValue = false)]
-        public Timestamp LatestShipDate { get; set; }
+        public DateTime LatestShipDate { get; set; }
 
         /// <summary>
         /// The earliest date that the shipment is expected to arrive at its destination.
         /// </summary>
         /// <value>The earliest date that the shipment is expected to arrive at its destination.</value>
         [DataMember(Name = "EarliestArrivalDate", EmitDefaultValue = false)]
-        public Timestamp EarliestArrivalDate { get; set; }
+        public DateTime EarliestArrivalDate { get; set; }
 
         /// <summary>
         /// The latest date that the shipment is expected to arrive at its destination, in ISO 8601 date time format.
         /// </summary>
         /// <value>The latest date that the shipment is expected to arrive at its destination, in ISO 8601 date time format.</value>
         [DataMember(Name = "LatestArrivalDate", EmitDefaultValue = false)]
-        public Timestamp LatestArrivalDate { get; set; }
+        public DateTime LatestArrivalDate { get; set; }
 
         /// <summary>
         /// Information about the items in the shipment.

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/FulfillmentShipmentItem.cs

@@ -95,19 +95,27 @@ public FulfillmentShipmentItem() { }
         [DataMember(Name = "PackageNumber", EmitDefaultValue = false)]
         public int? PackageNumber { get; set; }
 
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
+		/// <summary>
+		/// The serial number of the shipped item.
+		/// </summary>
+		/// <value>The serial number of the shipped item.</value>
+		[DataMember(Name = "SerialNumber", EmitDefaultValue = false)]
+		public string SerialNumber { 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 FulfillmentShipmentItem {\n");
             sb.Append("  SellerSKU: ").Append(SellerSKU).Append("\n");
             sb.Append("  SellerFulfillmentOrderItemId: ").Append(SellerFulfillmentOrderItemId).Append("\n");
             sb.Append("  Quantity: ").Append(Quantity).Append("\n");
             sb.Append("  PackageNumber: ").Append(PackageNumber).Append("\n");
-            sb.Append("}\n");
+			sb.Append("  SerialNumber: ").Append(SerialNumber).Append("\n");
+			sb.Append("}\n");
             return sb.ToString();
         }
 
@@ -153,14 +161,18 @@ public bool Equals(FulfillmentShipmentItem input)
                 ) &&
                 (
                     this.Quantity == input.Quantity ||
-                    (this.Quantity != null &&
-                    this.Quantity.Equals(input.Quantity))
+                    (this.Quantity.Equals(input.Quantity))
                 ) &&
                 (
                     this.PackageNumber == input.PackageNumber ||
                     (this.PackageNumber != null &&
                     this.PackageNumber.Equals(input.PackageNumber))
-                );
+				) &&
+				(
+					this.SerialNumber == input.SerialNumber ||
+					(this.SerialNumber != null &&
+					this.SerialNumber.Equals(input.SerialNumber))
+				);
         }
 
         /// <summary>
@@ -176,11 +188,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.SellerSKU.GetHashCode();
                 if (this.SellerFulfillmentOrderItemId != null)
                     hashCode = hashCode * 59 + this.SellerFulfillmentOrderItemId.GetHashCode();
-                if (this.Quantity != null)
-                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
+                hashCode = hashCode * 59 + this.Quantity.GetHashCode();
                 if (this.PackageNumber != null)
                     hashCode = hashCode * 59 + this.PackageNumber.GetHashCode();
-                return hashCode;
+				if (this.SerialNumber != null)
+					hashCode = hashCode * 59 + this.SerialNumber.GetHashCode();
+				return hashCode;
             }
         }