Update store entity with default location + measurement

Author: mattbrailsford

src/Umbraco.Commerce.Deploy/Artifacts/StoreArtifact.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
+using Umbraco.Commerce.Core.Models;
 using Umbraco.Deploy.Infrastructure.Artifacts;
 
 namespace Umbraco.Commerce.Deploy.Artifacts
@@ -18,10 +19,14 @@ public StoreArtifact(GuidUdi udi, IEnumerable<ArtifactDependency> dependencies =
 
         public GuidUdi DefaultTaxClassUdi { get; set; }
 
+        public GuidUdi DefaultLocationUdi { get; set; }
+
         public GuidUdi DefaultOrderStatusUdi { get; set; }
 
         public GuidUdi ErrorOrderStatusUdi { get; set; }
 
+        public MeasurementSystem MeasurementSystem { get; set; }
+
         public bool PricesIncludeTax { get; set; }
 
         public TimeSpan? CookieTimeout { get; set; }

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

@@ -54,15 +54,14 @@ public override StoreArtifact GetArtifact(GuidUdi udi, StoreReadOnly entity)
             if (entity == null)
                 return null;
 
-            // TODO: Add the "defaults" as dependencies?
-
             var dependencies = new ArtifactDependencyCollection();
 
 #pragma warning disable CS0618 // OrderEditorConfig is obsolete
             var artifact = new StoreArtifact(udi, dependencies)
             {
                 Name = entity.Name,
                 Alias = entity.Alias,
+                MeasurementSystem = entity.MeasurementSystem,
                 PricesIncludeTax = entity.PricesIncludeTax,
                 CookieTimeout = entity.CookieTimeout,
                 CartNumberTemplate = entity.CartNumberTemplate,
@@ -105,6 +104,15 @@ public override StoreArtifact GetArtifact(GuidUdi udi, StoreReadOnly entity)
                 artifact.DefaultTaxClassUdi = depUdi;
             }
 
+            // Default location
+            if (entity.DefaultLocationId.HasValue)
+            {
+                var depUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Location, entity.DefaultLocationId.Value);
+                var dep = new UmbracoCommerceArtifactDependency(depUdi);
+                dependencies.Add(dep);
+                artifact.DefaultLocationUdi = depUdi;
+            }
+
             // Default order status
             if (entity.DefaultOrderStatusId.HasValue)
             {
@@ -247,6 +255,7 @@ private void Pass1(ArtifactDeployState<StoreArtifact, StoreReadOnly> state, IDep
 
 #pragma warning disable CS0618 // SetOrderEditorConfig is obsolete
                 entity.SetName(artifact.Name, artifact.Alias)
+                    .SetMeasurementSystem(artifact.MeasurementSystem)
                     .SetPriceTaxInclusivity(artifact.PricesIncludeTax)
                     .SetCartNumberTemplate(artifact.CartNumberTemplate)
                     .SetOrderNumberTemplate(artifact.OrderNumberTemplate)
@@ -341,6 +350,18 @@ private void Pass4(ArtifactDeployState<StoreArtifact, StoreReadOnly> state, IDep
 
                 entity.SetDefaultTaxClass(defaultTaxClassId);
 
+                // DefaultLocation
+                Guid? defaultLocationId = null;
+
+                if (artifact.DefaultLocationUdi != null)
+                {
+                    artifact.DefaultLocationUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Location);
+
+                    defaultLocationId = _umbracoCommerceApi.GetLocation(artifact.DefaultLocationUdi.Guid)?.Id;
+                }
+
+                entity.SetDefaultLocation(defaultLocationId);
+
                 // DefaultOrderStatus
                 Guid? defaultOrderStatusId = null;