Deduplicate picture flows: shared upload issuer, cover query and picture source change

backend/Hosts/Musify.Api/Endpoints/AlbumEndpoints.cs

@@ -6,6 +6,8 @@ using Musify.Api.Filters;
 using Musify.Application.Albums;
 using Musify.Application.Albums.Responses;
 using Musify.Application.Contracts;
+using Musify.Application.Pictures;
+using Musify.Application.Pictures.Responses;
 using Musify.Api.Models;
 using Musify.Application.Shared;
 using Musify.Application.Tracks.Responses;
@@ -65,7 +67,7 @@ public static class AlbumEndpoints
             .WithSummary("Request A Pre-Signed URL To Upload An Album Picture.")
             .AddEndpointFilter<ValidationFilter<RequestAlbumPictureUploadRequest>>()
             .RequireAuthorization()
-            .Produces<AlbumPictureUploadResponse>()
+            .Produces<PictureUploadResponse>()
             .ProducesValidationProblem()
             .Produces(StatusCodes.Status401Unauthorized)
             .Produces(StatusCodes.Status404NotFound);
@@ -179,7 +181,7 @@ public static class AlbumEndpoints
         return result.ToHttpResult();
     }
 
-    private static async Task<IResult> GetAlbumCover(
+    private static Task<IResult> GetAlbumCover(
         IMediator mediator,
         IStorageService storageService,
         HttpResponse response,
@@ -187,17 +189,7 @@ public static class AlbumEndpoints
         CancellationToken cancellationToken,
         string size = "medium")
     {
-        var result = await mediator.Send(new GetAlbumCoverQuery(id, size), cancellationToken);
-        if (result.IsError)
-            return Results.NotFound();
-
-        var location = result.Value;
-        var stream = await storageService.GetFileAsync(location.Bucket, location.Key, cancellationToken);
-        if (stream == null)
-            return Results.NotFound();
-
-        response.Headers.CacheControl = "public, max-age=31536000, immutable";
-        return Results.Stream(stream, location.ContentType);
+        return CoverEndpoint.Stream(mediator, storageService, response, CoverOwner.Album, id, size, cancellationToken);
     }
 
     private static async Task<IResult> RequestAlbumPictureUpload(

backend/Hosts/Musify.Api/Endpoints/CoverEndpoint.cs

@@ -0,0 +1,31 @@
+using Mediator;
+using Musify.Application.Configuration;
+using Musify.Application.Contracts;
+using Musify.Application.Pictures;
+
+namespace Musify.Api.Endpoints;
+
+internal static class CoverEndpoint
+{
+    public static async Task<IResult> Stream(
+        IMediator mediator,
+        IStorageService storageService,
+        HttpResponse response,
+        CoverOwner owner,
+        Guid id,
+        string size,
+        CancellationToken cancellationToken)
+    {
+        var result = await mediator.Send(new GetCoverQuery(owner, id, PictureSizeParser.Parse(size)), cancellationToken);
+        if (result.IsError)
+            return Results.NotFound();
+
+        var location = result.Value;
+        var stream = await storageService.GetFileAsync(location.Bucket, location.Key, cancellationToken);
+        if (stream == null)
+            return Results.NotFound();
+
+        response.Headers.CacheControl = "public, max-age=31536000, immutable";
+        return Results.Stream(stream, location.ContentType);
+    }
+}

backend/Hosts/Musify.Api/Endpoints/PlayListEndpoints.cs

@@ -4,6 +4,8 @@ using Musify.Api.DataTransferObjects.PlayLists;
 using Musify.Api.Extensions;
 using Musify.Api.Filters;
 using Musify.Application.Contracts;
+using Musify.Application.Pictures;
+using Musify.Application.Pictures.Responses;
 using Musify.Application.PlayLists;
 using Musify.Application.PlayLists.Responses;
 using Musify.Api.Models;
@@ -80,7 +82,7 @@ public static class PlayListEndpoints
             .WithSummary("Request A Pre-Signed URL To Upload A PlayList Picture.")
             .AddEndpointFilter<ValidationFilter<RequestPlayListPictureUploadRequest>>()
             .RequireAuthorization()
-            .Produces<PlayListPictureUploadResponse>()
+            .Produces<PictureUploadResponse>()
             .ProducesValidationProblem()
             .Produces(StatusCodes.Status401Unauthorized)
             .Produces(StatusCodes.Status404NotFound);
@@ -140,7 +142,7 @@ public static class PlayListEndpoints
         return result.ToHttpResult();
     }
 
-    private static async Task<IResult> GetPlayListCover(
+    private static Task<IResult> GetPlayListCover(
         IMediator mediator,
         IStorageService storageService,
         HttpResponse response,
@@ -148,17 +150,7 @@ public static class PlayListEndpoints
         CancellationToken cancellationToken,
         string size = "medium")
     {
-        var result = await mediator.Send(new GetPlayListCoverQuery(id, size), cancellationToken);
-        if (result.IsError)
-            return Results.NotFound();
-
-        var location = result.Value;
-        var stream = await storageService.GetFileAsync(location.Bucket, location.Key, cancellationToken);
-        if (stream == null)
-            return Results.NotFound();
-
-        response.Headers.CacheControl = "public, max-age=31536000, immutable";
-        return Results.Stream(stream, location.ContentType);
+        return CoverEndpoint.Stream(mediator, storageService, response, CoverOwner.PlayList, id, size, cancellationToken);
     }
 
     private static async Task<IResult> CreatePlayList(

backend/Hosts/Musify.Api/Endpoints/TrackEndpoints.cs

@@ -4,6 +4,7 @@ using Musify.Api.DataTransferObjects.Tracks;
 using Musify.Api.Extensions;
 using Musify.Api.Filters;
 using Musify.Application.Contracts;
+using Musify.Application.Pictures;
 using Musify.Api.Models;
 using Musify.Application.Shared;
 using Musify.Application.Tracks;
@@ -128,7 +129,7 @@ public static class TrackEndpoints
         return result.ToHttpResult();
     }
 
-    private static async Task<IResult> GetTrackCover(
+    private static Task<IResult> GetTrackCover(
         IMediator mediator,
         IStorageService storageService,
         HttpResponse response,
@@ -136,17 +137,7 @@ public static class TrackEndpoints
         CancellationToken cancellationToken,
         string size = "medium")
     {
-        var result = await mediator.Send(new GetTrackCoverQuery(id, size), cancellationToken);
-        if (result.IsError)
-            return Results.NotFound();
-
-        var location = result.Value;
-        var stream = await storageService.GetFileAsync(location.Bucket, location.Key, cancellationToken);
-        if (stream == null)
-            return Results.NotFound();
-
-        response.Headers.CacheControl = "public, max-age=31536000, immutable";
-        return Results.Stream(stream, location.ContentType);
+        return CoverEndpoint.Stream(mediator, storageService, response, CoverOwner.Track, id, size, cancellationToken);
     }
 
     private static async Task<IResult> GetTrackStream(