mirror of
https://github.com/bitwarden/server.git
synced 2026-04-12 00:31:55 -05:00
* Rid of bulk delete error * Fix test * Fix for test * Update src/Core/Dirt/Services/Implementations/EventService.cs Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * Fix formatting issues in DeleteCollectionCommandTests.cs by removing hidden characters and ensuring proper using directives. * Update src/Core/Dirt/Services/Implementations/EventService.cs Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * Update src/Core/Dirt/Services/Implementations/EventService.cs Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * Refactor DeleteCollectionCommandTests.cs to remove hidden characters and improve argument matching for GetManyByManyIdsAsync method. * Fix deletion error happening in Postgres by utilizing OrganizationId which is always populated by the table row --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
162 lines
6.6 KiB
C#
162 lines
6.6 KiB
C#
using Bit.Core.Entities;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Exceptions;
|
|
using Bit.Core.OrganizationFeatures.OrganizationCollections;
|
|
using Bit.Core.Repositories;
|
|
using Bit.Core.Services;
|
|
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
|
|
using Bit.Test.Common.AutoFixture;
|
|
using Bit.Test.Common.AutoFixture.Attributes;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections;
|
|
|
|
[SutProviderCustomize]
|
|
public class DeleteCollectionCommandTests
|
|
{
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
[OrganizationCustomize]
|
|
public async Task DeleteAsync_DeletesCollection(Collection collection, SutProvider<DeleteCollectionCommand> sutProvider)
|
|
{
|
|
// Act
|
|
await sutProvider.Sut.DeleteAsync(collection);
|
|
|
|
// Assert
|
|
await sutProvider.GetDependency<ICollectionRepository>().Received().DeleteAsync(collection);
|
|
await sutProvider.GetDependency<IEventService>().Received().LogCollectionEventAsync(collection, EventType.Collection_Deleted, Arg.Any<DateTime>());
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
[OrganizationCustomize]
|
|
public async Task DeleteManyAsync_DeletesManyCollections(Collection collection, Collection collection2, SutProvider<DeleteCollectionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
var collectionIds = new[] { collection.Id, collection2.Id };
|
|
collection.Type = collection2.Type = CollectionType.SharedCollection;
|
|
|
|
sutProvider.GetDependency<ICollectionRepository>()
|
|
.GetManyByManyIdsAsync(collectionIds)
|
|
.Returns(new List<Collection> { collection, collection2 });
|
|
|
|
// Act
|
|
await sutProvider.Sut.DeleteManyAsync(collectionIds);
|
|
|
|
// Assert
|
|
await sutProvider.GetDependency<ICollectionRepository>().Received()
|
|
.DeleteManyAsync(Arg.Is<IEnumerable<Guid>>(ids => ids.ToArray().SequenceEqual(collectionIds)));
|
|
|
|
await sutProvider.GetDependency<IEventService>().Received().LogCollectionEventsAsync(
|
|
Arg.Is<IEnumerable<(Collection, EventType, DateTime?)>>(a =>
|
|
a.All(c => collectionIds.Contains(c.Item1.Id) && c.Item2 == EventType.Collection_Deleted)));
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
[OrganizationCustomize]
|
|
public async Task DeleteAsync_WithDefaultUserCollectionType_ThrowsBadRequest(Collection collection, SutProvider<DeleteCollectionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
collection.Type = CollectionType.DefaultUserCollection;
|
|
|
|
// Act & Assert
|
|
var ex = await Assert.ThrowsAsync<BadRequestException>(() => sutProvider.Sut.DeleteAsync(collection));
|
|
Assert.Contains("You cannot delete a collection with the type as DefaultUserCollection.", ex.Message);
|
|
await sutProvider.GetDependency<ICollectionRepository>()
|
|
.DidNotReceiveWithAnyArgs()
|
|
.DeleteAsync(default);
|
|
await sutProvider.GetDependency<IEventService>()
|
|
.DidNotReceiveWithAnyArgs()
|
|
.LogCollectionEventAsync(default, default, default);
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
[OrganizationCustomize]
|
|
public async Task DeleteManyAsync_WithDefaultUserCollectionType_ThrowsBadRequest(Collection collection, Collection collection2, SutProvider<DeleteCollectionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
collection.Type = CollectionType.DefaultUserCollection;
|
|
collection2.Type = CollectionType.SharedCollection;
|
|
var collections = new List<Collection> { collection, collection2 };
|
|
|
|
// Act & Assert
|
|
var ex = await Assert.ThrowsAsync<BadRequestException>(() => sutProvider.Sut.DeleteManyAsync(collections));
|
|
Assert.Contains("You cannot delete collections with the type as DefaultUserCollection.", ex.Message);
|
|
await sutProvider.GetDependency<ICollectionRepository>()
|
|
.DidNotReceiveWithAnyArgs()
|
|
.DeleteManyAsync(default);
|
|
await sutProvider.GetDependency<IEventService>()
|
|
.DidNotReceiveWithAnyArgs()
|
|
.LogCollectionEventsAsync(default);
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
[OrganizationCustomize]
|
|
public async Task DeleteManyAsync_WithManyCollections_DeletesAllCollections(SutProvider<DeleteCollectionCommand> sutProvider)
|
|
{
|
|
// Arrange - Create 100 collections to test bulk delete performance
|
|
var collections = new List<Collection>();
|
|
var collectionIds = new List<Guid>();
|
|
|
|
for (int i = 0; i < 100; i++)
|
|
{
|
|
var collection = new Collection
|
|
{
|
|
Id = Guid.NewGuid(),
|
|
OrganizationId = Guid.NewGuid(),
|
|
Type = CollectionType.SharedCollection,
|
|
Name = $"Collection {i}"
|
|
};
|
|
collections.Add(collection);
|
|
collectionIds.Add(collection.Id);
|
|
}
|
|
|
|
sutProvider.GetDependency<ICollectionRepository>()
|
|
.GetManyByManyIdsAsync(Arg.Is<IEnumerable<Guid>>(ids => ids.SequenceEqual(collectionIds)))
|
|
.Returns(collections);
|
|
|
|
// Act
|
|
await sutProvider.Sut.DeleteManyAsync(collectionIds);
|
|
|
|
// Assert
|
|
await sutProvider.GetDependency<ICollectionRepository>().Received()
|
|
.DeleteManyAsync(Arg.Is<IEnumerable<Guid>>(ids => ids.ToArray().SequenceEqual(collectionIds.ToArray())));
|
|
|
|
await sutProvider.GetDependency<IEventService>().Received().LogCollectionEventsAsync(
|
|
Arg.Is<IEnumerable<(Collection, EventType, DateTime?)>>(a =>
|
|
a.Count() == 100 &&
|
|
a.All(c => collectionIds.Contains(c.Item1.Id) && c.Item2 == EventType.Collection_Deleted)));
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
[OrganizationCustomize]
|
|
public async Task DeleteManyAsync_WhenEventLoggingFails_StillDeletesCollections(Collection collection, SutProvider<DeleteCollectionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
var collectionIds = new[] { collection.Id };
|
|
collection.Type = CollectionType.SharedCollection;
|
|
|
|
sutProvider.GetDependency<ICollectionRepository>()
|
|
.GetManyByManyIdsAsync(collectionIds)
|
|
.Returns(new List<Collection> { collection });
|
|
|
|
sutProvider.GetDependency<IEventService>()
|
|
.LogCollectionEventsAsync(Arg.Any<IEnumerable<(Collection, EventType, DateTime?)>>())
|
|
.Returns<Task>(_ => throw new Exception("Event logging failed"));
|
|
|
|
// Act - Should not throw exception even though event logging fails
|
|
await sutProvider.Sut.DeleteManyAsync(collectionIds);
|
|
|
|
// Assert - Collections should still be deleted
|
|
await sutProvider.GetDependency<ICollectionRepository>().Received()
|
|
.DeleteManyAsync(Arg.Is<IEnumerable<Guid>>(ids => ids.ToArray().SequenceEqual(collectionIds)));
|
|
}
|
|
|
|
}
|