Adding Localized name for Shipping Method

Author: MicheleRezk

commercetools.Sdk/IntegrationTests/commercetools.Sdk.IntegrationTests/Carts/CartsIntegrationTests.cs

@@ -610,7 +610,7 @@ await WithUpdateableCart(client,
                             var updatedCart = await client
                                 .ExecuteAsync(cart.UpdateById(actions => actions.AddUpdate(action)));
 
-                            Assert.Equal(shippingMethod.Name, updatedCart.ShippingInfo.ShippingMethodName);
+                            Assert.Equal(shippingMethod.LocalizedName["en"], updatedCart.ShippingInfo.ShippingMethodName);
                             return updatedCart;
                         });
                 });
@@ -886,7 +886,7 @@ await WithUpdateableCart(client,
                         {
                             Assert.Equal(TaxMode.ExternalAmount, cart.TaxMode);
                             Assert.Equal(shippingAddress.ToString(), cart.ShippingAddress.ToString());
-                            Assert.Equal(shippingMethod.Name, cart.ShippingInfo.ShippingMethodName);
+                            Assert.Equal(shippingMethod.LocalizedName["en"], cart.ShippingInfo.ShippingMethodName);
 
                             var externalTaxAmountDraft = TestingUtility.GetExternalTaxAmountDraft();
 
@@ -931,7 +931,7 @@ await WithUpdateableCart(client,
                         {
                             Assert.Equal(TaxMode.External, cart.TaxMode);
                             Assert.Equal(shippingAddress.ToString(), cart.ShippingAddress.ToString());
-                            Assert.Equal(shippingMethod.Name, cart.ShippingInfo.ShippingMethodName);
+                            Assert.Equal(shippingMethod.LocalizedName["en"], cart.ShippingInfo.ShippingMethodName);
 
                             var externalTaxRateDraft = TestingUtility.GetExternalTaxRateDraft();
 

commercetools.Sdk/IntegrationTests/commercetools.Sdk.IntegrationTests/OrdersImport/OrdersImportFixture.cs

@@ -114,7 +114,7 @@ public static OrderImportDraft DefaultOrderImportDraftWithLineItemWithShippingIn
             {
                 Price = amountEuro10,
                 ShippingRate = shippingRate,
-                ShippingMethodName = shippingMethod.Name,
+                ShippingMethodName = shippingMethod.LocalizedName["en"],
                 ShippingMethod = shippingMethod.ToKeyResourceIdentifier(),
                 TaxCategory = taxCategory.ToKeyResourceIdentifier()
             };

commercetools.Sdk/IntegrationTests/commercetools.Sdk.IntegrationTests/ShippingMethods/ShippingMethodIntegrationTests.cs

@@ -43,9 +43,11 @@ await WithShippingMethod(
                     client,
                     shippingMethodDraft =>
                         DefaultShippingMethodDraftWithKeyWithTaxCategory(shippingMethodDraft, taxCategory.ToKeyResourceIdentifier(), key),
-                    shippingMethod =>
+                    (shippingMethod, draft) =>
                     {
                         Assert.Equal(key, shippingMethod.Key);
+                        Assert.Equal(draft.LocalizedName["en"], shippingMethod.LocalizedName["en"]);
+                        Assert.Equal(draft.LocalizedDescription["en"], shippingMethod.LocalizedDescription["en"]);
                     });
             });
         }
@@ -295,13 +297,16 @@ await WithUpdateableShippingMethod(client, async shippingMethod =>
             {
                 var newName = TestingUtility.RandomString();
                 var updateActions = new List<UpdateAction<ShippingMethod>>();
-                var action = new ChangeNameUpdateAction { Name = newName };
+                var action = new SetLocalizedNameUpdateAction
+                {
+                    LocalizedName= new LocalizedString {{"en", newName}}
+                };
                 updateActions.Add(action);
 
                 var updatedShippingMethod = await client
                     .ExecuteAsync(new UpdateByIdCommand<ShippingMethod>(shippingMethod, updateActions));
 
-                Assert.Equal(newName, updatedShippingMethod.Name);
+                Assert.Equal(newName, updatedShippingMethod.LocalizedName["en"]);
                 return updatedShippingMethod;
             });
         }

commercetools.Sdk/IntegrationTests/commercetools.Sdk.IntegrationTests/ShippingMethods/ShippingMethodsFixture.cs

