Skip to content

Commit 1fd8d6a

Browse files
author
R Hudylko
committed
Deprecated FulfillmentMethod and Timestamp instead of deleting
1 parent e0f42a0 commit 1fd8d6a

File tree

5 files changed

+240
-89
lines changed

5 files changed

+240
-89
lines changed

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ public CreateFulfillmentOrderRequest() { }
7272
/// <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>
7373
/// <param name="NotificationEmailList">NotificationEmailList.</param>
7474
/// <param name="Items">A list of items to include in the fulfillment order preview, including quantity. (required).</param>
75-
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))
75+
[Obsolete("FulfillmentMethod no longer used and ShippingSpeedCategory is deprecated, use the other constructor instead")]
76+
[EditorBrowsable(EditorBrowsableState.Never)]
77+
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))
7678
{
7779
// to ensure "SellerFulfillmentOrderId" is required (not null)
7880
if (SellerFulfillmentOrderId == null)
@@ -147,6 +149,10 @@ public CreateFulfillmentOrderRequest() { }
147149
this.ShipFromCountryCode = ShipFromCountryCode;
148150
this.NotificationEmails = NotificationEmails;
149151
}
152+
#pragma warning disable 0618
153+
public CreateFulfillmentOrderRequest(string MarketplaceId = default(string), string SellerFulfillmentOrderId = default(string), string DisplayableOrderId = default(string), DateTime? DisplayableOrderDate = default(DateTime?), string DisplayableOrderComment = default(string), ShippingSpeedCategory? ShippingSpeedCategory = default(ShippingSpeedCategory?), DeliveryWindow DeliveryWindow = default(DeliveryWindow), Address DestinationAddress = default(Address), FulfillmentAction? FulfillmentAction = default(FulfillmentAction?), FulfillmentPolicy? FulfillmentPolicy = default(FulfillmentPolicy?), CODSettings CODSettings = default(CODSettings), string ShipFromCountryCode = default(string), NotificationEmailList NotificationEmails = default(NotificationEmailList), CreateFulfillmentOrderItemList Items = default(CreateFulfillmentOrderItemList))
154+
: this(MarketplaceId, SellerFulfillmentOrderId, DisplayableOrderId, DisplayableOrderDate, DisplayableOrderComment, ShippingSpeedCategory?.ToString(), DeliveryWindow, DestinationAddress, FulfillmentAction, FulfillmentPolicy, null, CODSettings, ShipFromCountryCode, NotificationEmails, Items) { }
155+
#pragma warning restore 0618
150156

151157
/// <summary>
152158
/// The marketplace the fulfillment order is placed against.
@@ -199,10 +205,19 @@ public CreateFulfillmentOrderRequest() { }
199205

200206

201207

202-
/// <summary>
203-
/// Gets or Sets CODSettings
204-
/// </summary>
205-
[DataMember(Name = "codSettings", EmitDefaultValue = false)]
208+
/// <summary>
209+
/// Indicates the intended recipient channel for the order.
210+
/// </summary>
211+
/// <value>Indicates the intended recipient channel for the order.</value>
212+
[DataMember(Name = "FulfillmentMethod", EmitDefaultValue = false)]
213+
[Obsolete("Property no longer used")]
214+
[EditorBrowsable(EditorBrowsableState.Never)]
215+
public string FulfillmentMethod { get; set; }
216+
217+
/// <summary>
218+
/// Gets or Sets CODSettings
219+
/// </summary>
220+
[DataMember(Name = "codSettings", EmitDefaultValue = false)]
206221
public CODSettings CODSettings { get; set; }
207222

208223
/// <summary>

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

