A lot of changes

2026-09-24 17:54:16 +02:00
parent ece6ce2a43
commit e84c16cf92
35 changed files with 1815 additions and 222 deletions
@@ -1,24 +1,15 @@
 using ErrorOr;
 using Musify.Application.Albums;
-using Musify.Application.Contracts;
-using Musify.Application.Services;
 using Musify.Application.Tests.TestSupport;
-using NSubstitute;
 using Xunit;

 namespace Musify.Application.Tests.Albums
 {
    public sealed class UpdateAlbumCommandHandlerTests : HandlerTestBase
    {
-        private readonly IEventBus eventBus = Substitute.For<IEventBus>();
-        private readonly IStorageService storageService = Substitute.For<IStorageService>();
-
        private UpdateAlbumCommandHandler CreateHandler() => new(
-            eventBus,
            Database,
-            new UploadIntentValidator(Database, storageService, TestConfigurations.UploadIntent()),
-            NoOpLogger<UpdateAlbumCommandHandler>(),
-            TestConfigurations.Album());
+            NoOpLogger<UpdateAlbumCommandHandler>());

        [Fact]
        public async Task Handle_Owner_UpdatesTitleDescriptionAndReleaseYear()
@@ -27,7 +18,7 @@ namespace Musify.Application.Tests.Albums
            var album = TestEntities.Album(owner.Id, title: "Old Title", description: "Old", releaseYear: 2020);
            await SeedAsync(owner, album);

-            var command = new UpdateAlbumCommand(owner.Id, album.Id, "  New Title  ", "New description", 2025, null);
+            var command = new UpdateAlbumCommand(owner.Id, album.Id, "  New Title  ", "New description", 2025);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

@@ -42,32 +33,22 @@ namespace Musify.Application.Tests.Albums
        }

        [Fact]
-        public async Task Handle_ValidPictureIntent_UpdatesPictureAndPublishesSourceEvent()
+        public async Task Handle_BlankDescription_ClearsIt()
        {
-            storageService
-                .HeadObjectAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
-                .Returns(new ObjectMetaData("image/webp", 1024));
-
            var owner = TestEntities.User();
-            var album = TestEntities.Album(owner.Id, title: "Old Title");
-            var intent = TestEntities.UploadIntent(owner.Id, Musify.Domain.ValueObjects.UploadIntentPurpose.AlbumPicture, objectName: "new-cover.webp");
-            await SeedAsync(owner, album, intent);
+            var album = TestEntities.Album(owner.Id, title: "Title", description: "Old");
+            await SeedAsync(owner, album);

-            var command = new UpdateAlbumCommand(owner.Id, album.Id, "Old Title", null, null, intent.Id);
-
-            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);
+            var result = await CreateHandler().Handle(new UpdateAlbumCommand(owner.Id, album.Id, "Title", "   ", null), TestContext.Current.CancellationToken);

            Assert.False(result.IsError);
