Merge pull request #12 from 1415003719/2025-07

1415003719 · web-flow · commit e04064bf09dc · 2025-09-22T16:55:04.000+08:00
fix trackings pagination
diff --git a/src/AfterShipTracking/AfterShipTracking/AfterShipTracking.csproj b/src/AfterShipTracking/AfterShipTracking/AfterShipTracking.csproj
@@ -10,7 +10,7 @@
         <Copyright>Copyright © AfterShip</Copyright>
         <AssemblyTitle>AfterShipTracking</AssemblyTitle>
         <NeutralLanguage>en-US</NeutralLanguage>
-        <VersionPrefix>12.0.0</VersionPrefix>
+        <VersionPrefix>13.0.0</VersionPrefix>
         <VersionSuffix>
         </VersionSuffix>
         <Authors>AfterShip</Authors>
diff --git a/src/AfterShipTracking/AfterShipTracking/AftershipClient.cs b/src/AfterShipTracking/AfterShipTracking/AftershipClient.cs
@@ -64,10 +64,10 @@ public class AfterShipClient
 
         public IHttpClient HttpClient { get; }
 
-        public CourierConnectionService CourierConnection { get; set; }
         public TrackingService Tracking { get; set; }
-        public EstimatedDeliveryDateService EstimatedDeliveryDate { get; set; }
         public CourierService Courier { get; set; }
+        public CourierConnectionService CourierConnection { get; set; }
+        public EstimatedDeliveryDateService EstimatedDeliveryDate { get; set; }
         public AfterShipClient(
             string domain = null,
             string apiKey = null,
@@ -96,10 +96,10 @@ public AfterShipClient(
 
             HttpClient = httpClient ?? new SystemNetHttpClient(this.ApiBase, authenticator, this.MaxRetry, this.Timeout, this.UserAgent,this.Proxy);
 
-            CourierConnection = new CourierConnectionService(HttpClient);
             Tracking = new TrackingService(HttpClient);
-            EstimatedDeliveryDate = new EstimatedDeliveryDateService(HttpClient);
             Courier = new CourierService(HttpClient);
+            CourierConnection = new CourierConnectionService(HttpClient);
+            EstimatedDeliveryDate = new EstimatedDeliveryDateService(HttpClient);
         }
 
         private void CheckConfig()
diff --git a/src/AfterShipTracking/AfterShipTracking/Models/GetCourierConnectionsResponse.cs b/src/AfterShipTracking/AfterShipTracking/Models/GetCourierConnectionsResponse.cs
@@ -24,6 +24,11 @@ public class  GetCourierConnectionsResponse
         [JsonProperty("courier_connections")]
         public CourierConnection? [] CourierConnections { get; set; }
         /// <summary>
+        ///  Count 
+        /// </summary>
+        [JsonProperty("total")]
+        public int?  Count { get; set; }
+        /// <summary>
         ///  Page 
         /// </summary>
         [JsonProperty("page")]
@@ -33,11 +38,6 @@ public class  GetCourierConnectionsResponse
         /// </summary>
         [JsonProperty("limit")]
         public int?  Limit { get; set; }
-        /// <summary>
-        ///  Count 
-        /// </summary>
-        [JsonProperty("total")]
-        public int?  Count { get; set; }
         public GetCourierConnectionsResponse()
         {
         }
@@ -68,24 +68,4 @@ public PaginationGetCourierConnectionsResponse()
         {
         }
     }
-    /// <summary>
-    /// 
-    /// </summary>
-    public class  GetCourierConnectionsResponseCourierConnectionListData
-    {
-        /// <summary>
-        ///  CourierConnections 
-        /// </summary>
-        [JsonProperty("courier_connections")]
-        public CourierConnection? [] CourierConnections { get; set; }
-        /// <summary>
-        ///  Pagination 
-        /// </summary>
-        [JsonProperty("pagination")]
-        public PaginationPage?  Pagination { get; set; }
-
-        public GetCourierConnectionsResponseCourierConnectionListData()
-        {
-        }
-    }
 }