Lines changed: 62 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Newtonsoft.Json;
1212
using System;
1313
using System.Collections.Generic;
14+
using System.ComponentModel;
1415
using System.ComponentModel.DataAnnotations;
1516
using System.IO;
1617
using System.Runtime.Serialization;
@@ -46,7 +47,7 @@ public FulfillmentPreviewShipment() { }
4647
}
4748
else
4849
{
49-
this.EarliestShipDate = EarliestShipDate.Value;
50+
this.EarliestShipDateTime = EarliestShipDate.Value;
5051
}
5152
// to ensure "LatestShipDate" is required (not null)
5253
if (LatestShipDate == null)
@@ -55,7 +56,7 @@ public FulfillmentPreviewShipment() { }
5556
}
5657
else
5758
{
58-
this.LatestShipDate = LatestShipDate.Value;
59+
this.LatestShipDateTime = LatestShipDate.Value;
5960
}
6061
// to ensure "EarliestArrivalDate" is required (not null)
6162
if (EarliestArrivalDate == null)
@@ -64,7 +65,7 @@ public FulfillmentPreviewShipment() { }
6465
}
6566
else
6667
{
67-
this.EarliestArrivalDate = EarliestArrivalDate.Value;
68+
this.EarliestArrivalDateTime = EarliestArrivalDate.Value;
6869
}
6970
// to ensure "LatestArrivalDate" is required (not null)
7071
if (LatestArrivalDate == null)
@@ -73,7 +74,7 @@ public FulfillmentPreviewShipment() { }
7374
}
7475
else
7576
{
76-
this.LatestArrivalDate = LatestArrivalDate.Value;
77+
this.LatestArrivalDateTime = LatestArrivalDate.Value;
7778
}
7879
// to ensure "FulfillmentPreviewItems" is required (not null)
7980
if (FulfillmentPreviewItems == null)
@@ -85,40 +86,56 @@ public FulfillmentPreviewShipment() { }
8586
this.FulfillmentPreviewItems = FulfillmentPreviewItems;
8687
}
8788
}
89+
[Obsolete("Timestamp is no longer used, use the other constructor")]
90+
[EditorBrowsable(EditorBrowsableState.Never)]
91+
public FulfillmentPreviewShipment(Timestamp EarliestShipDate = default(Timestamp), Timestamp LatestShipDate = default(Timestamp), Timestamp EarliestArrivalDate = default(Timestamp), Timestamp LatestArrivalDate = default(Timestamp), FulfillmentPreviewItemList FulfillmentPreviewItems = default(FulfillmentPreviewItemList))
92+
: this(DateTime.MinValue, DateTime.MinValue, DateTime.MinValue, DateTime.MinValue, FulfillmentPreviewItems) { }
8893

89-
/// <summary>
90-
/// The earliest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.
91-
/// </summary>
92-
/// <value>The earliest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.</value>
93-
[DataMember(Name = "EarliestShipDate", EmitDefaultValue = false)]
94-
public DateTime EarliestShipDate { get; set; }
94+
/// <summary>
95+
/// The earliest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.
96+
/// </summary>
97+
/// <value>The earliest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.</value>
98+
[DataMember(Name = "EarliestShipDate", EmitDefaultValue = false)]
99+
public DateTime EarliestShipDateTime { get; set; }
100+
[Obsolete("Use EarliestShipDateTime instead")]
101+
[EditorBrowsable(EditorBrowsableState.Never)]
102+
public Timestamp EarliestShipDate { get; set; }
95103

96-
/// <summary>
97-
/// The latest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.
98-
/// </summary>
99-
/// <value>The latest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.</value>
100-
[DataMember(Name = "LatestShipDate", EmitDefaultValue = false)]
101-
public DateTime LatestShipDate { get; set; }
104+
/// <summary>
105+
/// The latest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.
106+
/// </summary>
107+
/// <value>The latest date that the shipment is expected to be sent from the fulfillment center, in ISO 8601 date time format.</value>
108+
[DataMember(Name = "LatestShipDate", EmitDefaultValue = false)]
109+
public DateTime LatestShipDateTime { get; set; }
110+
[Obsolete("Use LatestShipDateTime instead")]
111+
[EditorBrowsable(EditorBrowsableState.Never)]
112+
public Timestamp LatestShipDate { get; set; }
102113

103-
/// <summary>
104-
/// The earliest date that the shipment is expected to arrive at its destination.
105-
/// </summary>
106-
/// <value>The earliest date that the shipment is expected to arrive at its destination.</value>
107-
[DataMember(Name = "EarliestArrivalDate", EmitDefaultValue = false)]
108-
public DateTime EarliestArrivalDate { get; set; }
114+
/// <summary>
115+
/// The earliest date that the shipment is expected to arrive at its destination.
116+
/// </summary>
117+
/// <value>The earliest date that the shipment is expected to arrive at its destination.</value>
118+
[DataMember(Name = "EarliestArrivalDate", EmitDefaultValue = false)]
119+
public DateTime EarliestArrivalDateTime { get; set; }
120+
[Obsolete("Use EarliestArrivalDateTime instead")]
121+
[EditorBrowsable(EditorBrowsableState.Never)]
122+
public Timestamp EarliestArrivalDate { get; set; }
109123

