jobs and others

Application/Application.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="PlayLists\Commands\DeletePlayList\" />
+    <Folder Include="Contracts\Application\" />
     <Folder Include="PlayLists\Commands\UpdatePlayList\" />
   </ItemGroup>
 

Application/Contracts/Application/IPictureService.cs

@@ -1,12 +0,0 @@
-using Ardalis.Result;
-using Musify.Application.Pictures.Contracts;
-using Musify.Domain.Entities;
-
-namespace Musify.Application.Contracts.Application
-{
-    public interface IPictureService
-    {
-        Task<Result<Guid>> ResizePictureAsync(EntityType entityType, Guid EntityId, string keyName, string contentType, Stream pictureStream,
-                    PictureResize[] pictureResizes, CancellationToken cancellationToken);
-    }
-}

Application/Contracts/Infrastructure/IDatabase.cs

@@ -15,6 +15,8 @@ namespace Musify.Application.Contracts.Infrastructure
 
         DbSet<Upload> Uploads { get; }
 
+        DbSet<Job> Jobs { get; }
+
         Task<int> SaveChangesAsync(CancellationToken cancellationToken);
     }
 }

Application/Events/RemoveFileEvent.cs

@@ -0,0 +1,6 @@
+namespace Musify.Application.Events
+{
+    public record RemoveFileEvent(
+        string BucketName,
+        string KeyName);
+}

Application/Events/ResizePictureEvent.cs

@@ -0,0 +1,7 @@
+namespace Musify.Application.Events
+{
+    public record ResizePictureEvent(
+        string BucketName,
+        string KeyName,
+        ResizePictureItems[] Items);
+}

Application/Events/ResizePictureItems.cs

@@ -0,0 +1,7 @@
+namespace Musify.Application.Events
+{
+    public record ResizePictureItems(
+        int Width,
+        int Height,
+        string SaveOnRoute);
+}

Application/Pictures/Commands/ResizePicture/ResizeCommand.cs

@@ -1,16 +0,0 @@
-using Ardalis.Result;
-using DispatchR.Abstractions.Send;
-using Musify.Application.Pictures.Contracts;
-using Musify.Domain.Entities;
-
-namespace Musify.Application.Pictures.Commands.ResizePicture
-{
-    public record ResizeCommand(
-        EntityType EntityType,
-        Guid EntityId,
-        string KeyName,
-        string ContentType,
-        Stream PictureStream,
-        PictureResize[] PictureResizes)
-        : IRequest<ResizeCommand, Result<Guid>>;
-}

Application/Pictures/Commands/ResizePicture/ResizeCommandHandler.cs

@@ -1,18 +0,0 @@
-using Ardalis.Result;
-using DispatchR.Abstractions.Send;
-using Musify.Application.Contracts.Application;
-
-namespace Musify.Application.Pictures.Commands.ResizePicture
-{
-    public class ResizeCommandHandler(IPictureService pictureService)
-        : IRequestHandler<ResizeCommand, Task<Result<Guid> >>
-    {
-        public async Task<Result<Guid>> Handle(ResizeCommand request, CancellationToken cancellationToken)
-        {
-            var result = await pictureService.ResizePictureAsync(request.EntityType, request.EntityId, request.KeyName, request.ContentType,
-                request.PictureStream, request.PictureResizes, cancellationToken);
-
-            return result;
-        }
-    }
-}

Application/Pictures/Contracts/PictureResize.cs

@@ -1,7 +0,0 @@
-namespace Musify.Application.Pictures.Contracts
-{
-    public record PictureResize(
-        int Width,
-        int Height,
-        string SaveOnRoute);
-}

Application/Pictures/Events/PictureResizeEvent.cs

@@ -1,8 +0,0 @@
-using Musify.Application.Pictures.Contracts;
-
-namespace Musify.Application.Pictures.Events
-{
-    public record PictureResizeEvent(
-        Guid UploadId,
-        PictureResize[] ImageResizes);
-}

Application/Pictures/PictureDependencyInjection.cs

@@ -1,13 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Musify.Application.Contracts.Application;
-
-namespace Musify.Application.Pictures
-{
-    public static class PictureDependencyInjection
-    {
-        public static void AddPictureService(this IServiceCollection serviceDescriptors)
-        {
-            serviceDescriptors.AddScoped<IPictureService, PictureService>();
-        }
-    }
-}

