PT-10449: Update Crud and Search services (#196)

.editorconfig

@@ -3,12 +3,24 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = crlf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-# Dotnet code style settings:
+# 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
@@ -24,16 +36,24 @@ dotnet_style_qualification_for_event = false:suggestion
 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:
+# 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
@@ -55,6 +75,9 @@ 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
@@ -63,12 +86,84 @@ 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
 
-#JSON code style settings
-[*.json]
-indent_style = space
-indent_size = 2
+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
 
-#HTML code style settings
-[*.html]
-insert_final_newline = false
+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

Directory.Build.props

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

VirtoCommerce.PricingModule.sln.DotSettings

@@ -0,0 +1,6 @@
+<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/=postgre/@EntryIndexedValue">True</s:Boolean>
+  <s:Boolean x:Key="/Default/UserDictionary/Words/=pricelist/@EntryIndexedValue">True</s:Boolean>
+  <s:Boolean x:Key="/Default/UserDictionary/Words/=pricelists/@EntryIndexedValue">True</s:Boolean>
+  <s:Boolean x:Key="/Default/UserDictionary/Words/=virto/@EntryIndexedValue">True</s:Boolean>
+</wpf:ResourceDictionary>

module.ignore

@@ -0,0 +1,2 @@
+Antlr4.Runtime.Standard.dll
+TimeZoneConverter.dll

src/VirtoCommerce.PricingModule.Core/Model/PriceEvaluationContext.cs

@@ -1,30 +1,31 @@
 using System;
+using System.Collections.Generic;
 using VirtoCommerce.CoreModule.Core.Common;
 
 namespace VirtoCommerce.PricingModule.Core.Model
 {
-	public class PriceEvaluationContext : EvaluationContextBase, ICloneable
-	{
-		public string StoreId { get; set; } 
-		public string CatalogId { get; set; }
-		public string[] ProductIds { get; set; }
+    public class PriceEvaluationContext : EvaluationContextBase, ICloneable
+    {
+        public string StoreId { get; set; }
+        public string CatalogId { get; set; }
+        public IList<string> ProductIds { get; set; }
         // The ordered list of price-list IDs, evaluation logic will return only matched product prices from the first price-list from this list
         // To return all the prices found, simply set ReturnAllMatchedPrices to true
-		public string[] PricelistIds { get; set; }
-        public Pricelist[] Pricelists { get; set; }
+        public IList<string> PricelistIds { get; set; }
+        public IList<Pricelist> Pricelists { get; set; }
         // Set this flag to true for return all matched prices from all given pricelists 
-	    public bool ReturnAllMatchedPrices { get; set; }
+        public bool ReturnAllMatchedPrices { get; set; }
         public decimal Quantity { get; set; }
-		public string CustomerId { get; set; }
-		public string OrganizationId { get; set; }
-		public DateTime? CertainDate { get; set; }
-		public string Currency { get; set; }
+        public string CustomerId { get; set; }
+        public string OrganizationId { get; set; }
+        public DateTime? CertainDate { get; set; }
+        public string Currency { get; set; }
         // Set this flag to true for indexing from all given pricelists and skip Dynamic Conditions except Start and End Date  
         public bool SkipAssignmentValidation { get; set; }
 
         public object Clone()
         {
-            return base.MemberwiseClone() as PriceEvaluationContext;
+            return (PriceEvaluationContext)MemberwiseClone();
         }
     }
 }

src/VirtoCommerce.PricingModule.Core/Model/Search/MergedPriceSearchCriteria.cs

@@ -11,6 +11,6 @@ public class MergedPriceSearchCriteria : SearchCriteriaBase
 
         public string PriorityPriceListId { get; set; }
 
-        public List<string> ProductIds { get; set; }
+        public IList<string> ProductIds { get; set; }
     }
 }

src/VirtoCommerce.PricingModule.Core/Model/Search/PricelistAssignmentsSearchCriteria.cs