110-
/// <summary>
111-
/// The latest date that the shipment is expected to arrive at its destination, in ISO 8601 date time format.
112-
/// </summary>
113-
/// <value>The latest date that the shipment is expected to arrive at its destination, in ISO 8601 date time format.</value>
114-
[DataMember(Name = "LatestArrivalDate", EmitDefaultValue = false)]
115-
public DateTime LatestArrivalDate { get; set; }
124+
/// <summary>
125+
/// The latest date that the shipment is expected to arrive at its destination, in ISO 8601 date time format.
126+
/// </summary>
127+
/// <value>The latest date that the shipment is expected to arrive at its destination, in ISO 8601 date time format.</value>
128+
[DataMember(Name = "LatestArrivalDate", EmitDefaultValue = false)]
129+
public DateTime LatestArrivalDateTime { get; set; }
130+
[Obsolete("Use LatestArrivalDateTime instead")]
131+
[EditorBrowsable(EditorBrowsableState.Never)]
132+
public Timestamp LatestArrivalDate { get; set; }
116133

117-
/// <summary>
118-
/// Information about the items in the shipment.
119-
/// </summary>
120-
/// <value>Information about the items in the shipment.</value>
121-
[DataMember(Name = "FulfillmentPreviewItems", EmitDefaultValue = false)]
134+
/// <summary>
135+
/// Information about the items in the shipment.
136+
/// </summary>
137+
/// <value>Information about the items in the shipment.</value>
138+
[DataMember(Name = "FulfillmentPreviewItems", EmitDefaultValue = false)]
122139
public FulfillmentPreviewItemList FulfillmentPreviewItems { get; set; }
123140