diff --git a/src/AfterShipTracking/AfterShipTracking/Models/GetTrackingsResponse.cs b/src/AfterShipTracking/AfterShipTracking/Models/GetTrackingsResponse.cs
@@ -68,24 +68,4 @@ public PaginationGetTrackingsResponse()
         {
         }
     }
-    /// <summary>
-    /// 
-    /// </summary>
-    public class  GetTrackingsResponseTrackingListData
-    {
-        /// <summary>
-        ///  Trackings 
-        /// </summary>
-        [JsonProperty("trackings")]
-        public Tracking? [] Trackings { get; set; }
-        /// <summary>
-        ///  Pagination 
-        /// </summary>
-        [JsonProperty("pagination")]
-        public PaginationPage?  Pagination { get; set; }
-
-        public GetTrackingsResponseTrackingListData()
-        {
-        }
-    }
 }
diff --git a/src/AfterShipTracking/AfterShipTracking/Properties/AssemblyInfo.cs b/src/AfterShipTracking/AfterShipTracking/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
 
 internal class AssemblyInformation
 {
-    public const string AssemblyInformationalVersion = "12.0.0";
+    public const string AssemblyInformationalVersion = "13.0.0";
 }
diff --git a/src/AfterShipTracking/AfterShipTracking/Public/AfterShipConfiguration.cs b/src/AfterShipTracking/AfterShipTracking/Public/AfterShipConfiguration.cs
@@ -15,7 +15,7 @@ public static class AfterShipConfiguration
         public const string SDK_PREFIX = "AFTERSHIP_TRACKING_SDK";
         public const int DEFAULT_MAX_RETRY = 2;
         public const int DEFAULT_TIMEOUT = 10000;
-        public const string DEFAULT_USER_AGENT = "tracking-sdk-net/12.0.0 (https://www.aftership.com) System.Net.Http.HttpClient/0.0.0";
+        public const string DEFAULT_USER_AGENT = "tracking-sdk-net/13.0.0 (https://www.aftership.com) System.Net.Http.HttpClient/0.0.0";
         public const string DEFAULT_DOMAIN = "https://api.aftership.com";
 
         private static string domain;
diff --git a/src/AfterShipTracking/AfterShipTracking/RestAPI/CourierConnection/CourierConnectionOption.cs b/src/AfterShipTracking/AfterShipTracking/RestAPI/CourierConnection/CourierConnectionOption.cs
@@ -10,22 +10,22 @@ namespace AfterShipTracking
     /// <summary>
     /// Description
     /// </summary>
-    public class PostCourierConnectionsOptions : BaseOptions
+    public class PutCourierConnectionsByIdOptions : BaseOptions
     {
-        public  PostCourierConnectionsOptions()
+        public  PutCourierConnectionsByIdOptions()
         {
         }
 
 
-        public PostCourierConnectionsRequest PostCourierConnectionsRequest { get; set; }
+        public PutCourierConnectionsByIdRequest PutCourierConnectionsByIdRequest { get; set; }
 
         override public string GetBody()
         {
             string body = null;
 
-            if ( PostCourierConnectionsRequest != null)
+            if ( PutCourierConnectionsByIdRequest != null)
             {
-                body = BaseResourceService.ToJson(PostCourierConnectionsRequest);
+                body = BaseResourceService.ToJson(PutCourierConnectionsByIdRequest);
             }
             return body;
         }
@@ -66,35 +66,35 @@ override public List<KeyValuePair<string, string>> GetQueryParams()
     /// <summary>
     /// Description
     /// </summary>
-    public class GetCourierConnectionsByIdOptions : BaseOptions
-    {
-        public  GetCourierConnectionsByIdOptions()
-        {
-        }
-
-
-    }
-    /// <summary>
-    /// Description
-    /// </summary>
-    public class PutCourierConnectionsByIdOptions : BaseOptions
+    public class PostCourierConnectionsOptions : BaseOptions
     {
-        public  PutCourierConnectionsByIdOptions()
+        public  PostCourierConnectionsOptions()
         {
         }
 
 
-        public PutCourierConnectionsByIdRequest PutCourierConnectionsByIdRequest { get; set; }
+        public PostCourierConnectionsRequest PostCourierConnectionsRequest { get; set; }
 
         override public string GetBody()
         {
             string body = null;
 
-            if ( PutCourierConnectionsByIdRequest != null)
+            if ( PostCourierConnectionsRequest != null)
             {
-                body = BaseResourceService.ToJson(PutCourierConnectionsByIdRequest);
+                body = BaseResourceService.ToJson(PostCourierConnectionsRequest);
             }
             return body;
         }
     }
+    /// <summary>
+    /// Description
+    /// </summary>
+    public class GetCourierConnectionsByIdOptions : BaseOptions
+    {
+        public  GetCourierConnectionsByIdOptions()
+        {
+        }
+
+
+    }
 }