@@ -1,13 +1,15 @@
+using System.Collections.Generic;
+
 namespace VirtoCommerce.PricingModule.Core.Model.Search
 {
     public class PricelistAssignmentsSearchCriteria : PricingSearchCriteria
     {
         public string PriceListId { get; set; }
-        public string[] CatalogIds { get; set; }
-        public string[] StoreIds { get; set; }
+        public IList<string> CatalogIds { get; set; }
+        public IList<string> StoreIds { get; set; }
 
-        private string[] _priceListIds;
-        public string[] PriceListIds
+        private IList<string> _priceListIds;
+        public IList<string> PriceListIds
         {
             get
             {

src/VirtoCommerce.PricingModule.Core/Model/Search/PricelistSearchCriteria.cs

@@ -1,7 +1,9 @@
+using System.Collections.Generic;
+
 namespace VirtoCommerce.PricingModule.Core.Model.Search
 {
     public class PricelistSearchCriteria : PricingSearchCriteria
     {
-        public string[] Currencies { get; set; }
+        public IList<string> Currencies { get; set; }
     }
 }

src/VirtoCommerce.PricingModule.Core/Model/Search/PricesSearchCriteria.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace VirtoCommerce.PricingModule.Core.Model.Search
 {
@@ -9,8 +10,8 @@ public class PricesSearchCriteria : PricingSearchCriteria
 
         public string PriceListId { get; set; }
 
-        private string[] _priceListIds;
-        public string[] PriceListIds
+        private IList<string> _priceListIds;
+        public IList<string> PriceListIds
         {
             get
             {
@@ -28,8 +29,8 @@ public string[] PriceListIds
 
         public string ProductId { get; set; }
 
-        private string[] _productIds;
-        public string[] ProductIds
+        private IList<string> _productIds;
+        public IList<string> ProductIds
         {
             get
             {

src/VirtoCommerce.PricingModule.Core/Services/IPriceSearchService.cs

@@ -0,0 +1,9 @@
+using VirtoCommerce.Platform.Core.GenericCrud;
+using VirtoCommerce.PricingModule.Core.Model;
+using VirtoCommerce.PricingModule.Core.Model.Search;
+
+namespace VirtoCommerce.PricingModule.Core.Services;
+
+public interface IPriceSearchService : ISearchService<PricesSearchCriteria, PriceSearchResult, Price>
+{
+}

src/VirtoCommerce.PricingModule.Core/Services/IPriceService.cs

@@ -0,0 +1,8 @@
+using VirtoCommerce.Platform.Core.GenericCrud;
+using VirtoCommerce.PricingModule.Core.Model;
+
+namespace VirtoCommerce.PricingModule.Core.Services;
+
+public interface IPriceService : ICrudService<Price>
+{
+}

src/VirtoCommerce.PricingModule.Core/Services/IPricelistAssignmentSearchService.cs

@@ -0,0 +1,9 @@
+using VirtoCommerce.Platform.Core.GenericCrud;
+using VirtoCommerce.PricingModule.Core.Model;
+using VirtoCommerce.PricingModule.Core.Model.Search;
+
+namespace VirtoCommerce.PricingModule.Core.Services;
+
+public interface IPricelistAssignmentSearchService : ISearchService<PricelistAssignmentsSearchCriteria, PricelistAssignmentSearchResult, PricelistAssignment>
+{
+}

src/VirtoCommerce.PricingModule.Core/Services/IPricelistAssignmentService.cs

@@ -0,0 +1,8 @@
+using VirtoCommerce.Platform.Core.GenericCrud;
+using VirtoCommerce.PricingModule.Core.Model;
+
+namespace VirtoCommerce.PricingModule.Core.Services;
+
+public interface IPricelistAssignmentService : ICrudService<PricelistAssignment>
+{
+}

src/VirtoCommerce.PricingModule.Core/Services/IPricelistSearchService.cs

@@ -0,0 +1,9 @@
+using VirtoCommerce.Platform.Core.GenericCrud;
+using VirtoCommerce.PricingModule.Core.Model;
+using VirtoCommerce.PricingModule.Core.Model.Search;
+
+namespace VirtoCommerce.PricingModule.Core.Services;
+
+public interface IPricelistSearchService : ISearchService<PricelistSearchCriteria, PricelistSearchResult, Pricelist>
+{
+}

src/VirtoCommerce.PricingModule.Core/Services/IPricelistService.cs

@@ -0,0 +1,8 @@
+using VirtoCommerce.Platform.Core.GenericCrud;
+using VirtoCommerce.PricingModule.Core.Model;
+
+namespace VirtoCommerce.PricingModule.Core.Services;
+
+public interface IPricelistService : ICrudService<Pricelist>
+{
+}

src/VirtoCommerce.PricingModule.Core/Services/IPricingEvaluatorService.cs

@@ -11,14 +11,14 @@ public interface IPricingEvaluatorService
         /// </summary>
         /// <param name="evalContext"></param>
         /// <returns></returns>
-        Task<IEnumerable<Pricelist>> EvaluatePriceListsAsync(PriceEvaluationContext evalContext);
+        Task<IList<Pricelist>> EvaluatePriceListsAsync(PriceEvaluationContext evalContext);
 
         /// <summary>
         /// Evaluation product prices.
         /// Will get either all prices or one price per currency depending on the settings in evalContext.
         /// </summary>
         /// <param name="evalContext"></param>
         /// <returns></returns>
-        Task<IEnumerable<Price>> EvaluateProductPricesAsync(PriceEvaluationContext evalContext);
+        Task<IList<Price>> EvaluateProductPricesAsync(PriceEvaluationContext evalContext);
     }
 }