Merge pull request #29 from yurii-bart/add-facility-id-to-requests

Add facility ids to request bodies

Author: r4m-semeyon

route4me-csharp-sdk/Route4MeSDKLibrary/Consts.cs

@@ -102,6 +102,7 @@ public static class R4MEInfrastructureSettingsV5
         public const string Routes51 = MainHost51 + "/routes";
 
         public const string RoutesDuplicate = MainHost + "/routes/duplicate";
+        public const string RoutesDelete = MainHost + "/routes/delete";
         public const string RoutesMerge = MainHost + "/routes/merge";
         public const string RoutesPaginate = MainHost + "/routes/paginate";
         public const string RoutesFallbackPaginate = MainHost + "/routes/fallback/paginate";
@@ -335,14 +336,14 @@ public static class R4MEInfrastructureSettingsV5
         public const string OptimizationProfilesDatatableConfig = OptimizationProfiles + "/list/config";
         #endregion
 
-
         #region Notes
         public const string Notes = MainHost + "/notes";
         public const string NoteById = Notes + "/{note_id}";
         public const string NotesByRoute = Notes + "/route/{route_id}";
         public const string NotesByDestination = Notes + "/destination/{route_destination_id}";
         public const string NotesCustomTypes = Notes + "/custom-types";
         public const string NotesBulkCreate = Notes + "/bulk-create";
+        #endregion
 
         #region Facilities
         public const string Facilities = MainHost + "/facilities";

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/Route.cs

@@ -335,5 +335,11 @@ public Dictionary<string, string> MemberConfigStorage
         [DataMember(Name = "bundle_items", EmitDefaultValue = true)]
         [ReadOnly(true)]
         public BundledItemResponse[] BundleItems { get; set; }
+
+        /// <summary>
+        ///     Facility IDs attributed to this route.
+        /// </summary>
+        [DataMember(Name = "facility_ids", EmitDefaultValue = false)]
+        public string[] FacilityIds { get; set; }
     }
 }

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/RouteParameters.cs

@@ -683,6 +683,12 @@ public sealed class RouteParameters
         /// </summary>
         [DataMember(Name = "route_start_date_local", EmitDefaultValue = false)]
         public string RouteStartDateLocal { get; set; }
+
+        /// <summary>
+        /// Facility IDs to attribute all optimization routes with.
+        /// </summary>
+        [DataMember(Name = "facility_ids", EmitDefaultValue = false)]
+        public string[] FacilityIds { get; set; }
     }
 
     /// <summary>

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/V5/Internal/Requests/BulkMembersRequest.cs

@@ -20,7 +20,7 @@ internal sealed class BulkMembersRequest : GenericParameters
         /// <summary>
         /// Conflict resolving rule (see <seealso cref="Conflicts"/>)
         /// </summary>
-        [HttpQueryMember(Name = "conflicts", EmitDefaultValue = false)]
+        [DataMember(Name = "conflicts")]
         public string Conflicts { get; set; }
     }
 

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/V5/Locations/LocationCombinedResource.cs

@@ -82,13 +82,13 @@ public class LocationCombinedData
         public string GroupBy { get; set; }
 
         [DataMember(Name = "current_sorting")]
-        public Dictionary<string, string> CurrentSorting { get; set; }
+        public object[] CurrentSorting { get; set; }
 
         [DataMember(Name = "current_filter_data")]
-        public Dictionary<string, string> CurrentFilterData { get; set; }
+        public object[] CurrentFilterData { get; set; }
 
         [DataMember(Name = "totals")]
-        public Dictionary<string, string> Totals { get; set; }
+        public object[] Totals { get; set; }
 
         [DataMember(Name = "columns")]
         public LocationColumn[] Columns { get; set; }

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/V5/Orders/FiltersParamRequestBody.cs

@@ -105,6 +105,12 @@ public class FiltersParamRequestBody
         [DataMember(Name = "groups", EmitDefaultValue = false)]
         public string[] Groups { get; set; }
 
+        /// <summary>
+        ///     Facility IDs (hexadecimal UUID strings)
+        /// </summary>
+        [DataMember(Name = "facility_ids", EmitDefaultValue = false)]
+        public string[] FacilityIds { get; set; }
+
         /// <summary>
         ///     Display (see <see cref="DisplayValues"/>). Default is <seealso cref="DisplayValues.All"/>
         /// </summary>

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/V5/Orders/Order.cs

@@ -326,6 +326,12 @@ public class Order : GenericParameters
         [DataMember(Name = "aggregation_ids", EmitDefaultValue = false)]
         public string[] AggregationIds { get; set; }
 
+        /// <summary>
+        /// Facility IDs (hexadecimal UUID strings)
+        /// </summary>
+        [DataMember(Name = "facility_ids", EmitDefaultValue = false)]
+        public string[] FacilityIds { get; set; }
+
         /// <summary>
         /// Organization Api Key
         /// </summary>

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/V5/Routes/Route.cs

@@ -347,5 +347,11 @@ public Dictionary<string, string> MemberConfigStorage
         /// </summary>
         [DataMember(Name = "route_status", EmitDefaultValue = false)]
         public string RouteStatus { get; set; }
+
+        /// <summary>
+        ///     Facility IDs (hexadecimal UUID strings)
+        /// </summary>
+        [DataMember(Name = "facility_ids", EmitDefaultValue = false)]
+        public string[] FacilityIds { get; set; }
     }
 }

route4me-csharp-sdk/Route4MeSDKLibrary/DataTypes/V5/Vehicles/VehicleBase.cs

@@ -27,7 +27,7 @@ public class VehicleBase : GenericParameters
         [DataMember(Name = "vehicle_vin", EmitDefaultValue = false)]
         public string VehicleVin { get; set; }
 
-        // <summary>
+        /// <summary>
         ///     A license plate of the vehicle.
         /// </summary>
         [DataMember(Name = "vehicle_license_plate", EmitDefaultValue = false)]
@@ -86,10 +86,16 @@ public class VehicleBase : GenericParameters
         [DataMember(Name = "license_end_date", EmitDefaultValue = false)]
         public string LicenseEndDate { get; set; }
 
-        // <summary>
+        /// <summary>
         ///     If equal to '1', the vehicle is operational.
         /// </summary>
         [DataMember(Name = "is_operational", EmitDefaultValue = false)]
         public bool? IsOsperational { get; set; }
+
+        /// <summary>
+        ///     Facility IDs (hexadecimal UUID strings)
+        /// </summary>
+        [DataMember(Name = "facility_ids", EmitDefaultValue = false)]
+        public string[] FacilityIds { get; set; }
     }
 }

route4me-csharp-sdk/Route4MeSDKLibrary/Managers/Route4MeManagerBase.cs

@@ -366,7 +366,7 @@ protected string ExtractJobId(HttpResponseMessage response)
                 ? jobLocation.OriginalString.Split('/').Last()
                 : null;
 
-            return (jobId?.Length ?? 0) == 32 ? jobId : null;
+            return (jobId?.Length ?? 0) == 36 ? jobId : null;
         }