Ensure collections are sorted

Author: mattbrailsford

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePaymentMethodServiceConnector.cs

@@ -10,7 +10,7 @@
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
 using Umbraco.Commerce.Extensions;
-
+using Umbraco.Extensions;
 using StringExtensions = Umbraco.Commerce.Extensions.StringExtensions;
 
 namespace Umbraco.Commerce.Deploy.Connectors.ServiceConnectors
@@ -94,7 +94,7 @@ public override IAsyncEnumerable<PaymentMethodReadOnly> GetEntitiesAsync(Guid st
             {
                 var servicesPrices = new List<ServicePriceArtifact>();
 
-                foreach (var price in entity.Prices.OrderBy(x => x.CountryId).ThenBy(x => x.RegionId).ThenBy(x => x.CurrencyId))
+                foreach (var price in entity.Prices.OrderBy(x => x.CurrencyId).ThenBy(x => x.CountryId).ThenBy(x => x.RegionId))
                 {
                     var spArtifact = new ServicePriceArtifact { Value = price.Value };
 
@@ -139,7 +139,7 @@ public override IAsyncEnumerable<PaymentMethodReadOnly> GetEntitiesAsync(Guid st
             {
                 var allowedCountryRegions = new List<AllowedCountryRegionArtifact>();
 
-                foreach (var acr in entity.AllowedCountryRegions)
+                foreach (var acr in entity.AllowedCountryRegions.OrderBy(x => x.CountryId).ThenBy(x => x.RegionId))
                 {
                     var acrArtifact = new AllowedCountryRegionArtifact();
 

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceProductAttributePresetServiceConnector.cs

@@ -63,7 +63,7 @@ public override IAsyncEnumerable<ProductAttributePresetReadOnly> GetEntitiesAsyn
 
             var allowedAttributes = new List<AllowedProductAttributeArtifact>();
 
-            foreach (AllowedProductAttribute? allowedAttr in entity.AllowedAttributes)
+            foreach (AllowedProductAttribute? allowedAttr in entity.AllowedAttributes.OrderBy(x => x.ProductAttributeAlias))
             {
                 // Get product attribute ID
                 ProductAttributeReadOnly? attr = await _umbracoCommerceApi.GetProductAttributeAsync(entity.StoreId, allowedAttr.ProductAttributeAlias);
@@ -76,7 +76,7 @@ public override IAsyncEnumerable<ProductAttributePresetReadOnly> GetEntitiesAsyn
                 allowedAttributes.Add(new AllowedProductAttributeArtifact
                 {
                     ProductAttributeUdi = attrUdi,
-                    AllowedValueAliases = allowedAttr.AllowedValueAliases
+                    AllowedValueAliases = allowedAttr.AllowedValueAliases.Order().ToList()
                 });
             }
 

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceProductAttributeServiceConnector.cs

@@ -69,7 +69,7 @@ public override IAsyncEnumerable<ProductAttributeReadOnly> GetEntitiesAsync(Guid
                     DefaultValue = entity.Name.GetDefaultValue()
                 },
                 Code = entity.Alias,
-                Values = entity.Values.Select(x => new ProductAttributeValueArtifact
+                Values = entity.Values.OrderBy(x => x.Alias).Select(x => new ProductAttributeValueArtifact
                 {
                     Alias = x.Alias,
                     Name = new TranslatedValueArtifact<string>

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs

@@ -102,7 +102,7 @@ public override IAsyncEnumerable<ShippingMethodReadOnly> GetEntitiesAsync(Guid s
                 {
                     var servicesPrices = new List<ServicePriceArtifact>();
 
-                    foreach (ServicePrice? price in calcConfig.Prices)
+                    foreach (ServicePrice? price in calcConfig.Prices.OrderBy(x => x.CurrencyId).ThenBy(x => x.CountryId).ThenBy(x => x.RegionId))
                     {
                         var spArtifact = new ServicePriceArtifact { Value = price.Value };