Merge branch 'release/3.814.0'

VirtoCommerce · Mar 18, 2024 · 65c27be · 65c27be
2 parents d3bb85d + b343b06
commit 65c27be
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.813.0</VersionPrefix>
+    <VersionPrefix>3.814.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.ExperienceApiModule.DigitalCatalog/Index/IndexSearchRequestBuilder.cs b/src/VirtoCommerce.ExperienceApiModule.DigitalCatalog/Index/IndexSearchRequestBuilder.cs
@@ -92,6 +92,37 @@ public IndexSearchRequestBuilder WithIncludeFields(params string[] includeFields
             return this;
         }
 
+        public IndexSearchRequestBuilder AddCertainDateFilter(DateTime certainDate)
+        {
+            var startDateFilter = new RangeFilter
+            {
+                FieldName = "startdate",
+                Values = [new RangeFilterValue
+                    {
+                        Lower = null,
+                        Upper = certainDate.ToString("O"),
+                        IncludeLower = false,
+                        IncludeUpper = true,
+                    }]
+            };
+
+            var endDateFilter = new RangeFilter
+            {
+                FieldName = "enddate",
+                Values = [new RangeFilterValue
+                    {
+                        Lower = certainDate.ToString("O"),
+                        Upper = null,
+                        IncludeLower = false,
+                        IncludeUpper = true,
+                    }]
+            };
+
+            AddFiltersToSearchRequest([startDateFilter, endDateFilter]);
+
+            return this;
+        }
+
         public IndexSearchRequestBuilder AddObjectIds(IEnumerable<string> ids)
         {
             if (!ids.IsNullOrEmpty())

diff --git a/src/VirtoCommerce.ExperienceApiModule.DigitalCatalog/Queries/SearchProductQueryHandler.cs b/src/VirtoCommerce.ExperienceApiModule.DigitalCatalog/Queries/SearchProductQueryHandler.cs
@@ -117,6 +117,7 @@ protected virtual IndexSearchRequestBuilder GetIndexedSearchRequestBuilder(Searc
                                             .WithUserId(request.UserId)
                                             .WithCurrency(currency.Code)
                                             .WithFuzzy(request.Fuzzy, request.FuzzyLevel)
+                                            .AddCertainDateFilter(DateTime.UtcNow)
                                             .ParseFilters(_phraseParser, request.Filter)
                                             .WithSearchPhrase(request.Query)
                                             .WithPaging(request.Skip, request.Take)

diff --git a/src/VirtoCommerce.ExperienceApiModule.Web/module.manifest b/src/VirtoCommerce.ExperienceApiModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.ExperienceApi</id>
-  <version>3.813.0</version>
+  <version>3.814.0</version>
   <version-tag />
   <platformVersion>3.813.0</platformVersion>
   <dependencies>