Fix saved view predefined seed tests

Author: ejsmith

tests/Exceptionless.Tests/Controllers/SavedViewControllerTests.cs

@@ -42,9 +42,10 @@ public async Task DataSeedAsync_ExistingDataWithoutPredefinedViews_CreatesSystem
     {
         // Arrange
         Assert.True(await _organizationRepository.CountAsync() > 0);
+        int expectedPredefinedViewCount = await GetDefaultPredefinedSavedViewCountAsync();
 
         var existingSystemViews = await GetSystemPredefinedSavedViewsAsync();
-        Assert.Equal(6, existingSystemViews.Count);
+        Assert.Equal(expectedPredefinedViewCount, existingSystemViews.Count);
 
         foreach (var savedView in existingSystemViews)
             await _savedViewRepository.RemoveAsync(savedView.Id, o => o.ImmediateConsistency());
@@ -57,10 +58,11 @@ public async Task DataSeedAsync_ExistingDataWithoutPredefinedViews_CreatesSystem
 
         // Assert
         var seededSystemViews = await GetSystemPredefinedSavedViewsAsync();
-        Assert.Equal(6, seededSystemViews.Count);
+        Assert.Equal(expectedPredefinedViewCount, seededSystemViews.Count);
         Assert.Contains(seededSystemViews, view => IsPredefinedSavedView(view, "events", "All"));
         Assert.Contains(seededSystemViews, view => IsPredefinedSavedView(view, "events", "Logs"));
         Assert.Contains(seededSystemViews, view => IsPredefinedSavedView(view, "events", "Errors"));
+        Assert.Contains(seededSystemViews, view => IsPredefinedSavedView(view, "stacks", "All"));
         Assert.Contains(seededSystemViews, view => IsPredefinedSavedView(view, "stacks", "Most Frequent Errors"));
         Assert.Contains(seededSystemViews, view => IsPredefinedSavedView(view, "stacks", "Most Frequent 404s"));
         Assert.Contains(seededSystemViews, view => IsPredefinedSavedView(view, "stacks", "Most Used Features"));
@@ -82,14 +84,14 @@ public async Task GetPredefinedAsync_GlobalAdmin_ReturnsSeedJsonShape()
         Assert.Contains("\"filterDefinitions\"", json);
         Assert.DoesNotContain("\"filter_definitions\"", json);
         Assert.NotNull(definitions);
-        Assert.Equal(6, definitions.Count);
+        Assert.Equal(await GetDefaultPredefinedSavedViewCountAsync(), definitions.Count);
 
         var logs = definitions.FirstOrDefault(view => String.Equals(view.Key, "events:logs", StringComparison.OrdinalIgnoreCase));
         Assert.NotNull(logs);
         Assert.Equal("Logs", logs.Name);
         Assert.Equal("logs", logs.Slug);
         Assert.Equal("events", logs.ViewType);
-        Assert.Equal("type:log", logs.Filter);
+        Assert.Equal("type:log (status:open OR status:regressed)", logs.Filter);
         var filterDefinitions = logs.FilterDefinitions ?? throw new Xunit.Sdk.XunitException("Expected FilterDefinitions to be non-null.");
         Assert.Equal(JsonValueKind.Array, filterDefinitions.ValueKind);
     }
@@ -534,8 +536,10 @@ public async Task GetByOrganizationAsync_FirstRequest_CreatesPredefinedSavedView
 
         // Assert
         Assert.NotNull(filters);
+        Assert.Contains(filters, view => IsPredefinedSavedView(view, "events", "All"));
         Assert.Contains(filters, view => IsPredefinedSavedView(view, "events", "Logs"));
         Assert.Contains(filters, view => IsPredefinedSavedView(view, "events", "Errors"));
+        Assert.Contains(filters, view => IsPredefinedSavedView(view, "stacks", "All"));
         Assert.Contains(filters, view => IsPredefinedSavedView(view, "stacks", "Most Frequent Errors"));
         Assert.Contains(filters, view => IsPredefinedSavedView(view, "stacks", "Most Frequent 404s"));
         Assert.Contains(filters, view => IsPredefinedSavedView(view, "stacks", "Most Used Features"));
