Use updated Crud and Search services

.editorconfig

@@ -0,0 +1,169 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# Project files
+[*.{csproj,props}]
+insert_final_newline = false
+
+# HTML files
+[*.{html,htm}]
+insert_final_newline = false
+
+# Code
+[*.{cs,js,ts,ps1,sh,bat,cmd}]
+indent_size = 4
+
+# Dotnet code style settings
+[*.{cs,vb}]
+
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+
+# Avoid "this." and "Me." if not necessary
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Use explicit accessibility modifiers
+dotnet_style_require_accessibility_modifiers = true:suggestion
+
+# Suggest more modern language features when available
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_prefer_inferred_tuple_names = true:suggestion
+dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion
+
+# CSharp code style settings
+[*.cs]
+
+# Prefer curly braces even for one line of code
+csharp_prefer_braces = true:suggestion
+
+# Prefer "var" everywhere
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Prefer method-like constructs to have a block body
+csharp_style_expression_bodied_methods = false:none
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_operators = false:none
+
+# Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_properties = true:none
+csharp_style_expression_bodied_indexers = true:none
+csharp_style_expression_bodied_accessors = true:none
+
+# Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+
+# Newline settings
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+
+csharp_preserve_single_line_statements = false
+csharp_preserve_single_line_blocks = true
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+
+[*.{cs,vb}]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion

.gitattributes

@@ -0,0 +1 @@
+* text=auto

Directory.Build.props

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-	<!-- These properties will be shared for all projects -->
-	<PropertyGroup>
-		<VersionPrefix>4.400.0</VersionPrefix>
-		<VersionSuffix>
-		</VersionSuffix>
-		<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-	</PropertyGroup>
-	<PropertyGroup>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	</PropertyGroup>
+  <!-- These properties will be shared for all projects -->
+  <PropertyGroup>
+    <VersionPrefix>4.400.0</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+    <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
 </Project>

VirtoCommerce.GoogleEcommerceAnalyticsModule.sln.DotSettings

@@ -1,2 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Virto/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=analytics/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ecommerce/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=virto/@EntryIndexedValue">True</s:Boolean>
+</wpf:ResourceDictionary>

module.ignore

@@ -0,0 +1 @@
+TimeZoneConverter.dll

src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core/Models/GoogleAnalyticsSettings.cs

@@ -0,0 +1,8 @@
+namespace VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.Models
+{
+    public class GoogleAnalyticsSettings
+    {
+        public bool EnableTracking { get; set; }
+        public string MeasurementId { get; set; }
+    }
+}

src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core/Services/IGoogleAnalyticsSettingsManager.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.Models;
+
+namespace VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.Services
+{
+    public interface IGoogleAnalyticsSettingsManager
+    {
+        Task<GoogleAnalyticsSettings> GetAsync(string storeId);
+    }
+}

src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.csproj

@@ -7,15 +7,12 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
-
   <PropertyGroup>
     <!-- Project is not a test project -->
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.200.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.400.0" />
   </ItemGroup>
-
 </Project>

src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data/Services/GoogleAnalyticsSettingsManager.cs

@@ -1,32 +1,36 @@
-using System.Threading.Tasks;
-using VirtoCommerce.Platform.Core.GenericCrud;
+using System.Threading.Tasks;
+using VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.Models;
+using VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.Services;
+using VirtoCommerce.Platform.Core.Common;
 using VirtoCommerce.Platform.Core.Settings;
-using VirtoCommerce.StoreModule.Core.Model;
 using VirtoCommerce.StoreModule.Core.Services;
+using GoogleSettings = VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.ModuleConstants.Settings.General;
 
 namespace VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.Services
 {
     public class GoogleAnalyticsSettingsManager : IGoogleAnalyticsSettingsManager
     {
-        readonly ICrudService<Store> _storeService;
+        readonly IStoreService _storeService;
 
-        public GoogleAnalyticsSettingsManager(ICrudService<Store> storeService)
+        public GoogleAnalyticsSettingsManager(IStoreService storeService)
         {
             _storeService = storeService;
         }
 
         public virtual async Task<GoogleAnalyticsSettings> GetAsync(string storeId)
         {
-            var retVal = new GoogleAnalyticsSettings { EnableTracking = false};
+            var retVal = new GoogleAnalyticsSettings { EnableTracking = false };
 
-            var store = await _storeService.GetByIdAsync(storeId);
+            var store = await _storeService.GetNoCloneAsync(storeId);
             if (store == null)
+            {
                 return retVal;
+            }
 
-            retVal.MeasurementId = store.Settings.GetSettingValue("GoogleAnalytics4.MeasurementId", string.Empty);
+            retVal.MeasurementId = store.Settings.GetSettingValue(GoogleSettings.MeasurementId.Name, string.Empty);
             if (!string.IsNullOrEmpty(retVal.MeasurementId))
             {
-                retVal.EnableTracking = store.Settings.GetSettingValue("GoogleAnalytics4.EnableTracking", false);
+                retVal.EnableTracking = store.Settings.GetSettingValue(GoogleSettings.EnableTracking.Name, false);
             }
 
             return retVal;

src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <noWarn>1591</noWarn>
@@ -7,27 +7,15 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
-
   <PropertyGroup>
-      <!-- Project is not a test project -->
-      <SonarQubeTestProject>false</SonarQubeTestProject>
+    <!-- Project is not a test project -->
+    <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
-
-
   <ItemGroup>
-    <ProjectReference Include="..\VirtoCommerce.GoogleEcommerceAnalyticsModule.Core\VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Converters\" />
-    <Folder Include="Handlers\" />
-    <Folder Include="Services\" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.400.0" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.200.0" />
-    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.200.0" />
+    <ProjectReference Include="..\VirtoCommerce.GoogleEcommerceAnalyticsModule.Core\VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.csproj" />
   </ItemGroup>
-
 </Project>

src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/Controllers/Api/GoogleAnalyticsController.cs

@@ -1,9 +1,11 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using VirtoCommerce.GoogleEcommerceAnalyticsModule.Core;
-using VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.Services;
+using VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.Models;
+using VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.Services;
 using VirtoCommerce.Platform.Core.Settings;
+using GoogleSettings = VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.ModuleConstants.Settings.General;
 
 namespace VirtoCommerce.GoogleEcommerceAnalyticsModule.Web.Controllers.Api
 {
@@ -31,10 +33,12 @@ public Task<GoogleAnalyticsSettings> GetStoreSettings(string storeId)
         [Authorize(ModuleConstants.Security.Permissions.Access)]
         public ActionResult Redirect()
         {
-            var redirectUrl = _settingsManager.GetValue(ModuleConstants.Settings.General.GoogleAnalyticsUrl.Name, ModuleConstants.Settings.DefaultGoogleAnalyticsUrl);
+            var redirectUrl = _settingsManager.GetValue<string>(GoogleSettings.GoogleAnalyticsUrl);
 
             if (string.IsNullOrEmpty(redirectUrl))
-                return NotFound("GoogleAnalyticsUrl is not configured in Platfortm Settings");
+            {
+                return NotFound("GoogleAnalyticsUrl is not configured in Platform Settings");
+            }
 
             return Redirect(redirectUrl);
         }