Merge pull request #240 from RachBreeze/ShopifyCacheLevel

Shopify cache level

Author: acoumb

src/Umbraco.Cms.Integrations.Commerce.Shopify/Configuration/ShopifySettings.cs

@@ -1,12 +1,17 @@
 using System.Collections.Specialized;
+#if NETCOREAPP
+using Umbraco.Cms.Core.PropertyEditors;
+#else
+using Umbraco.Core.PropertyEditors;
+#endif
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Configuration
 {
     public class ShopifySettings
     {
         public ShopifySettings()
         {
-            
+
         }
 
         public ShopifySettings(NameValueCollection appSettings)
@@ -17,6 +22,26 @@ public ShopifySettings(NameValueCollection appSettings)
             UseUmbracoAuthorization = bool.TryParse(appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyUseUmbracoAuthorizationKey], out var key)
                ? key
                : true;
+
+            // Enum.TryParse introduced in .NET site is .NETFramework and .NET Core, same logic will work for both
+            switch (appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyPropertyCacheLevel])
+            {
+                case "Unknown":
+                    PropertyCacheLevel = PropertyCacheLevel.Unknown;
+                    break;
+                case "Element":
+                    PropertyCacheLevel = PropertyCacheLevel.Element;
+                    break;
+                case "Elements":
+                    PropertyCacheLevel = PropertyCacheLevel.Elements;
+                    break;
+                case "None":
+                    PropertyCacheLevel = PropertyCacheLevel.None;
+                    break;
+                default:
+                    PropertyCacheLevel = PropertyCacheLevel.Snapshot;
+                    break;
+            }
         }
 
         public string ApiVersion { get; set; }
@@ -26,5 +51,7 @@ public ShopifySettings(NameValueCollection appSettings)
         public string AccessToken { get; set; }
 
         public bool UseUmbracoAuthorization { get; set; } = true;
+
+        public PropertyCacheLevel PropertyCacheLevel { get; set; } = PropertyCacheLevel.Snapshot;
     }
 }

src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs

@@ -47,6 +47,9 @@ public static class Configuration
             public const string UmbracoCmsIntegrationsCommerceShopifyScopesKey = "Umbraco.Cms.Integrations.Commerce.Shopify.Scopes";
 
             public const string UmbracoCmsIntegrationsCommerceShopifyTokenEndpointKey = "Umbraco.Cms.Integrations.Commerce.Shopify.TokenEndpoint";
+
+            public const string UmbracoCmsIntegrationsCommerceShopifyPropertyCacheLevel =
+                "Umbraco.Cms.Integrations.Commerce.Shopify.PropertyCacheLevel";
         }
 
         public static class PropertyEditors

src/Umbraco.Cms.Integrations.Commerce.Shopify/Editors/ShopifyProductPickerValueConverter.cs

@@ -4,23 +4,36 @@
 using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
 
 #if NETCOREAPP
+using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Models.PublishedContent;
 #else
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
+using System.Configuration;
 #endif
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Editors
 {
     public class ShopifyProductPickerValueConverter : PropertyValueConverterBase
     {
         private readonly IShopifyService _apiService;
+        private readonly ShopifySettings _settings;
 
+#if NETCOREAPP
+        public ShopifyProductPickerValueConverter(IOptions<ShopifySettings> options, IShopifyService apiService)
+#else
         public ShopifyProductPickerValueConverter(IShopifyService apiService)
+#endif
         {
+#if NETCOREAPP
+            _settings = options.Value;
+#else
+            _settings = new ShopifySettings(ConfigurationManager.AppSettings);
+#endif
             _apiService = apiService;
         }
 
@@ -30,7 +43,7 @@ public override bool IsConverter(IPublishedPropertyType propertyType) =>
         public override Type GetPropertyValueType(IPublishedPropertyType propertyType) => typeof(List<ProductViewModel>);
 
         public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType) =>
-            PropertyCacheLevel.Snapshot;
+            _settings.PropertyCacheLevel;
 
         public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source,
             bool preview)

src/Umbraco.Cms.Integrations.Commerce.Shopify/Umbraco.Cms.Integrations.Commerce.Shopify.csproj

@@ -36,12 +36,12 @@
 		<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,13)" />
 		<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,13)" />
 	</ItemGroup>
-	
+
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="Umbraco.Cms.Web.Website" version="[13.0.0,14)" />
 		<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[13.0.0,14)" />
 	</ItemGroup>
-	
+
 	<ItemGroup>
 		<Content Include="App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\**\*.*">
 			<Pack>true</Pack>