@@ -581,9 +585,11 @@ public async Task PostPredefinedAsync_AfterDelete_RecreatesPredefinedSavedViews(
 
         // Assert
         Assert.NotNull(predefinedViews);
-        Assert.Equal(6, predefinedViews.Count);
+        Assert.Equal(await GetDefaultPredefinedSavedViewCountAsync(), predefinedViews.Count);
+        Assert.Contains(predefinedViews, view => IsPredefinedSavedView(view, "events", "All"));
         Assert.Contains(predefinedViews, view => IsPredefinedSavedView(view, "events", "Logs"));
         Assert.Contains(predefinedViews, view => IsPredefinedSavedView(view, "events", "Errors"));
+        Assert.Contains(predefinedViews, view => IsPredefinedSavedView(view, "stacks", "All"));
         Assert.Contains(predefinedViews, view => IsPredefinedSavedView(view, "stacks", "Most Frequent Errors"));
         Assert.Contains(predefinedViews, view => IsPredefinedSavedView(view, "stacks", "Most Frequent 404s"));
         Assert.Contains(predefinedViews, view => IsPredefinedSavedView(view, "stacks", "Most Used Features"));
@@ -638,7 +644,7 @@ public async Task PostPredefinedAsync_ExistingViews_UpdatesByNameAndViewTypeAndP
         var updatedLogs = updatedPredefinedViews.FirstOrDefault(view => IsPredefinedSavedView(view, "events", "Logs"));
         Assert.NotNull(updatedLogs);
         Assert.Equal(logs.Id, updatedLogs.Id);
-        Assert.Equal("type:log", updatedLogs.Filter);
+        Assert.Equal("type:log (status:open OR status:regressed)", updatedLogs.Filter);
         Assert.Equal("logs", updatedLogs.Slug);
 
         Assert.NotNull(await _savedViewRepository.GetByIdAsync(customView.Id));
@@ -712,7 +718,7 @@ public async Task PostPredefinedSavedViewAsync_GlobalAdmin_UsesPromotedConfigura
 
         // Assert
         Assert.NotNull(updatedPredefinedViews);
-        Assert.Equal(6, updatedPredefinedViews.Count);
+        Assert.Equal(await GetDefaultPredefinedSavedViewCountAsync(), updatedPredefinedViews.Count);
         var applicationLogs = updatedPredefinedViews.FirstOrDefault(view => IsPredefinedSavedView(view, "events", "Application Logs"));
         Assert.NotNull(applicationLogs);
         Assert.Equal("application-logs", applicationLogs.Slug);
@@ -840,14 +846,15 @@ await SendRequestAsync(r => r
 
         // Assert
         Assert.NotNull(updatedPredefinedViews);
-        Assert.Equal(5, updatedPredefinedViews.Count);
+        int expectedPredefinedViewCount = await GetDefaultPredefinedSavedViewCountAsync();
+        Assert.Equal(expectedPredefinedViewCount - 1, updatedPredefinedViews.Count);
         Assert.DoesNotContain(updatedPredefinedViews, view => IsPredefinedSavedView(view, "events", "Logs"));
         Assert.Contains(updatedPredefinedViews, view => IsPredefinedSavedView(view, "events", "Errors"));
 
         await GetService<DataSeedService>().SeedAsync(TestContext.Current.CancellationToken);
         await RefreshDataAsync();
 
-        Assert.Equal(5, await _savedViewRepository.CountByOrganizationIdAsync(PredefinedSavedViewsDataSeed.SystemOrganizationId));
+        Assert.Equal(expectedPredefinedViewCount - 1, await _savedViewRepository.CountByOrganizationIdAsync(PredefinedSavedViewsDataSeed.SystemOrganizationId));
     }
 
     [Fact]
@@ -1306,6 +1313,12 @@ private async Task<List<SavedView>> GetSystemPredefinedSavedViewsAsync()
         return results.Documents.Where(view => view.UserId is null).ToList();
     }
 
+    private async Task<int> GetDefaultPredefinedSavedViewCountAsync()
+    {
+        var definitions = await PredefinedSavedViewsDataSeed.ReadDefaultSavedViewsAsync(TestCancellationToken);
+        return definitions.Count;
+    }
+
     // CanUpdateAsync permission tests
 
     [Fact]
@@ -2216,8 +2229,10 @@ private static bool IsPredefinedSavedView(SavedView savedView, string viewType,
 
     private static bool IsPredefinedSavedView(ViewSavedView savedView)
     {
-        return IsPredefinedSavedView(savedView, "events", "Logs")
+        return IsPredefinedSavedView(savedView, "events", "All")
+            || IsPredefinedSavedView(savedView, "events", "Logs")
             || IsPredefinedSavedView(savedView, "events", "Errors")
+            || IsPredefinedSavedView(savedView, "stacks", "All")
             || IsPredefinedSavedView(savedView, "stacks", "Most Frequent Errors")
             || IsPredefinedSavedView(savedView, "stacks", "Most Frequent 404s")
             || IsPredefinedSavedView(savedView, "stacks", "Most Used Features");