Null check config object

Author: mattbrailsford

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

@@ -87,56 +87,59 @@ public override ShippingMethodArtifact GetArtifact(GuidUdi udi, ShippingMethodRe
             // it's config is all plugin based, we can't be certain of the data structure
             // and so we just have to pass the value through. Realtime rates don't currently
             // have any dependencies.
-            if (entity.CalculationMode == ShippingCalculationMode.Fixed && entity.CalculationConfig is FixedRateShippingCalculationConfig calcConfig)
+            if (entity.CalculationConfig != null)
             {
-                var servicesPrices = new List<ServicePriceArtifact>();
-
-                foreach (var price in calcConfig.Prices)
+                if (entity.CalculationMode == ShippingCalculationMode.Fixed && entity.CalculationConfig is FixedRateShippingCalculationConfig calcConfig)
                 {
-                    var spArtifact = new ServicePriceArtifact { Value = price.Value };
+                    var servicesPrices = new List<ServicePriceArtifact>();
 
-                    // Currency
-                    var currencyDepUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Currency, price.CurrencyId);
-                    var currencyDep = new UmbracoCommerceArtifactDependency(currencyDepUdi);
+                    foreach (var price in calcConfig.Prices)
+                    {
+                        var spArtifact = new ServicePriceArtifact { Value = price.Value };
 
-                    dependencies.Add(currencyDep);
+                        // Currency
+                        var currencyDepUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Currency, price.CurrencyId);
+                        var currencyDep = new UmbracoCommerceArtifactDependency(currencyDepUdi);
 
-                    spArtifact.CurrencyUdi = currencyDepUdi;
+                        dependencies.Add(currencyDep);
 
-                    // Country
-                    if (price.CountryId.HasValue)
-                    {
-                        var countryDepUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Country, price.CountryId.Value);
-                        var countryDep = new UmbracoCommerceArtifactDependency(countryDepUdi);
+                        spArtifact.CurrencyUdi = currencyDepUdi;
 
-                        dependencies.Add(countryDep);
+                        // Country
+                        if (price.CountryId.HasValue)
+                        {
+                            var countryDepUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Country, price.CountryId.Value);
+                            var countryDep = new UmbracoCommerceArtifactDependency(countryDepUdi);
 
-                        spArtifact.CountryUdi = countryDepUdi;
-                    }
+                            dependencies.Add(countryDep);
 
-                    // Region
-                    if (price.RegionId.HasValue)
-                    {
-                        var regionDepUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Region, price.RegionId.Value);
-                        var regionDep = new UmbracoCommerceArtifactDependency(regionDepUdi);
+                            spArtifact.CountryUdi = countryDepUdi;
+                        }
 
-                        dependencies.Add(regionDep);
+                        // Region
+                        if (price.RegionId.HasValue)
+                        {
+                            var regionDepUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Region, price.RegionId.Value);
+                            var regionDep = new UmbracoCommerceArtifactDependency(regionDepUdi);
+
+                            dependencies.Add(regionDep);
 
-                        spArtifact.RegionUdi = regionDepUdi;
+                            spArtifact.RegionUdi = regionDepUdi;
+                        }
+
+                        servicesPrices.Add(spArtifact);
                     }
 
-                    servicesPrices.Add(spArtifact);
+                    artifact.CalculationConfig = JObject.FromObject(new FixedRateShippingCalculationConfigArtifact
+                    {
+                        Prices = servicesPrices
+                    });
                 }
-
-                artifact.CalculationConfig = JObject.FromObject(new FixedRateShippingCalculationConfigArtifact
+                else
                 {
-                    Prices = servicesPrices
-                });
-            }
-            else
-            {
-                // No additional processing required
-                artifact.CalculationConfig = JObject.FromObject(entity.CalculationConfig);
+                    // No additional processing required
+                    artifact.CalculationConfig = JObject.FromObject(entity.CalculationConfig);
+                }
             }
 
             // Allowed country regions