small fixes

Author: basilkot

src/VirtoCommerce.ContentModule.Data/Services/ContentStatisticService.cs

@@ -63,8 +63,7 @@ private async Task<int> CountContentItemsRecursive(string folderUrl, IBlobStorag
             var folders = searchResult.Results.OfType<BlobFolder>();
             var blobs = searchResult.Results.OfType<BlobInfo>()
                 .Where(x => contentItemTypeRegistrar.IsRegisteredContentItemType(x.RelativeUrl) &&
-                            (startDate == null || x.ModifiedDate >= startDate) &&
-                            (endDate == null || x.ModifiedDate <= endDate));
+                            IsDateBetween(x.ModifiedDate, startDate, endDate));
 
             var result = blobs
                 .Select(x => publishingService.GetRelativeDraftUrl(x.RelativeUrl, draft: false))
@@ -83,5 +82,11 @@ private async Task<int> CountContentItemsRecursive(string folderUrl, IBlobStorag
 
             return result;
         }
+
+        private static bool IsDateBetween(DateTime? modifiedDate, DateTime? startDate, DateTime? endDate)
+        {
+            return (startDate == null || modifiedDate >= startDate) &&
+                   (endDate == null || modifiedDate <= endDate);
+        }
     }
 }

tests/VirtoCommerce.ContentModule.Tests/ContentStatisticServiceTests.cs

@@ -28,7 +28,7 @@ public async Task GetStorePagesCount_IsCorrect(string filename1, string filename
         Assert.Equal(expectedCount, result);
     }
 
-    private ContentStatisticService GetService(params string[] files)
+    private static ContentStatisticService GetService(params string[] files)
     {
         var blobContentProviderFactory = new BlobContentStorageProviderStub(files);
         var contentPathResolver = new ContentPathResolverStub();

tests/VirtoCommerce.ContentModule.Tests/PublishingServiceTests.cs

@@ -152,10 +152,10 @@ ContentFile CreateContentFile(string filename)
         Assert.Equal(expectedPublishedCount, result.Count(x => x.Published));
         Assert.Equal(expectedUnpublishedCount, result.Count(x => !x.Published));
         Assert.Equal(expectedHasChangesCount, result.Count(x => x.HasChanges));
-        Assert.Equal(expectedTotalCount, result.Count());
+        Assert.Equal(expectedTotalCount, result.Count);
     }
 
-    private (PublishingServices, Mock<IContentService>) GetPublishingService((string Filename, bool Exists)[] files)
+    private static (PublishingServices, Mock<IContentService>) GetPublishingService((string Filename, bool Exists)[] files)
     {
         var contentService = new Mock<IContentService>();