124141
/// <summary>
@@ -129,10 +146,10 @@ public override string ToString()
129146
{
130147
var sb = new StringBuilder();
131148
sb.Append("class FulfillmentPreviewShipment {\n");
132-
sb.Append(" EarliestShipDate: ").Append(EarliestShipDate).Append("\n");
133-
sb.Append(" LatestShipDate: ").Append(LatestShipDate).Append("\n");
134-
sb.Append(" EarliestArrivalDate: ").Append(EarliestArrivalDate).Append("\n");
135-
sb.Append(" LatestArrivalDate: ").Append(LatestArrivalDate).Append("\n");
149+
sb.Append(" EarliestShipDateTime: ").Append(EarliestShipDateTime).Append("\n");
150+
sb.Append(" LatestShipDateTime: ").Append(LatestShipDateTime).Append("\n");
151+
sb.Append(" EarliestArrivalDateTime: ").Append(EarliestArrivalDateTime).Append("\n");
152+
sb.Append(" LatestArrivalDateTime: ").Append(LatestArrivalDateTime).Append("\n");
136153
sb.Append(" FulfillmentPreviewItems: ").Append(FulfillmentPreviewItems).Append("\n");
137154
sb.Append("}\n");
138155
return sb.ToString();
@@ -169,24 +186,20 @@ public bool Equals(FulfillmentPreviewShipment input)
169186

170187
return
171188
(
172-
this.EarliestShipDate == input.EarliestShipDate ||
173-
(this.EarliestShipDate != null &&
174-
this.EarliestShipDate.Equals(input.EarliestShipDate))
189+
this.EarliestShipDateTime == input.EarliestShipDateTime ||
190+
(this.EarliestShipDateTime.Equals(input.EarliestShipDateTime))
175191
) &&
176192
(
177-
this.LatestShipDate == input.LatestShipDate ||
178-
(this.LatestShipDate != null &&
179-
this.LatestShipDate.Equals(input.LatestShipDate))
193+
this.LatestShipDateTime == input.LatestShipDateTime ||
194+
(this.LatestShipDateTime.Equals(input.LatestShipDateTime))
180195
) &&
181196
(
182-
this.EarliestArrivalDate == input.EarliestArrivalDate ||
183-
(this.EarliestArrivalDate != null &&
184-
this.EarliestArrivalDate.Equals(input.EarliestArrivalDate))
197+
this.EarliestArrivalDateTime == input.EarliestArrivalDateTime ||
198+
(this.EarliestArrivalDateTime.Equals(input.EarliestArrivalDateTime))
185199
) &&
186200
(
187-
this.LatestArrivalDate == input.LatestArrivalDate ||
188-
(this.LatestArrivalDate != null &&
189-
this.LatestArrivalDate.Equals(input.LatestArrivalDate))
201+
this.LatestArrivalDateTime == input.LatestArrivalDateTime ||
202+
(this.LatestArrivalDateTime.Equals(input.LatestArrivalDateTime))
190203
) &&
191204
(
192205
this.FulfillmentPreviewItems == input.FulfillmentPreviewItems ||
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
/*
2+
* Selling Partner API for Fulfillment Outbound
3+
*
4+
* The Selling Partner API for Fulfillment Outbound lets you create applications that help a seller fulfill Multi-Channel Fulfillment orders using their inventory in Amazon's fulfillment network. You can get information on both potential and existing fulfillment orders.
5+
*
6+
* OpenAPI spec version: v0
7+
*
8+
* Generated by: https://github.com/swagger-api/swagger-codegen.git
9+
*/
10+
11+
using Newtonsoft.Json;
12+
using System;
13+
using System.Collections.Generic;
14+
using System.ComponentModel.DataAnnotations;
15+
using System.Runtime.Serialization;
16+
using System.Text;
17+
18+
namespace FikaAmazonAPI.AmazonSpApiSDK.Models.FulfillmentOutbound
19+
{
20+
/// <summary>
21+
/// Timestamp
22+
/// </summary>
23+
[DataContract]
24+
[Obsolete("This class should not be used as it has no members, use DateTime")]
25+
public partial class Timestamp : IEquatable<Timestamp>, IValidatableObject
26+
{
27+
/// <summary>
28+
/// Initializes a new instance of the <see cref="Timestamp" /> class.
29+
/// </summary>
30+
[JsonConstructorAttribute]
31+
public Timestamp()
32+
{
33+
}
34+
35+
/// <summary>
36+
/// Returns the string presentation of the object
37+
/// </summary>
38+
/// <returns>String presentation of the object</returns>
39+
public override string ToString()
40+
{
41+
var sb = new StringBuilder();
42+
sb.Append("class Timestamp {\n");
43+
sb.Append("}\n");
44+
return sb.ToString();
45+
}
46+
47+
/// <summary>
48+
/// Returns the JSON string presentation of the object
49+
/// </summary>
50+
/// <returns>JSON string presentation of the object</returns>
51+
public string ToJson()
52+
{
53+
return JsonConvert.SerializeObject(this, Formatting.Indented);
54+
}
55+
56+
/// <summary>
57+
/// Returns true if objects are equal
58+
/// </summary>
59+
/// <param name="input">Object to be compared</param>
60+
/// <returns>Boolean</returns>
61+
public override bool Equals(object input)
62+
{
63+
return this.Equals(input as Timestamp);
64+
}
65+
66+
/// <summary>
67+
/// Returns true if Timestamp instances are equal
68+
/// </summary>
69+
/// <param name="input">Instance of Timestamp to be compared</param>
70+
/// <returns>Boolean</returns>
71+
public bool Equals(Timestamp input)
72+
{
73+
if (input == null)
74+
return false;
75+
76+
return false;
77+
}
78+
79+
/// <summary>
80+
/// Gets the hash code
81+
/// </summary>
82+
/// <returns>Hash code</returns>
83+
public override int GetHashCode()
84+
{
85+
unchecked // Overflow is fine, just wrap
86+
{
87+
int hashCode = 41;
88+
return hashCode;
89+
}
90+
}
91+
92+
/// <summary>
93+
/// To validate all properties of the instance
94+
/// </summary>
95+
/// <param name="validationContext">Validation context</param>
96+
/// <returns>Validation Result</returns>
97+
IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
98+
{
99+
yield break;
100+
}
101+
}
102+
103+
}

0 commit comments

Comments
 (0)