diff --git a/src/AfterShipTracking/AfterShipTracking/RestAPI/CourierConnection/CourierConnectionService.cs b/src/AfterShipTracking/AfterShipTracking/RestAPI/CourierConnection/CourierConnectionService.cs
@@ -16,11 +16,15 @@ public CourierConnectionService(IHttpClient httpClient)
             this.HttpClient = httpClient;
         }
 
-        public CourierConnection PostCourierConnections( PostCourierConnectionsOptions? options = null)
+        public CourierConnection PutCourierConnectionsById(string id,  PutCourierConnectionsByIdOptions? options = null)
         {
-            string path = $"/tracking/2025-07/courier-connections";
+            string path = $"/tracking/2025-07/courier-connections/{id}";
+            if (string.IsNullOrEmpty(id))
+            {
+               throw ErrorCode.GenSDKError(ErrorCode.REQUEST_ERROR,"request error"+": `id` is invalid");
+            }
             Request request = new Request(
-                HttpMethod.Post,
+                HttpMethod.Patch,
                 path,
                 options
             );
@@ -44,7 +48,7 @@ public CourierConnection DeleteCourierConnectionsById(string id,  DeleteCourierC
             var response = this.HttpClient.MakeRequest(request);
             return ProcessData<CourierConnection>(response);
         }
-        public GetCourierConnectionsResponseCourierConnectionListData GetCourierConnections( GetCourierConnectionsOptions? options = null)
+        public GetCourierConnectionsResponse GetCourierConnections( GetCourierConnectionsOptions? options = null)
         {
             string path = $"/tracking/2025-07/courier-connections";
             Request request = new Request(
@@ -54,33 +58,29 @@ public GetCourierConnectionsResponseCourierConnectionListData GetCourierConnecti
             );
 
             var response = this.HttpClient.MakeRequest(request);
-            return ProcessData<GetCourierConnectionsResponseCourierConnectionListData>(response);
+            return ProcessData<GetCourierConnectionsResponse>(response);
         }
-        public CourierConnection GetCourierConnectionsById(string id,  GetCourierConnectionsByIdOptions? options = null)
+        public CourierConnection PostCourierConnections( PostCourierConnectionsOptions? options = null)
         {
-            string path = $"/tracking/2025-07/courier-connections/{id}";
-            if (string.IsNullOrEmpty(id))
-            {
-               throw ErrorCode.GenSDKError(ErrorCode.REQUEST_ERROR,"request error"+": `id` is invalid");
-            }
+            string path = $"/tracking/2025-07/courier-connections";
             Request request = new Request(
-                HttpMethod.Get,
+                HttpMethod.Post,
                 path,
                 options
             );
 
             var response = this.HttpClient.MakeRequest(request);
             return ProcessData<CourierConnection>(response);
         }
-        public CourierConnection PutCourierConnectionsById(string id,  PutCourierConnectionsByIdOptions? options = null)
+        public CourierConnection GetCourierConnectionsById(string id,  GetCourierConnectionsByIdOptions? options = null)
         {
             string path = $"/tracking/2025-07/courier-connections/{id}";
             if (string.IsNullOrEmpty(id))
             {
                throw ErrorCode.GenSDKError(ErrorCode.REQUEST_ERROR,"request error"+": `id` is invalid");
             }
             Request request = new Request(
-                HttpMethod.Patch,
+                HttpMethod.Get,
                 path,
                 options
             );
diff --git a/src/AfterShipTracking/AfterShipTracking/RestAPI/EstimatedDeliveryDate/EstimatedDeliveryDateOption.cs b/src/AfterShipTracking/AfterShipTracking/RestAPI/EstimatedDeliveryDate/EstimatedDeliveryDateOption.cs
@@ -10,45 +10,45 @@ namespace AfterShipTracking
     /// <summary>
     /// Description
     /// </summary>
-    public class PredictBatchOptions : BaseOptions
+    public class PredictOptions : BaseOptions
     {
-        public  PredictBatchOptions()
+        public  PredictOptions()
         {
         }
 
 
-        public PredictBatchRequest PredictBatchRequest { get; set; }
+        public PredictRequest PredictRequest { get; set; }
 
         override public string GetBody()
         {
             string body = null;
 
-            if ( PredictBatchRequest != null)
+            if ( PredictRequest != null)
             {
-                body = BaseResourceService.ToJson(PredictBatchRequest);
+                body = BaseResourceService.ToJson(PredictRequest);
             }
             return body;
         }
     }
     /// <summary>
     /// Description
     /// </summary>
-    public class PredictOptions : BaseOptions
+    public class PredictBatchOptions : BaseOptions
     {
-        public  PredictOptions()
+        public  PredictBatchOptions()
         {
         }
 
 
-        public PredictRequest PredictRequest { get; set; }
+        public PredictBatchRequest PredictBatchRequest { get; set; }
 
         override public string GetBody()
         {
             string body = null;
 
-            if ( PredictRequest != null)
+            if ( PredictBatchRequest != null)
             {
-                body = BaseResourceService.ToJson(PredictRequest);
+                body = BaseResourceService.ToJson(PredictBatchRequest);
             }
             return body;
         }
diff --git a/src/AfterShipTracking/AfterShipTracking/RestAPI/EstimatedDeliveryDate/EstimatedDeliveryDateService.cs b/src/AfterShipTracking/AfterShipTracking/RestAPI/EstimatedDeliveryDate/EstimatedDeliveryDateService.cs
@@ -16,29 +16,29 @@ public EstimatedDeliveryDateService(IHttpClient httpClient)
             this.HttpClient = httpClient;
         }
 
-        public PredictBatchResponse PredictBatch( PredictBatchOptions? options = null)
+        public EstimatedDeliveryDateResponse Predict( PredictOptions? options = null)
         {
-            string path = $"/tracking/2025-07/estimated-delivery-date/predict-batch";
+            string path = $"/tracking/2025-07/estimated-delivery-date/predict";
             Request request = new Request(
                 HttpMethod.Post,
                 path,
                 options
             );
 
             var response = this.HttpClient.MakeRequest(request);
-            return ProcessData<PredictBatchResponse>(response);
+            return ProcessData<EstimatedDeliveryDateResponse>(response);
         }
-        public EstimatedDeliveryDateResponse Predict( PredictOptions? options = null)
+        public PredictBatchResponse PredictBatch( PredictBatchOptions? options = null)
         {
-            string path = $"/tracking/2025-07/estimated-delivery-date/predict";
+            string path = $"/tracking/2025-07/estimated-delivery-date/predict-batch";
             Request request = new Request(
                 HttpMethod.Post,
                 path,
                 options
             );
 
             var response = this.HttpClient.MakeRequest(request);
-            return ProcessData<EstimatedDeliveryDateResponse>(response);
+            return ProcessData<PredictBatchResponse>(response);
         }
     }
 }