Application/Pictures/PictureService.cs

@@ -1,61 +0,0 @@
-using Ardalis.Result;
-using MassTransit;
-using Microsoft.Extensions.Logging;
-using Musify.Application.Configuration;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Pictures.Commands.ResizePicture;
-using Musify.Application.Pictures.Contracts;
-using Musify.Application.Pictures.Events;
-using Musify.Domain.Entities;
-
-namespace Musify.Application.Pictures
-{
-    public class PictureService(IStorageHandler storageHandler, IDatabase database, IPublishEndpoint publishEndpoint,
-        ILogger<ResizeCommandHandler> logger, StorageConfiguration storageConfiguration)
-        : IPictureService
-    {
-        public async Task<Result<Guid>> ResizePictureAsync(EntityType entityType, Guid EntityId, string keyName, string contentType, Stream pictureStream,
-            PictureResize[] pictureResizes, CancellationToken cancellationToken)
-        {
-            var pictureId = Guid.NewGuid();
-
-            var upload = new Upload
-            {
-                Id = pictureId,
-                KeyName = keyName,
-                ContentType = contentType,
-                BucketName = storageConfiguration.BucketName,
-                EntityType = entityType,
-                EntityId = EntityId,
-                State = UploadState.Completed
-            };
-
-            await database.Uploads.AddAsync(upload, cancellationToken);
-
-            await database.SaveChangesAsync(cancellationToken);
-
-            var uploadResult = await storageHandler.UploadFileAsync(
-                pictureStream,
-                contentType,
-                storageConfiguration.BucketName,
-                keyName,
-                cancellationToken);
-
-            if (!uploadResult.IsSuccess)
-            {
-                logger.LogError("Failed to upload the picture with ID {PictureId} to bucket {BucketName}.", pictureId, storageConfiguration.BucketName);
-
-                upload.State = UploadState.Failed;
-                database.Uploads.Update(upload);
-                await database.SaveChangesAsync(cancellationToken);
-
-                return Result.Error("Failed to upload the picture.");
-            }
-
-            await publishEndpoint.Publish(new PictureResizeEvent(pictureId, pictureResizes));
-
-            return Result.Success();
-        }
-    }
-}

Application/PlayLists/Commands/CreatePlayList/CreatePlayListCommand.cs

@@ -9,6 +9,7 @@ namespace Musify.Application.PlayLists.Commands.CreatePlayList
         string Name,
         string Description,
         Stream PictureStream,
+        string PictureFileType,
         string PictureContentType)
         : IRequest<CreatePlayListCommand, Result<PlayListResponse>>;
 }

Application/PlayLists/Commands/CreatePlayList/CreatePlayListCommandHandler.cs

@@ -1,18 +1,18 @@
 using Ardalis.Result;
 using DispatchR.Abstractions.Send;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Pictures.Contracts;
