Add saved view home defaults

src/Exceptionless.Core/Models/Organization.cs

@@ -32,6 +32,12 @@ public Organization()
     [Required]
     public string Name { get; set; } = null!;
 
+    /// <summary>
+    /// The shared saved view used as the default landing view when a user has not selected a personal default.
+    /// </summary>
+    [ObjectId]
+    public string? DefaultSavedViewId { get; set; }
+
     [StringLength(2000)]
     public string? IconFileName { get; set; }
 

src/Exceptionless.Core/Models/User.cs

@@ -23,6 +23,7 @@ public record User : IIdentity, IHaveDates, IValidatableObject
     public string? PasswordResetToken { get; set; }
     public DateTime PasswordResetTokenExpiration { get; set; }
     public ICollection<OAuthAccount> OAuthAccounts { get; init; } = new Collection<OAuthAccount>();
+    public ICollection<UserOrganizationPreference> OrganizationPreferences { get; init; } = new Collection<UserOrganizationPreference>();
 
     /// <summary>
     /// Gets or sets the users Full Name.

src/Exceptionless.Core/Models/UserOrganizationPreference.cs

@@ -0,0 +1,13 @@
+using Exceptionless.Core.Attributes;
+using Foundatio.Repositories.Models;
+
+namespace Exceptionless.Core.Models;
+
+public sealed record UserOrganizationPreference
+{
+    [ObjectId]
+    public string OrganizationId { get; set; } = null!;
+
+    [ObjectId]
+    public string DefaultSavedViewId { get; set; } = null!;
+}

src/Exceptionless.Core/Repositories/Configuration/Indexes/OrganizationIndex.cs

@@ -13,7 +13,7 @@ public sealed class OrganizationIndex : VersionedIndex<Organization>
     private const string KEYWORD_LOWERCASE_ANALYZER = "keyword_lowercase";
     private readonly ExceptionlessElasticConfiguration _configuration;
 
-    public OrganizationIndex(ExceptionlessElasticConfiguration configuration) : base(configuration, configuration.Options.ScopePrefix + "organizations", 3)
+    public OrganizationIndex(ExceptionlessElasticConfiguration configuration) : base(configuration, configuration.Options.ScopePrefix + "organizations", 4)
     {
         _configuration = configuration;
     }