diff --git a/src/AfterShipTracking/AfterShipTracking/RestAPI/Tracking/TrackingOption.cs b/src/AfterShipTracking/AfterShipTracking/RestAPI/Tracking/TrackingOption.cs
diff --git a/src/AfterShipTracking/AfterShipTracking/RestAPI/Tracking/TrackingService.cs b/src/AfterShipTracking/AfterShipTracking/RestAPI/Tracking/TrackingService.cs

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@`
`12`	`12`
`13`	`13`	`internal class AssemblyInformation`
`14`	`14`	`{`
`15`		`- public const string AssemblyInformationalVersion = "12.0.0";`
	`15`	`+ public const string AssemblyInformationalVersion = "13.0.0";`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,22 +10,22 @@ namespace AfterShipTracking`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Description`
`12`	`12`	`/// </summary>`
`13`		`- public class PostCourierConnectionsOptions : BaseOptions`
	`13`	`+ public class PutCourierConnectionsByIdOptions : BaseOptions`
`14`	`14`	`{`
`15`		`- public PostCourierConnectionsOptions()`
	`15`	`+ public PutCourierConnectionsByIdOptions()`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`	`19`
`20`		`- public PostCourierConnectionsRequest PostCourierConnectionsRequest { get; set; }`
	`20`	`+ public PutCourierConnectionsByIdRequest PutCourierConnectionsByIdRequest { get; set; }`
`21`	`21`
`22`	`22`	`override public string GetBody()`
`23`	`23`	`{`
`24`	`24`	`string body = null;`
`25`	`25`
`26`		`- if ( PostCourierConnectionsRequest != null)`
	`26`	`+ if ( PutCourierConnectionsByIdRequest != null)`
`27`	`27`	`{`
`28`		`- body = BaseResourceService.ToJson(PostCourierConnectionsRequest);`
	`28`	`+ body = BaseResourceService.ToJson(PutCourierConnectionsByIdRequest);`
`29`	`29`	`}`
`30`	`30`	`return body;`
`31`	`31`	`}`
`@@ -66,35 +66,35 @@ override public List<KeyValuePair<string, string>> GetQueryParams()`
`66`	`66`	`/// <summary>`
`67`	`67`	`/// Description`
`68`	`68`	`/// </summary>`
`69`		`- public class GetCourierConnectionsByIdOptions : BaseOptions`
`70`		`- {`
`71`		`- public GetCourierConnectionsByIdOptions()`
`72`		`- {`
`73`		`- }`
`74`		`-`
`75`		`-`
`76`		`- }`
`77`		`- /// <summary>`
`78`		`- /// Description`
`79`		`- /// </summary>`
`80`		`- public class PutCourierConnectionsByIdOptions : BaseOptions`
	`69`	`+ public class PostCourierConnectionsOptions : BaseOptions`
`81`	`70`	`{`
`82`		`- public PutCourierConnectionsByIdOptions()`
	`71`	`+ public PostCourierConnectionsOptions()`
`83`	`72`	`{`
`84`	`73`	`}`
`85`	`74`
`86`	`75`
`87`		`- public PutCourierConnectionsByIdRequest PutCourierConnectionsByIdRequest { get; set; }`
	`76`	`+ public PostCourierConnectionsRequest PostCourierConnectionsRequest { get; set; }`
`88`	`77`
`89`	`78`	`override public string GetBody()`
`90`	`79`	`{`
`91`	`80`	`string body = null;`
`92`	`81`
`93`		`- if ( PutCourierConnectionsByIdRequest != null)`
	`82`	`+ if ( PostCourierConnectionsRequest != null)`
`94`	`83`	`{`
`95`		`- body = BaseResourceService.ToJson(PutCourierConnectionsByIdRequest);`
	`84`	`+ body = BaseResourceService.ToJson(PostCourierConnectionsRequest);`
`96`	`85`	`}`
`97`	`86`	`return body;`
`98`	`87`	`}`
`99`	`88`	`}`
	`89`	`+ /// <summary>`
	`90`	`+ /// Description`
	`91`	`+ /// </summary>`
	`92`	`+ public class GetCourierConnectionsByIdOptions : BaseOptions`
	`93`	`+ {`
	`94`	`+ public GetCourierConnectionsByIdOptions()`
	`95`	`+ {`
	`96`	`+ }`
	`97`	`+`
	`98`	`+`
	`99`	`+ }`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,45 +10,45 @@ namespace AfterShipTracking`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Description`
`12`	`12`	`/// </summary>`
`13`		`- public class PredictBatchOptions : BaseOptions`
	`13`	`+ public class PredictOptions : BaseOptions`
`14`	`14`	`{`
`15`		`- public PredictBatchOptions()`
	`15`	`+ public PredictOptions()`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`	`19`
`20`		`- public PredictBatchRequest PredictBatchRequest { get; set; }`
	`20`	`+ public PredictRequest PredictRequest { get; set; }`
`21`	`21`
`22`	`22`	`override public string GetBody()`
`23`	`23`	`{`
`24`	`24`	`string body = null;`
`25`	`25`
`26`		`- if ( PredictBatchRequest != null)`
	`26`	`+ if ( PredictRequest != null)`
`27`	`27`	`{`
`28`		`- body = BaseResourceService.ToJson(PredictBatchRequest);`
	`28`	`+ body = BaseResourceService.ToJson(PredictRequest);`
`29`	`29`	`}`
`30`	`30`	`return body;`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`/// <summary>`
`34`	`34`	`/// Description`
`35`	`35`	`/// </summary>`
`36`		`- public class PredictOptions : BaseOptions`
	`36`	`+ public class PredictBatchOptions : BaseOptions`
`37`	`37`	`{`
`38`		`- public PredictOptions()`
	`38`	`+ public PredictBatchOptions()`
`39`	`39`	`{`
`40`	`40`	`}`
`41`	`41`
`42`	`42`
`43`		`- public PredictRequest PredictRequest { get; set; }`
	`43`	`+ public PredictBatchRequest PredictBatchRequest { get; set; }`
`44`	`44`
`45`	`45`	`override public string GetBody()`
`46`	`46`	`{`
`47`	`47`	`string body = null;`
`48`	`48`
`49`		`- if ( PredictRequest != null)`
	`49`	`+ if ( PredictBatchRequest != null)`
`50`	`50`	`{`
`51`		`- body = BaseResourceService.ToJson(PredictRequest);`
	`51`	`+ body = BaseResourceService.ToJson(PredictBatchRequest);`
`52`	`52`	`}`
`53`	`53`	`return body;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,29 +16,29 @@ public EstimatedDeliveryDateService(IHttpClient httpClient)`
`16`	`16`	`this.HttpClient = httpClient;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public PredictBatchResponse PredictBatch( PredictBatchOptions? options = null)`
	`19`	`+ public EstimatedDeliveryDateResponse Predict( PredictOptions? options = null)`
`20`	`20`	`{`
`21`		`- string path = $"/tracking/2025-07/estimated-delivery-date/predict-batch";`
	`21`	`+ string path = $"/tracking/2025-07/estimated-delivery-date/predict";`
`22`	`22`	`Request request = new Request(`
`23`	`23`	`HttpMethod.Post,`
`24`	`24`	`path,`
`25`	`25`	`options`
`26`	`26`	`);`
`27`	`27`
`28`	`28`	`var response = this.HttpClient.MakeRequest(request);`
`29`		`- return ProcessData<PredictBatchResponse>(response);`
	`29`	`+ return ProcessData<EstimatedDeliveryDateResponse>(response);`
`30`	`30`	`}`
`31`		`- public EstimatedDeliveryDateResponse Predict( PredictOptions? options = null)`
	`31`	`+ public PredictBatchResponse PredictBatch( PredictBatchOptions? options = null)`
`32`	`32`	`{`
`33`		`- string path = $"/tracking/2025-07/estimated-delivery-date/predict";`
	`33`	`+ string path = $"/tracking/2025-07/estimated-delivery-date/predict-batch";`
`34`	`34`	`Request request = new Request(`
`35`	`35`	`HttpMethod.Post,`
`36`	`36`	`path,`
`37`	`37`	`options`
`38`	`38`	`);`
`39`	`39`
`40`	`40`	`var response = this.HttpClient.MakeRequest(request);`
`41`		`- return ProcessData<EstimatedDeliveryDateResponse>(response);`
	`41`	`+ return ProcessData<PredictBatchResponse>(response);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`