-            var stored = await Database.Albums.FindAsync([album.Id], TestContext.Current.CancellationToken);
-            Assert.NotNull(stored);
-            Assert.Equal("new-cover.webp", stored.Pictures?.OriginalName);
-            await eventBus.Received(1).PublishAsync(Arg.Any<Musify.Application.Events.UpdateAlbumPictureSourceEvent>(), Arg.Any<CancellationToken>());
+            Assert.Null(result.Value.Description);
        }

        [Fact]
        public async Task Handle_AlbumMissing_ReturnsNotFound()
        {
-            var command = new UpdateAlbumCommand(1, Guid.NewGuid(), "Title", null, null, null);
+            var command = new UpdateAlbumCommand(1, Guid.NewGuid(), "Title", null, null);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

@@ -82,7 +63,7 @@ namespace Musify.Application.Tests.Albums
            var album = TestEntities.Album(owner.Id);
            await SeedAsync(owner, stranger, album);

-            var command = new UpdateAlbumCommand(stranger.Id, album.Id, "Hijacked", null, null, null);
+            var command = new UpdateAlbumCommand(stranger.Id, album.Id, "Hijacked", null, null);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

@@ -0,0 +1,69 @@
+using ErrorOr;
+using Musify.Application.Albums;
+using Musify.Application.Contracts;
+using Musify.Application.Services;
+using Musify.Application.Tests.TestSupport;
+using NSubstitute;
+using Xunit;
+
+namespace Musify.Application.Tests.Albums
+{
+    public sealed class UpdateAlbumPictureCommandHandlerTests : HandlerTestBase
+    {
+        private readonly IEventBus eventBus = Substitute.For<IEventBus>();
+        private readonly IStorageService storageService = Substitute.For<IStorageService>();
+
+        private UpdateAlbumPictureCommandHandler CreateHandler() => new(
+            eventBus,
+            Database,
+            new UploadIntentValidator(Database, storageService, TestConfigurations.UploadIntent()),
+            NoOpLogger<UpdateAlbumPictureCommandHandler>(),
+            TestConfigurations.Album());
+
+        [Fact]
+        public async Task Handle_ValidPictureIntent_UpdatesPictureAndPublishesSourceEvent()
+        {
+            storageService
+                .HeadObjectAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
+                .Returns(new ObjectMetaData("image/webp", 1024));
+
+            var owner = TestEntities.User();
+            var album = TestEntities.Album(owner.Id, title: "Keep Title", description: "Keep description", releaseYear: 2020);
+            var intent = TestEntities.UploadIntent(owner.Id, Musify.Domain.ValueObjects.UploadIntentPurpose.AlbumPicture, objectName: "new-cover.webp");
+            await SeedAsync(owner, album, intent);
+
+            var result = await CreateHandler().Handle(new UpdateAlbumPictureCommand(owner.Id, album.Id, intent.Id), TestContext.Current.CancellationToken);
+
+            Assert.False(result.IsError);
+            Assert.Equal("Keep Title", result.Value.Title);
+            Assert.Equal("Keep description", result.Value.Description);
+            Assert.Equal(2020, result.Value.ReleaseYear);
+            var stored = await Database.Albums.FindAsync([album.Id], TestContext.Current.CancellationToken);
+            Assert.NotNull(stored);
+            Assert.Equal("new-cover.webp", stored.Pictures?.OriginalName);
+            await eventBus.Received(1).PublishAsync(Arg.Any<Musify.Application.Events.UpdateAlbumPictureSourceEvent>(), Arg.Any<CancellationToken>());
+        }
+
+        [Fact]
+        public async Task Handle_AlbumMissing_ReturnsNotFound()
+        {
+            var result = await CreateHandler().Handle(new UpdateAlbumPictureCommand(1, Guid.NewGuid(), Guid.NewGuid()), TestContext.Current.CancellationToken);
+
+            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
+        }
+
+        [Fact]
+        public async Task Handle_NotOwner_ReturnsForbidden()
+        {
+            var owner = TestEntities.User(1, "owner");
+            var stranger = TestEntities.User(2, "stranger");
+            var album = TestEntities.Album(owner.Id);
+            await SeedAsync(owner, stranger, album);
+
+            var result = await CreateHandler().Handle(new UpdateAlbumPictureCommand(stranger.Id, album.Id, Guid.NewGuid()), TestContext.Current.CancellationToken);
+
+            Assert.Equal(ErrorType.Forbidden, result.FirstError.Type);
+            await eventBus.DidNotReceive().PublishAsync(Arg.Any<Musify.Application.Events.UpdateAlbumPictureSourceEvent>(), Arg.Any<CancellationToken>());
+        }
+    }
+}
@@ -11,11 +11,11 @@ namespace Musify.Application.Tests.Genres
            await new GetAvailableGenresQueryHandler().Handle(new GetAvailableGenresQuery(), TestContext.Current.CancellationToken);

        [Fact]
-        public async Task Handle_ReturnsEveryGenre()
+        public async Task Handle_ReturnsEveryGenreExceptNone()
        {
            var result = await RunAsync();

-            Assert.Equal(Enum.GetValues<Genre>(), result.Select(r => r.Genre));
+            Assert.Equal(Enum.GetValues<Genre>().Where(genre => genre != Genre.None), result.Select(r => r.Genre));
        }

        [Fact]
@@ -1,24 +1,15 @@
 using ErrorOr;
-using Musify.Application.Contracts;
 using Musify.Application.PlayLists;
-using Musify.Application.Services;
 using Musify.Application.Tests.TestSupport;
-using NSubstitute;
 using Xunit;

 namespace Musify.Application.Tests.PlayLists
 {
    public sealed class UpdatePlayListCommandHandlerTests : HandlerTestBase
    {
-        private readonly IEventBus eventBus = Substitute.For<IEventBus>();
-        private readonly IStorageService storageService = Substitute.For<IStorageService>();
-
        private UpdatePlayListCommandHandler CreateHandler() => new(
-            eventBus,
            Database,
-            new UploadIntentValidator(Database, storageService, TestConfigurations.UploadIntent()),
-            NoOpLogger<UpdatePlayListCommandHandler>(),
-            TestConfigurations.PlayList());
+            NoOpLogger<UpdatePlayListCommandHandler>());

        [Fact]
        public async Task Handle_Owner_RenamesPlayList()
@@ -27,7 +18,7 @@ namespace Musify.Application.Tests.PlayLists
            var playList = TestEntities.PlayList(owner.Id, "Old Name");
            await SeedAsync(owner, playList);

-            var command = new UpdatePlayListCommand(owner.Id, playList.Id, "New Name", null, null);
+            var command = new UpdatePlayListCommand(owner.Id, playList.Id, "New Name", null, Musify.Domain.ValueObjects.PlayListVisibility.Private);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

@@ -38,7 +29,7 @@ namespace Musify.Application.Tests.PlayLists
        [Fact]
        public async Task Handle_PlayListMissing_ReturnsNotFound()
        {
-            var command = new UpdatePlayListCommand(1, Guid.NewGuid(), "New Name", null, null);
+            var command = new UpdatePlayListCommand(1, Guid.NewGuid(), "New Name", null, Musify.Domain.ValueObjects.PlayListVisibility.Private);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

@@ -53,7 +44,7 @@ namespace Musify.Application.Tests.PlayLists
            var playList = TestEntities.PlayList(owner.Id);
            await SeedAsync(owner, stranger, playList);

-            var command = new UpdatePlayListCommand(stranger.Id, playList.Id, "Hijacked", null, null);
+            var command = new UpdatePlayListCommand(stranger.Id, playList.Id, "Hijacked", null, Musify.Domain.ValueObjects.PlayListVisibility.Private);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

@@ -67,7 +58,7 @@ namespace Musify.Application.Tests.PlayLists
            var playList = TestEntities.PlayList(owner.Id);
            await SeedAsync(owner, playList);

-            var command = new UpdatePlayListCommand(owner.Id, playList.Id, null, null, null, Musify.Domain.ValueObjects.PlayListVisibility.Public);
+            var command = new UpdatePlayListCommand(owner.Id, playList.Id, "Same Name", null, Musify.Domain.ValueObjects.PlayListVisibility.Public);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

@@ -76,59 +67,35 @@ namespace Musify.Application.Tests.PlayLists
        }

        [Fact]
-        public async Task Handle_NoVisibilitySpecified_LeavesItUnchanged()
+        public async Task Handle_ReplacesNameDescriptionAndVisibility()
        {
            var owner = TestEntities.User();
-            var playList = TestEntities.PlayList(owner.Id, visibility: Musify.Domain.ValueObjects.PlayListVisibility.Public);
+            var playList = TestEntities.PlayList(owner.Id, "Original Name", "Original description", visibility: Musify.Domain.ValueObjects.PlayListVisibility.Public);
            await SeedAsync(owner, playList);

-            var command = new UpdatePlayListCommand(owner.Id, playList.Id, "New Name", null, null);
+            var command = new UpdatePlayListCommand(owner.Id, playList.Id, "  New Name  ", "New description", Musify.Domain.ValueObjects.PlayListVisibility.Private);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

            Assert.False(result.IsError);
-            Assert.Equal(Musify.Domain.ValueObjects.PlayListVisibility.Public, result.Value.Visibility);
+            Assert.Equal("New Name", result.Value.Name);
+            Assert.Equal("New description", result.Value.Description);
+            Assert.Equal(Musify.Domain.ValueObjects.PlayListVisibility.Private, result.Value.Visibility);
        }

        [Fact]
-        public async Task Handle_BlankName_LeavesItUnchangedAndBlankDescriptionClearsIt()
+        public async Task Handle_MissingDescription_ClearsIt()
        {
            var owner = TestEntities.User();
            var playList = TestEntities.PlayList(owner.Id, "Original Name", "Original description");
            await SeedAsync(owner, playList);

-            var command = new UpdatePlayListCommand(owner.Id, playList.Id, "   ", "   ", null);
+            var command = new UpdatePlayListCommand(owner.Id, playList.Id, "Original Name", null, Musify.Domain.ValueObjects.PlayListVisibility.Private);

            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);

            Assert.False(result.IsError);
-            Assert.Equal("Original Name", result.Value.Name);
            Assert.Null(result.Value.Description);
        }
-
-        [Fact]
-        public async Task Handle_PlayListWithoutPictures_ValidPictureIntent_SetsPictureAndPublishesSourceEvent()
-        {
-            storageService
-                .HeadObjectAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
-                .Returns(new ObjectMetaData("image/webp", 1024));
-
-            var owner = TestEntities.User();
-            var playList = TestEntities.PlayList(owner.Id);
-            playList.Pictures = null;
-            var intent = TestEntities.UploadIntent(owner.Id, Musify.Domain.ValueObjects.UploadIntentPurpose.PlayListPicture, objectName: "new-cover.webp");
-            await SeedAsync(owner, playList, intent);
-
-            var command = new UpdatePlayListCommand(owner.Id, playList.Id, null, null, intent.Id);
-
-            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            Assert.Null(result.Value.SmallImageKeyName);
-            var stored = await Database.PlayLists.FindAsync([playList.Id], TestContext.Current.CancellationToken);
-            Assert.NotNull(stored);
-            Assert.Equal("new-cover.webp", stored.Pictures?.OriginalName);
-            await eventBus.Received(1).PublishAsync(Arg.Any<Musify.Application.Events.UpdatePlayListPictureSourceEvent>(), Arg.Any<CancellationToken>());
-        }
    }
 }