@@ -25,6 +25,7 @@ public override void ConfigureIndexMapping(TypeMappingDescriptor<Organization> m
             .Properties(p => p
                 .SetupDefaults()
                 .Text(e => e.Name, t => t.AddKeywordField())
+                .Keyword(e => e.DefaultSavedViewId)
                 .Keyword(e => e.StripeCustomerId)
                 .Boolean(e => e.HasPremiumFeatures)
                 .Keyword(e => e.Features)

src/Exceptionless.Core/Repositories/Configuration/Indexes/UserIndex.cs

@@ -12,7 +12,7 @@ public sealed class UserIndex : VersionedIndex<User>
     private const string KEYWORD_LOWERCASE_ANALYZER = "keyword_lowercase";
     private readonly ExceptionlessElasticConfiguration _configuration;
 
-    public UserIndex(ExceptionlessElasticConfiguration configuration) : base(configuration, configuration.Options.ScopePrefix + "users", 1)
+    public UserIndex(ExceptionlessElasticConfiguration configuration) : base(configuration, configuration.Options.ScopePrefix + "users", 2)
     {
         _configuration = configuration;
     }
@@ -32,6 +32,9 @@ public override void ConfigureIndexMapping(TypeMappingDescriptor<User> map)
                 .Keyword(e => e.PasswordResetToken)
                 .Date(e => e.PasswordResetTokenExpiration)
                 .Keyword(e => e.Roles)
+                .Object(e => e.OrganizationPreferences, o => o.Properties(mp => mp
+                    .Keyword("organization_id")
+                    .Keyword("default_saved_view_id")))
                 .Object(e => e.OAuthAccounts, o => o.Properties(mp => mp
                     .Keyword("provider")
                     .Keyword("provider_user_id")

src/Exceptionless.Core/Repositories/Interfaces/IUserRepository.cs

@@ -11,4 +11,6 @@ public interface IUserRepository : ISearchableRepository<User>
     Task<User?> GetUserByOAuthProviderAsync(string provider, string providerUserId);
     Task<User?> GetByVerifyEmailAddressTokenAsync(string token);
     Task<FindResults<User>> GetByOrganizationIdAsync(string organizationId, CommandOptionsDescriptor<User>? options = null);
+    Task<FindResults<User>> GetByOrganizationPreferenceIdAsync(string organizationId, CommandOptionsDescriptor<User>? options = null);
+    Task<FindResults<User>> GetByDefaultSavedViewIdAsync(string savedViewId, CommandOptionsDescriptor<User>? options = null);
 }

src/Exceptionless.Core/Repositories/UserRepository.cs

@@ -67,6 +67,22 @@ public Task<FindResults<User>> GetByOrganizationIdAsync(string organizationId, C
         return FindAsync(q => q.FieldEquals(u => u.OrganizationIds, organizationId).SortAscending(u => u.EmailAddress), o => commandOptions);
     }
 
+    public Task<FindResults<User>> GetByDefaultSavedViewIdAsync(string savedViewId, CommandOptionsDescriptor<User>? options = null)
+    {
+        if (String.IsNullOrEmpty(savedViewId))
+            return Task.FromResult(new FindResults<User>());
+
+        return FindAsync(q => q.FieldEquals(u => u.OrganizationPreferences.First().DefaultSavedViewId, savedViewId), options);
+    }
+
+    public Task<FindResults<User>> GetByOrganizationPreferenceIdAsync(string organizationId, CommandOptionsDescriptor<User>? options = null)
+    {
+        if (String.IsNullOrEmpty(organizationId))
+            return Task.FromResult(new FindResults<User>());
+
+        return FindAsync(q => q.FieldEquals(u => u.OrganizationPreferences.First().OrganizationId, organizationId), options);
+    }
+
     protected override async Task AddDocumentsToCacheAsync(ICollection<FindHit<User>> findHits, ICommandOptions options, bool isDirtyRead)
     {
         await base.AddDocumentsToCacheAsync(findHits, options, isDirtyRead);

src/Exceptionless.Core/Services/OrganizationService.cs

@@ -93,6 +93,8 @@ public async Task<long> RemoveUsersAsync(Organization organization, string? curr
                 {
                     _logger.LogInformation("Removing user {User} from organization: {OrganizationName} ({Organization})", user.Id, organization.Name, organization.Id);
                     user.OrganizationIds.Remove(organization.Id);
+                    foreach (var preference in user.OrganizationPreferences.Where(preference => String.Equals(preference.OrganizationId, organization.Id, StringComparison.Ordinal)).ToList())
+                        user.OrganizationPreferences.Remove(preference);
                     usersToUpdate.Add(user);
                 }
             }
@@ -109,6 +111,22 @@ public async Task<long> RemoveUsersAsync(Organization organization, string? curr
                 break;
         }
 
+        var preferenceResults = await _userRepository.GetByOrganizationPreferenceIdAsync(organization.Id, o => o.SearchAfterPaging().PageLimit(BATCH_SIZE));
+        while (preferenceResults.Documents.Count > 0)
+        {
+            foreach (var user in preferenceResults.Documents)
+            {
+                foreach (var preference in user.OrganizationPreferences.Where(preference => String.Equals(preference.OrganizationId, organization.Id, StringComparison.Ordinal)).ToList())
+                    user.OrganizationPreferences.Remove(preference);
+            }
+
+            await _userRepository.SaveAsync(preferenceResults.Documents, o => o.Cache());
+            totalUsersAffected += preferenceResults.Documents.Count;
+
+            if (!await preferenceResults.NextPageAsync())
+                break;
+        }
+
         return totalUsersAffected;
     }
 

src/Exceptionless.Web/Api/Endpoints/SavedViewEndpoints.cs

@@ -71,6 +71,63 @@ public static IEndpointRouteBuilder MapSavedViewEndpoints(this IEndpointRouteBui
             }
         });
 
+        group.MapGet("organizations/{organizationId:objectid}/saved-view-defaults", async (string organizationId, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
+            => (await mediator.InvokeAsync<Result<ViewSavedViewDefaults>>(new SavedViewMessages.GetSavedViewDefaults(organizationId))).ToHttpResult(resultMapper))
+        .Produces<ViewSavedViewDefaults>()
+        .ProducesProblem(StatusCodes.Status404NotFound)
+        .WithSummary("Get saved view defaults")
+        .WithMetadata(new EndpointDocumentation {
+            ParameterDescriptions = new() {
+                ["organizationId"] = "The identifier of the organization.",
+            },
+            ResponseDescriptions = new() {
+                ["200"] = "The current user's and organization's accessible saved view defaults.",
+                ["404"] = "The organization could not be found.",
+            }
+        });
+
+        group.MapPut("organizations/{organizationId:objectid}/saved-view-defaults/user", async (string organizationId, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper,
+            [FromBody] UpdateSavedViewDefault savedViewDefault)
+            => (await mediator.InvokeAsync<Result<ViewSavedViewDefaults>>(new SavedViewMessages.UpdateUserSavedViewDefault(organizationId, savedViewDefault))).ToHttpResult(resultMapper))
+        .Accepts<UpdateSavedViewDefault>("application/json", "application/*+json")
+        .Produces<ViewSavedViewDefaults>()
+        .ProducesProblem(StatusCodes.Status404NotFound)
+        .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
+        .WithSummary("Update the current user's saved view default")
+        .WithMetadata(new EndpointDocumentation {
+            RequestBodyDescription = "The personal saved view default. A null saved view identifier clears the preference.",
+            RequestBodyRequired = true,
+            ParameterDescriptions = new() {
+                ["organizationId"] = "The identifier of the organization.",
+            },
+            ResponseDescriptions = new() {
+                ["200"] = "The personal saved view default was updated.",
+                ["404"] = "The organization could not be found.",
+                ["422"] = "The saved view is not accessible in this organization.",
+            }
+        });
+
+        group.MapPut("organizations/{organizationId:objectid}/saved-view-defaults/organization", async (string organizationId, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper,
+            [FromBody] UpdateSavedViewDefault savedViewDefault)
+            => (await mediator.InvokeAsync<Result<ViewSavedViewDefaults>>(new SavedViewMessages.UpdateOrganizationSavedViewDefault(organizationId, savedViewDefault))).ToHttpResult(resultMapper))
+        .Accepts<UpdateSavedViewDefault>("application/json", "application/*+json")
+        .Produces<ViewSavedViewDefaults>()
+        .ProducesProblem(StatusCodes.Status404NotFound)
+        .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
+        .WithSummary("Update the organization's saved view default")
+        .WithMetadata(new EndpointDocumentation {
+            RequestBodyDescription = "The shared saved view default. A null saved view identifier clears the preference.",
+            RequestBodyRequired = true,
+            ParameterDescriptions = new() {
+                ["organizationId"] = "The identifier of the organization.",
+            },
+            ResponseDescriptions = new() {
+                ["200"] = "The organization saved view default was updated.",
+                ["404"] = "The organization could not be found.",
+                ["422"] = "The saved view is private or is not accessible in this organization.",
+            }
+        });
+
         group.MapPost("organizations/{organizationId:objectid}/saved-views", async (string organizationId, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper,
             [FromBody] NewSavedView savedView) =>
         {

src/Exceptionless.Web/Api/Handlers/OrganizationHandler.cs

@@ -704,6 +704,8 @@ public async Task<Result> Handle(RemoveOrganizationUser message)
             await organizationService.RemoveUserSavedViewsAsync(organization.Id, user.Id);
 
             user.OrganizationIds.Remove(organization.Id);
+            foreach (var preference in user.OrganizationPreferences.Where(preference => String.Equals(preference.OrganizationId, organization.Id, StringComparison.Ordinal)).ToList())
+                user.OrganizationPreferences.Remove(preference);
             await userRepository.SaveAsync(user, o => o.Cache());
             await messagePublisher.PublishAsync(new UserMembershipChanged
             {