@@ -23,6 +23,8 @@ public static ShippingMethodDraft DefaultShippingMethodDraft(ShippingMethodDraft
             var random = TestingUtility.RandomInt();
             shippingMethodDraft.Key = $"Key_{random}";
             shippingMethodDraft.Name = $"ShippingMethod_{random}";
+            shippingMethodDraft.LocalizedName = new LocalizedString {{"en", $"ShippingMethod_{random}"}};
+            shippingMethodDraft.LocalizedDescription = new LocalizedString {{"en", $"ShippingMethodDes_{random}"}};
             return shippingMethodDraft;
         }
 
@@ -84,7 +86,12 @@ await WithTaxCategory(client, async taxCategory =>
         public static async Task WithShippingMethod(IClient client,
             Func<ShippingMethodDraft, ShippingMethodDraft> draftAction, Action<ShippingMethod> func)
         {
-            await With(client, new ShippingMethodDraft(), draftAction, func);
+            await With(client, DefaultShippingMethodDraft(new ShippingMethodDraft()), draftAction, func);
+        }
+        public static async Task WithShippingMethod(IClient client,
+            Func<ShippingMethodDraft, ShippingMethodDraft> draftAction, Action<ShippingMethod,ShippingMethodDraft> func)
+        {
+            await With(client, DefaultShippingMethodDraft(new ShippingMethodDraft()), draftAction, func);
         }
 
         public static async Task WithShippingMethod(IClient client, Func<ShippingMethod, Task> func)

commercetools.Sdk/commercetools.Sdk.Client/CheckByQueryCommand.cs

@@ -11,6 +11,6 @@ public CheckByQueryCommand()
             Where = new List<string>();
         }
 
-        public List<string> Where { get; set; }
+        public List<string> Where { get; private set; }
     }
 }

commercetools.Sdk/commercetools.Sdk.Domain/ShippingMethods/ShippingMethod.cs

@@ -10,15 +10,17 @@ namespace commercetools.Sdk.Domain.ShippingMethods
     public class ShippingMethod : Resource<ShippingMethod>, IKeyReferencable<ShippingMethod>
     {
         public string Key { get; set; }
-        public string Name { get; set; }
+        public LocalizedString LocalizedName { get; set; }
+        public LocalizedString LocalizedDescription { get; set; }
 
+        [Obsolete("Use LocalizedName instead")]
+        public string Name { get; set; }
         [Obsolete("Use LocalizedDescription instead")]
         public string Description { get; set; }
         public Reference<TaxCategory> TaxCategory { get; set; }
         public List<ZoneRate> ZoneRates { get; set; }
         public bool IsDefault { get; set; }
         public string Predicate { get; set; }
-        public LocalizedString LocalizedDescription { get; set; }
         public CustomFields Custom { get; set; }
     }
-}
+}

commercetools.Sdk/commercetools.Sdk.Domain/ShippingMethods/ShippingMethodDraft.cs

@@ -12,15 +12,17 @@ namespace commercetools.Sdk.Domain.ShippingMethods
     public class ShippingMethodDraft : IDraft<ShippingMethod>
     {
         public string Key { get; set; }
-        public string Name { get; set; }
+        public LocalizedString LocalizedName { get; set; }
+        public LocalizedString LocalizedDescription { get; set; }
 
+        [Obsolete("Use LocalizedName instead")]
+        public string Name { get; set; }
         [Obsolete("Use LocalizedDescription instead")]
         public string Description { get; set; }
         public IReference<TaxCategory> TaxCategory { get; set; }
         public List<ZoneRateDraft> ZoneRates { get; set; }
         public bool IsDefault { get; set; }
         public string Predicate { get; set; }
-        public LocalizedString LocalizedDescription { get; set; }
         public CustomFieldsDraft Custom { get; set; }
     }
 }

commercetools.Sdk/commercetools.Sdk.Domain/ShippingMethods/UpdateActions/ChangeNameUpdateAction.cs

@@ -1,7 +1,9 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace commercetools.Sdk.Domain.ShippingMethods.UpdateActions
 {
+    [Obsolete("Use SetLocalizedNameUpdateAction instead")]
     public class ChangeNameUpdateAction : UpdateAction<ShippingMethod>
     {
         public string Action => "changeName";

commercetools.Sdk/commercetools.Sdk.Domain/ShippingMethods/UpdateActions/SetLocalizedNameUpdateAction.cs

@@ -0,0 +1,8 @@
+namespace commercetools.Sdk.Domain.ShippingMethods.UpdateActions
+{
+    public class SetLocalizedNameUpdateAction : UpdateAction<ShippingMethod>
+    {
+        public string Action => "setLocalizedName";
+        public LocalizedString LocalizedName { get; set; }
+    }
+}