@@ -0,0 +1,69 @@
+using ErrorOr;
+using Musify.Application.Contracts;
+using Musify.Application.PlayLists;
+using Musify.Application.Services;
+using Musify.Application.Tests.TestSupport;
+using NSubstitute;
+using Xunit;
+
+namespace Musify.Application.Tests.PlayLists
+{
+    public sealed class UpdatePlayListPictureCommandHandlerTests : HandlerTestBase
+    {
+        private readonly IEventBus eventBus = Substitute.For<IEventBus>();
+        private readonly IStorageService storageService = Substitute.For<IStorageService>();
+
+        private UpdatePlayListPictureCommandHandler CreateHandler() => new(
+            eventBus,
+            Database,
+            new UploadIntentValidator(Database, storageService, TestConfigurations.UploadIntent()),
+            NoOpLogger<UpdatePlayListPictureCommandHandler>(),
+            TestConfigurations.PlayList());
+
+        [Fact]
+        public async Task Handle_ValidPictureIntent_SetsPictureAndPublishesSourceEvent()
+        {
+            storageService
+                .HeadObjectAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
+                .Returns(new ObjectMetaData("image/webp", 1024));
+
+            var owner = TestEntities.User();
+            var playList = TestEntities.PlayList(owner.Id, "Keep Name", "Keep description");
+            playList.Pictures = null;
+            var intent = TestEntities.UploadIntent(owner.Id, Musify.Domain.ValueObjects.UploadIntentPurpose.PlayListPicture, objectName: "new-cover.webp");
+            await SeedAsync(owner, playList, intent);
+
+            var result = await CreateHandler().Handle(new UpdatePlayListPictureCommand(owner.Id, playList.Id, intent.Id), TestContext.Current.CancellationToken);
+
+            Assert.False(result.IsError);
+            Assert.Equal("Keep Name", result.Value.Name);
+            Assert.Equal("Keep description", result.Value.Description);
+            var stored = await Database.PlayLists.FindAsync([playList.Id], TestContext.Current.CancellationToken);
+            Assert.NotNull(stored);
+            Assert.Equal("new-cover.webp", stored.Pictures?.OriginalName);
+            await eventBus.Received(1).PublishAsync(Arg.Any<Musify.Application.Events.UpdatePlayListPictureSourceEvent>(), Arg.Any<CancellationToken>());
+        }
+
+        [Fact]
+        public async Task Handle_PlayListMissing_ReturnsNotFound()
+        {
+            var result = await CreateHandler().Handle(new UpdatePlayListPictureCommand(1, Guid.NewGuid(), Guid.NewGuid()), TestContext.Current.CancellationToken);
+
+            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
+        }
+
+        [Fact]
+        public async Task Handle_NotOwner_ReturnsForbidden()
+        {
+            var owner = TestEntities.User(1, "owner");
+            var stranger = TestEntities.User(2, "stranger");
+            var playList = TestEntities.PlayList(owner.Id);
+            await SeedAsync(owner, stranger, playList);
+
+            var result = await CreateHandler().Handle(new UpdatePlayListPictureCommand(stranger.Id, playList.Id, Guid.NewGuid()), TestContext.Current.CancellationToken);
+
+            Assert.Equal(ErrorType.Forbidden, result.FirstError.Type);
+            await eventBus.DidNotReceive().PublishAsync(Arg.Any<Musify.Application.Events.UpdatePlayListPictureSourceEvent>(), Arg.Any<CancellationToken>());
+        }
+    }
+}