+using Musify.Application.Events;
 using Musify.Application.PlayLists.Contracts;
 using Musify.Domain.Entities;
 
 namespace Musify.Application.PlayLists.Commands.CreatePlayList
 {
-    public class CreatePlayListCommandHandler(IPictureService pictureService, IDatabase database, ILogger<CreatePlayListCommandHandler> logger,
-        PlayListConfiguration playListConfiguration)
+    public class CreatePlayListCommandHandler(IPublishEndpoint publishEndpoint, IDatabase database, IStorageHandler storageHandler,
+        ILogger<CreatePlayListCommandHandler> logger, StorageConfiguration storageConfiguration, PlayListConfiguration playListConfiguration)
         : IRequestHandler<CreatePlayListCommand, Task<Result<PlayListResponse>> >
     {
         public async Task<Result<PlayListResponse>> Handle(CreatePlayListCommand request, CancellationToken cancellationToken)
@@ -35,34 +35,45 @@ namespace Musify.Application.PlayLists.Commands.CreatePlayList
                 MediumPictureKeyName = playListConfiguration.Routes.MediumPictures,
                 LargePictureKeyName = playListConfiguration.Routes.LargePictures,
             };
-
             await database.PlayLists.AddAsync(playList, cancellationToken);
 
-            await database.SaveChangesAsync(cancellationToken);
+            var imageId = Guid.NewGuid();
+
+            var imageKeyName = $"{playListConfiguration.Routes.OriginalPictures}/{imageId}.{request.PictureFileType}";
+
+            var uploadResult = await storageHandler.UploadFileAsync(
+                request.PictureStream,
+                request.PictureContentType,
+                storageConfiguration.BucketName,
+                imageKeyName,
+                cancellationToken);
+
+            if (!uploadResult.IsSuccess)
+            {
+                logger.LogError("Failed to upload picture for PlayList with Id={PlayListId} to storage. Storage handler returned error: {ErrorMessage}",
+                    playList.Id, string.Join("; ", uploadResult.Errors));
+                return Result.Error($"Failed to upload picture for PlayList with Id {playList.Id} to storage.");
+            }
 
             logger.LogInformation("PlayList with Id={PlayListId} created successfully for UserId={UserId}.", playList.Id, request.UserId);
 
-            await pictureService.ResizePictureAsync(
-                EntityType.PlayList,
-                playList.Id,
-                playList.Id.ToString(),
-                request.PictureContentType,
-                request.PictureStream,
-                [ 
-                    new PictureResize(
+            await publishEndpoint.Publish(new ResizePictureEvent(
+                storageConfiguration.BucketName,
+                imageKeyName,
+                [
+                    new ResizePictureItems(
                         playListConfiguration.PicturesSizes.SmallPictureWidth,
                         playListConfiguration.PicturesSizes.SmallPictureHeight,
                         playListConfiguration.Routes.SmallPictures),
-                    new PictureResize(
+                    new ResizePictureItems(
                         playListConfiguration.PicturesSizes.MediumPictureWidth,
                         playListConfiguration.PicturesSizes.MediumPictureHeight,
                         playListConfiguration.Routes.MediumPictures),
-                    new PictureResize(
+                    new ResizePictureItems(
                         playListConfiguration.PicturesSizes.LargePictureWidth,
                         playListConfiguration.PicturesSizes.LargePictureHeight,
                         playListConfiguration.Routes.LargePictures)
-                ],
-                cancellationToken);
+                ] ), cancellationToken);
 
             logger.LogInformation("Picture for PlayList with Id={PlayListId} ", playList.Id);
 

Application/PlayLists/Commands/DeletePlayList/DeletePlayListCommand.cs

@@ -0,0 +1,8 @@
+using Ardalis.Result;
+using DispatchR.Abstractions.Send;
+
+namespace Musify.Application.PlayLists.Commands.DeletePlayList
+{
+    public record DeletePlayListCommand(Guid UserId, Guid PlayListId)
+        : IRequest<DeletePlayListCommand, Result>;
+}

Application/PlayLists/Commands/DeletePlayList/DeletePlayListCommandHandler.cs

@@ -0,0 +1,36 @@
+using Ardalis.Result;
+using DispatchR.Abstractions.Send;
+using Microsoft.Extensions.Logging;
+using Musify.Application.Configuration;
+using Musify.Application.Contracts.Infrastructure;
+
+namespace Musify.Application.PlayLists.Commands.DeletePlayList
+{
+    public class DeletePlayListCommandHandler(IDatabase database, IStorageHandler storageHandler,
+        StorageConfiguration storageConfiguration, ILogger<DeletePlayListCommandHandler> logger)
+        : IRequestHandler<DeletePlayListCommand, Task<Result>>
+    {
+        public async Task<Result> Handle(DeletePlayListCommand request, CancellationToken cancellationToken)
+        {
+            var playList = await database.PlayLists.FindAsync(request.PlayListId, cancellationToken);
+
+            if (playList is null)
+            {
+                logger.LogDebug("PlayList with id={PlayListId} not found", request.PlayListId);
+                return Result.NotFound();
+            }
+
+            if (playList.UserId != request.UserId)
+            {
+                logger.LogInformation("PlayList with id={PlayListId} does not belong to user with id={UserId}", request.PlayListId, request.UserId);
+                return Result.Unauthorized();
+            }
+
+            database.PlayLists.Remove(playList);
+
+            await database.SaveChangesAsync(cancellationToken);
+
+            return Result.NoContent();
+        }
+    }
+}