fix: address PR review feedback

Author: niemyjski

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

@@ -365,7 +365,16 @@ public async Task<Result<object>> Handle(GetAdminElasticsearchSnapshots message)
 
             return new ElasticsearchSnapshotsResponse(successfulRepositoryNames, snapshots);
         }
-        catch (Exception ex)
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (InvalidOperationException ex)
+        {
+            _logger.LogError(ex, "Unable to retrieve snapshot information");
+            return Result.Error("Unable to retrieve snapshot information.");
+        }
+        catch (TimeoutException ex)
         {
             _logger.LogError(ex, "Unable to retrieve snapshot information");
             return Result.Error("Unable to retrieve snapshot information.");

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

@@ -231,10 +231,6 @@ public async Task<Result<Invoice>> Handle(GetInvoice message)
         {
             _logger.LogCritical(ex, "Error getting invoice ({InvoiceId}): {Message}", invoiceId, ex.Message);
         }
-        catch (Exception ex)
-        {
-            _logger.LogCritical(ex, "Unexpected error getting invoice ({InvoiceId}): {Message}", invoiceId, ex.Message);
-        }
 
         if (String.IsNullOrEmpty(stripeInvoice?.CustomerId))
             return Result.NotFound("Organization not found.");
@@ -546,11 +542,6 @@ await Task.WhenAll(
             _logger.LogCritical(ex, "Error occurred update billing plan: {Message}", ex.Message);
             return ChangePlanResult.FailWithMessage("An error occurred while changing plans. Please try again or contact support.");
         }
-        catch (Exception ex)
-        {
-            _logger.LogCritical(ex, "An unexpected error occurred while trying to update your billing plan: {Message}", ex.Message);
-            return ChangePlanResult.FailWithMessage("An error occurred while changing plans. Please try again.");
-        }
 
         return new ChangePlanResult { Success = true };
     }

src/Exceptionless.Web/Api/Infrastructure/JsonPatchValidation.cs

@@ -110,9 +110,8 @@ public static IReadOnlySet<string> GetAffectedPropertyNames<T>(this JsonPatchDoc
         var policy = patch.SerializerOptions?.PropertyNamingPolicy;
         var affected = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-        foreach (var op in patch.Operations)
+        foreach (var pathSegment in patch.Operations.Select(op => NormalizePath(op.path).TrimStart('/')))
         {
-            var pathSegment = NormalizePath(op.path).TrimStart('/');
             foreach (var prop in properties)
             {
                 var jsonName = policy?.ConvertName(prop.Name) ?? prop.Name;
@@ -162,17 +161,14 @@ private static string GetMemberName<T>(Expression<Func<T, object?>> expression)
         if (body.ValueKind != JsonValueKind.Object)
             return null;
 
-        var ops = new JsonArray();
-        foreach (var prop in body.EnumerateObject())
-        {
-            var op = new JsonObject
+        var ops = new JsonArray(body.EnumerateObject()
+            .Select(prop => new JsonObject
             {
                 ["op"] = "replace",
                 ["path"] = $"/{prop.Name}",
                 ["value"] = JsonNode.Parse(prop.Value.GetRawText())
-            };
-            ops.Add(op);
-        }
+            })
+            .ToArray());
 
         if (ops.Count == 0)
             return new JsonPatchDocument<T>([], options);

tests/Exceptionless.Tests/Controllers/OrganizationControllerTests.cs

@@ -1219,7 +1219,7 @@ public async Task ChangePlanAsync_FreePlanCancelsActiveStripeSubscriptions()
     public async Task ChangePlanAsync_StripeBillingClientThrows_ReturnsFailure()
     {
         // Arrange
-        StripeBillingClient.CreateCustomerException = new InvalidOperationException("Stripe unavailable");
+        StripeBillingClient.CreateCustomerException = new StripeException("Stripe unavailable");
 
         // Act
         var result = await WithBillingEnabledAsync(() =>
@@ -1239,7 +1239,7 @@ public async Task ChangePlanAsync_StripeBillingClientThrows_ReturnsFailure()
         // Assert
         Assert.NotNull(result);
         Assert.False(result.Success);
-        Assert.Equal("An error occurred while changing plans. Please try again.", result.Message);
+        Assert.Equal("An error occurred while changing plans. Please try again or contact support.", result.Message);
         Assert.Empty(StripeBillingClient.CreatedSubscriptionOptions);
     }
 
@@ -1248,7 +1248,7 @@ public async Task ChangePlanAsync_NewCustomerSubscriptionFails_PreservesStripeCu
     {
         // Arrange
         StripeBillingClient.CustomerToReturn = new Customer { Id = "cus_created" };
-        StripeBillingClient.CreateSubscriptionException = new InvalidOperationException("Stripe unavailable");
+        StripeBillingClient.CreateSubscriptionException = new StripeException("Stripe unavailable");
 
         // Act
         var result = await WithBillingEnabledAsync(() =>
@@ -1268,7 +1268,7 @@ public async Task ChangePlanAsync_NewCustomerSubscriptionFails_PreservesStripeCu
         // Assert
         Assert.NotNull(result);
         Assert.False(result.Success);
-        Assert.Equal("An error occurred while changing plans. Please try again.", result.Message);
+        Assert.Equal("An error occurred while changing plans. Please try again or contact support.", result.Message);
 
         var organization = await _organizationRepository.GetByIdAsync(SampleDataService.FREE_ORG_ID);
         Assert.NotNull(organization);
@@ -1284,7 +1284,7 @@ public async Task ChangePlanAsync_ExistingCustomerSubscriptionFails_DoesNotPersi
         // Arrange
         await SetStripeCustomerIdAsync(SampleDataService.FREE_ORG_ID, "cus_existing");
         StripeBillingClient.Subscriptions.Add(CreateStripeSubscription("sub_active", "si_active"));
-        StripeBillingClient.UpdateSubscriptionException = new InvalidOperationException("Stripe unavailable");
+        StripeBillingClient.UpdateSubscriptionException = new StripeException("Stripe unavailable");
 
         // Act
         var result = await WithBillingEnabledAsync(() =>
@@ -1304,7 +1304,7 @@ public async Task ChangePlanAsync_ExistingCustomerSubscriptionFails_DoesNotPersi
         // Assert
         Assert.NotNull(result);
         Assert.False(result.Success);
-        Assert.Equal("An error occurred while changing plans. Please try again.", result.Message);
+        Assert.Equal("An error occurred while changing plans. Please try again or contact support.", result.Message);
         Assert.NotEmpty(StripeBillingClient.UpdatedSubscriptions);
 
         var organization = await _organizationRepository.GetByIdAsync(SampleDataService.FREE_ORG_ID);
@@ -1450,7 +1450,7 @@ public async Task GetInvoiceAsync_StripeInvoice_ReturnsMappedInvoice()
     public Task GetInvoiceAsync_StripeBillingClientThrows_ReturnsNotFound()
     {
         // Arrange
-        StripeBillingClient.GetInvoiceException = new InvalidOperationException("Stripe unavailable");
+        StripeBillingClient.GetInvoiceException = new StripeException("Stripe unavailable");
 
         // Act & Assert
         return WithBillingEnabledAsync(() =>