NotS1mp/Musify
0
0
Fork 0
Code Issues 23 Pull Requests Actions Packages Projects Releases Wiki Activity

Enable more analyzers, drop log-and-rethrow in file activities and apply dotnet format

Browse Source 
Use invariant culture when formatting ids, put cancellation tokens last in endpoint handlers, remove the
CS8618 pragmas and keep only the analyzer overrides that still apply.
This commit is contained in:
Admin
2026-09-24 12:57:53 +02:00
parent 2d0867e68a
commit 28a7c4a98c
39 changed files with 160 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/.editorconfig
+16 -11
View File
@@ -41,6 +41,13 @@ dotnet_naming_symbols.private_fields.applicable_accessibilities = private
dotnet_naming_symbols.private_fields.required_modifiers =
dotnet_naming_style.camel_case.capitalization = camel_case
dotnet_naming_rule.private_static_readonly.symbols = private_static_readonly
dotnet_naming_rule.private_static_readonly.style = pascal_case
dotnet_naming_rule.private_static_readonly.severity = warning
dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly.required_modifiers = static, readonly
dotnet_naming_rule.private_constants.symbols = private_constants
dotnet_naming_rule.private_constants.style = pascal_case
dotnet_naming_rule.private_constants.severity = warning
@@ -48,18 +55,16 @@ dotnet_naming_symbols.private_constants.applicable_kinds = field
dotnet_naming_symbols.private_constants.required_modifiers = const
dotnet_naming_style.pascal_case.capitalization = pascal_case
# Analyzer rules that would need behaviour or API changes; downgraded in P0, revisit in P15.
# CA1848/CA1873 would turn every log call into a [LoggerMessage] source-generated method; CA1716 flags the
# EF-style IDatabase.Set<T>() and the Musify.Application.Shared namespace, whose names are deliberate.
dotnet_diagnostic.CA1848.severity = suggestion
dotnet_diagnostic.CA1873.severity = suggestion
dotnet_diagnostic.CA1305.severity = suggestion
dotnet_diagnostic.CA1707.severity = suggestion
dotnet_diagnostic.CA1859.severity = suggestion
dotnet_diagnostic.CA1716.severity = suggestion
dotnet_diagnostic.CA1000.severity = suggestion
dotnet_diagnostic.CA1725.severity = suggestion
dotnet_diagnostic.CA1816.severity = suggestion
# The routing slip builders are stateless services resolved from DI; they stay instance members.
dotnet_diagnostic.CA1822.severity = suggestion
dotnet_diagnostic.CA1852.severity = suggestion
dotnet_diagnostic.CA1068.severity = suggestion
dotnet_diagnostic.CA1711.severity = suggestion
dotnet_diagnostic.CA1861.severity = suggestion
# Test names follow Method_Scenario_Expected.
[Tests/**.cs]
dotnet_diagnostic.CA1707.severity = none
# xUnit collection fixtures are conventionally named ...Collection.
dotnet_diagnostic.CA1711.severity = none
backend/Core/Musify.Application/Configuration/Pictures.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Globalization;
using Musify.Application.Shared;
namespace Musify.Application.Configuration;
@@ -41,10 +42,10 @@ public class PictureRoutes
public string BuildPicturePath(PictureSize size, string pictureName) => StorageKey.Combine(FolderPath(size), pictureName);
public string BuildOriginalPicturePath(long userId, string pictureName) =>
StorageKey.Combine(UploadsFolder, userId.ToString(), ParentFolder, OriginalPicturesFolder, pictureName);
StorageKey.Combine(UploadsFolder, userId.ToString(CultureInfo.InvariantCulture), ParentFolder, OriginalPicturesFolder, pictureName);
public string BuildTempPath(string tempRootPrefix, long userId, string objectName) =>
StorageKey.Combine(tempRootPrefix, userId.ToString(), ParentFolder, objectName);
StorageKey.Combine(tempRootPrefix, userId.ToString(CultureInfo.InvariantCulture), ParentFolder, objectName);
}
public class PictureSizes
backend/Core/Musify.Application/Configuration/TrackConfiguration.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Globalization;
using Musify.Application.Shared;
namespace Musify.Application.Configuration;
@@ -48,7 +49,7 @@ public class TrackRoutes : PictureRoutes
public string PresetLargePicturePath => StorageKey.Combine(ParentFolder, PresetLargePicture);
public string BuildOriginalAudioPath(long userId, string audioName) =>
StorageKey.Combine(UploadsFolder, userId.ToString(), ParentFolder, OriginalAudiosFolder, audioName);
StorageKey.Combine(UploadsFolder, userId.ToString(CultureInfo.InvariantCulture), ParentFolder, OriginalAudiosFolder, audioName);
public string BuildProcessedAudioPath(string folderName) =>
StorageKey.Combine(ParentFolder, ProcessedAudiosFolder, folderName);
backend/Core/Musify.Application/Genres/GetAvailableGenres.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using Mediator;
using Musify.Domain.ValueObjects;
using Musify.Application.Genres.Responses;
using Musify.Domain.ValueObjects;
namespace Musify.Application.Genres;
backend/Core/Musify.Application/Genres/GetGenres.cs
+1 -1
View File
@@ -1,8 +1,8 @@
using Mediator;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Contracts;
using Musify.Domain.ValueObjects;
using Musify.Application.Genres.Responses;
using Musify.Domain.ValueObjects;
namespace Musify.Application.Genres;
backend/Core/Musify.Application/Mixes/GenerateMixesForUser.cs
+1 -1
View File
@@ -79,7 +79,7 @@ public class GenerateMixesForUserCommandHandler(
private static List<Guid> Shuffle(IEnumerable<Guid> trackIds) =>
[.. trackIds.OrderBy(_ => Guid.NewGuid())];
private static List<Guid> Interleave(IReadOnlyList<Guid> first, IReadOnlyList<Guid> second)
private static List<Guid> Interleave(List<Guid> first, List<Guid> second)
{
var merged = new List<Guid>(first.Count + second.Count);
for (var index = 0; index < Math.Max(first.Count, second.Count); index++)
backend/Core/Musify.Application/Tracks/CreateTrack.cs
+1 -1
View File
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Configuration;
using Musify.Application.Contracts;
using Musify.Application.Shared;
using Musify.Application.Events;
using Musify.Application.Services;
using Musify.Application.Shared;
using Musify.Application.Tracks.Responses;
using Musify.Domain.Entities;
using Musify.Domain.ValueObjects;
backend/Core/Musify.Application/Tracks/StartListening.cs
+2 -1
View File
@@ -1,3 +1,4 @@
using System.Globalization;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
@@ -48,7 +49,7 @@ public class StartListeningCommandHandler(
listenId = listen.Id;
}
logger.LogInformation("Issued stream ticket for track {TrackId} to user {UserId}", request.TrackId, request.UserId?.ToString() ?? "(anonymous)");
logger.LogInformation("Issued stream ticket for track {TrackId} to user {UserId}", request.TrackId, request.UserId?.ToString(CultureInfo.InvariantCulture) ?? "(anonymous)");
return streamIssuer.Issue(track.Audio.FolderName, request.UserId, listenId);
}
backend/Core/Musify.Application/Users/GetUserById.cs
+1 -1
View File
@@ -2,8 +2,8 @@ using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Contracts;
using Musify.Application.Users.Responses;
using Musify.Application.Shared;
using Musify.Application.Users.Responses;
namespace Musify.Application.Users;
backend/Core/Musify.Domain/Entities/Mix.cs
+1 -2
View File
@@ -1,8 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Musify.Domain.ValueObjects;
using System.ComponentModel.DataAnnotations.Schema;
using Musify.Domain.Abstractions;
using Musify.Domain.ValueObjects;
namespace Musify.Domain.Entities;
backend/Core/Musify.Domain/ValueObjects/TrackAudio.cs
-1
View File
@@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis;
namespace Musify.Domain.ValueObjects;
#pragma warning disable CS8618
public class TrackAudio
{
public string? OriginalName { get; set; }
backend/Core/Musify.Domain/ValueObjects/TrackPictures.cs
-1
View File
@@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis;
namespace Musify.Domain.ValueObjects;
#pragma warning disable CS8618
public class TrackPictures
{
public string? OriginalName { get; set; }
backend/Core/Musify.Infrastructure/MassTransit/Activities/Files/CopyFileInBucketActivity.cs
-12
View File
@@ -14,8 +14,6 @@ internal class CopyFileInBucketActivity(
public const string ExecuteEndpointName = "copy-file-in-bucket";
public async Task<ExecutionResult> Execute(ExecuteContext<CopyFileInBucketArguments> executeContext)
{
try
{
await storageService.CopyFileAsync(
executeContext.Arguments.SourceBucket,
@@ -28,16 +26,6 @@ internal class CopyFileInBucketActivity(
executeContext.Arguments.DestinationBucket,
executeContext.Arguments.DestinationKey));
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to copy {SourceBucket}/{SourceKey} to {DestinationBucket}/{DestinationKey}",
executeContext.Arguments.SourceBucket,
executeContext.Arguments.SourceKey,
executeContext.Arguments.DestinationBucket,
executeContext.Arguments.DestinationKey);
throw;
}
}
public async Task<CompensationResult> Compensate(CompensateContext<CopyFileInBucketLog> compensateContext)
{
backend/Core/Musify.Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
-8
View File
@@ -18,8 +18,6 @@ internal class DownloadFileFromBucketActivity(
var destinationPath = executeContext.GetVariable<string>(executeContext.Arguments.DestinationFilePathVariable);
ArgumentNullException.ThrowIfNull(destinationPath);
try
{
using var fileStream = await storageService.GetFileAsync(
executeContext.Arguments.Bucket,
executeContext.Arguments.Key,
@@ -40,12 +38,6 @@ internal class DownloadFileFromBucketActivity(
executeContext.Arguments.Key,
destinationPath));
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to download file from bucket");
throw;
}
}
public Task<CompensationResult> Compensate(CompensateContext<DownloadFileFromBucketLog> compensateContext)
{
backend/Core/Musify.Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs
-7
View File
@@ -34,12 +34,5 @@ internal class RemoveFileFromBucketActivity(
executeContext.Arguments.Bucket);
return executeContext.Completed();
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to remove {Key} from bucket {Bucket}",
executeContext.Arguments.Key,
executeContext.Arguments.Bucket);
throw;
}
}
}
backend/Core/Musify.Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs
-10
View File
@@ -20,8 +20,6 @@ internal class TransferFilesToBucketActivity(
var destinationKey = executeContext.Arguments.DestinationKey;
ArgumentNullException.ThrowIfNull(destinationKey);
try
{
var uploadedKeys = await storageService.TransferFilesAsync(
folderPath,
executeContext.Arguments.DestinationBucket,
@@ -32,14 +30,6 @@ internal class TransferFilesToBucketActivity(
executeContext.Arguments.DestinationBucket,
uploadedKeys.ToArray()));
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to transfer files from {FolderPath} to {DestinationBucket}",
folderPath,
executeContext.Arguments.DestinationBucket);
throw;
}
}
public async Task<CompensationResult> Compensate(CompensateContext<TransferFilesToBucketLog> compensateContext)
{
backend/Core/Musify.Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs
-8
View File
@@ -21,8 +21,6 @@ internal class UploadFileToBucketActivity(IStorageService storageService,
.Where(static s => !string.IsNullOrWhiteSpace(s))
.Select(static s => s.Trim().Trim('/', '\\')));
try
{
await storageService.UploadFileAsync(
sourceFilePath,
executeContext.Arguments.DestinationBucket,
@@ -32,12 +30,6 @@ internal class UploadFileToBucketActivity(IStorageService storageService,
executeContext.Arguments.DestinationBucket,
destinationKey));
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to upload file to bucket");
throw;
}
}
public async Task<CompensationResult> Compensate(CompensateContext<UploadFileToBucketLog> compensateContext)
{
backend/Core/Musify.Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
-8
View File
@@ -20,8 +20,6 @@ internal class ResizePictureActivity(
var destinationFilePath = executeContext.GetVariable<string>(executeContext.Arguments.DestinationFilePathVariable);
ArgumentNullException.ThrowIfNull(destinationFilePath);
try
{
if (!File.Exists(sourceFilePath))
{
logger.LogWarning("Source file not found: {SourceFilePath}", sourceFilePath);
@@ -48,12 +46,6 @@ internal class ResizePictureActivity(
destinationFilePath);
return executeContext.Completed(new ResizePictureLog(destinationFilePath));
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to resize picture {SourceFilePath}", sourceFilePath);
throw;
}
}
public Task<CompensationResult> Compensate(CompensateContext<ResizePictureLog> compensateContext)
{
backend/Core/Musify.Infrastructure/MassTransit/Consumers/RoutingSlipCleanUpConsumer.cs
+4 -4
View File
@@ -12,11 +12,11 @@ public class RoutingSlipCleanUpConsumer(
{
public const string QueueName = "routing-slip-clean-up";
public Task Consume(ConsumeContext<RoutingSlipCompleted> consumeContext)
=> DeleteFolder(consumeContext.Message.Variables);
public Task Consume(ConsumeContext<RoutingSlipCompleted> context)
=> DeleteFolder(context.Message.Variables);
public Task Consume(ConsumeContext<RoutingSlipFaulted> consumeContext)
=> DeleteFolder(consumeContext.Message.Variables);
public Task Consume(ConsumeContext<RoutingSlipFaulted> context)
=> DeleteFolder(context.Message.Variables);
private Task DeleteFolder(IDictionary<string, object> variables)
{
backend/Core/Musify.Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.Registration.cs
+1 -1
View File
@@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
using Musify.Infrastructure.MassTransit.Activities.Albums;
using Musify.Infrastructure.MassTransit.Activities.Audio;
using Musify.Infrastructure.MassTransit.Activities.Files;
using Musify.Infrastructure.MassTransit.Activities.LifeCycle;
using Musify.Infrastructure.MassTransit.Activities.Pictures;
using Musify.Infrastructure.MassTransit.Activities.PlayLists;
using Musify.Infrastructure.MassTransit.Activities.Tracks;
@@ -11,7 +12,6 @@ using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.MassTransit.Logs;
using Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
using Musify.Infrastructure.MassTransit.Activities.LifeCycle;
namespace Musify.Infrastructure.MassTransit;
backend/Core/Musify.Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
+1 -1
View File
@@ -1,11 +1,11 @@
using MassTransit;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Musify.Application.Configuration;
using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Sagas;
using Musify.Infrastructure.Persistence;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.MassTransit;
backend/Core/Musify.Infrastructure/MassTransit/RoutingSlip/Builders/DeleteRoutingSlipBuilder.cs
+1 -1
View File
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
using Musify.Application.Configuration;
using Musify.Application.Contracts;
using Musify.Domain.ValueObjects;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Activities.LifeCycle;
using Musify.Infrastructure.MassTransit.Arguments;
namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
backend/Core/Musify.Infrastructure/Observability/OpenTelemetryDependencyInjection.cs
+1 -1
View File
@@ -1,12 +1,12 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Musify.Application.Configuration;
using Musify.Infrastructure.Configuration;
using OpenTelemetry.Exporter;
using OpenTelemetry.Logs;
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Observability;
backend/Core/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs
+1 -1
View File
@@ -1,8 +1,8 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Musify.Application.Configuration;
using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Persistence;
backend/Core/Musify.Infrastructure/Services/StreamTicketService.cs
+3 -2
View File
@@ -1,3 +1,4 @@
using System.Globalization;
using System.Security.Cryptography;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Tokens;
@@ -30,9 +31,9 @@ public sealed class StreamTicketService : IStreamTicketService, IDisposable
var claims = new Dictionary<string, object> { ["prefix"] = keyPrefix };
if (userId != null)
claims["sub"] = userId.Value.ToString();
claims["sub"] = userId.Value.ToString(CultureInfo.InvariantCulture);
if (maxBytes != null)
claims["maxBytes"] = maxBytes.Value.ToString();
claims["maxBytes"] = maxBytes.Value.ToString(CultureInfo.InvariantCulture);
var descriptor = new SecurityTokenDescriptor
{
backend/Hosts/Musify.Api/Authentication/JwtBearerEventsHandler.cs
+9 -9
View File
@@ -26,9 +26,9 @@ public sealed class JwtBearerEventsHandler(
[property: JsonPropertyName("family_name")] string? FamilyName,
[property: JsonPropertyName("picture")] string? Picture);
public override async Task TokenValidated(TokenValidatedContext tokenValidatedContext)
public override async Task TokenValidated(TokenValidatedContext context)
{
var principal = tokenValidatedContext.Principal!;
var principal = context.Principal!;
var rawId = principal.FindFirstValue(ClaimTypes.NameIdentifier);
if (!long.TryParse(rawId, out var userId))
@@ -41,7 +41,7 @@ public sealed class JwtBearerEventsHandler(
if (cache.TryGetValue(cacheKey, out _))
return;
var userInfo = await FetchUserInfoAsync(tokenValidatedContext, tokenValidatedContext.HttpContext.RequestAborted);
var userInfo = await FetchUserInfoAsync(context, context.HttpContext.RequestAborted);
var username = userInfo?.Name
?? userInfo?.PreferredUsername
@@ -65,7 +65,7 @@ public sealed class JwtBearerEventsHandler(
{
await mediator.Send(
new SyncUserCommand(userId, username, firstName, lastName, profilePictureUrl),
tokenValidatedContext.HttpContext.RequestAborted);
context.HttpContext.RequestAborted);
cache.Set(cacheKey, true, UserSyncCacheTtl);
}
@@ -76,9 +76,9 @@ public sealed class JwtBearerEventsHandler(
}
private async Task<UserInfoResponse?> FetchUserInfoAsync(
TokenValidatedContext tokenValidatedContext, CancellationToken cancellationToken)
TokenValidatedContext context, CancellationToken cancellationToken)
{
var authorizationHeader = tokenValidatedContext.HttpContext.Request.Headers.Authorization.ToString();
var authorizationHeader = context.HttpContext.Request.Headers.Authorization.ToString();
if (!authorizationHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
return null;
@@ -88,7 +88,7 @@ public sealed class JwtBearerEventsHandler(
try
{
var userInfoEndpoint = await ResolveUserInfoEndpointAsync(tokenValidatedContext, cancellationToken);
var userInfoEndpoint = await ResolveUserInfoEndpointAsync(context, cancellationToken);
var client = httpClientFactory.CreateClient();
using var request = new HttpRequestMessage(HttpMethod.Get, userInfoEndpoint)
@@ -113,9 +113,9 @@ public sealed class JwtBearerEventsHandler(
}
private async Task<string> ResolveUserInfoEndpointAsync(
TokenValidatedContext tokenValidatedContext, CancellationToken cancellationToken)
TokenValidatedContext context, CancellationToken cancellationToken)
{
var configurationManager = tokenValidatedContext.Options.ConfigurationManager;
var configurationManager = context.Options.ConfigurationManager;
if (configurationManager != null)
{
var configuration = await configurationManager.GetConfigurationAsync(cancellationToken);
backend/Hosts/Musify.Api/Endpoints/AlbumEndpoints.cs
+6 -6
View File
@@ -129,9 +129,9 @@ public static class AlbumEndpoints
private static async Task<IResult> GetAlbums(
IMediator mediator,
CancellationToken cancellationToken,
string? title,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetAlbumsQuery(title, page.PageNumber, page.PageSize), cancellationToken);
return Results.Ok(result);
@@ -149,8 +149,8 @@ public static class AlbumEndpoints
private static async Task<IResult> GetAlbumsByUserId(
IMediator mediator,
long userId,
CancellationToken cancellationToken,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetAlbumsByUserIdQuery(userId, page.PageNumber, page.PageSize), cancellationToken);
return result.ToHttpResult();
@@ -177,8 +177,8 @@ public static class AlbumEndpoints
private static async Task<IResult> GetAlbumTracks(
IMediator mediator,
Guid id,
CancellationToken cancellationToken,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetAlbumTracksQuery(id, page.PageNumber, page.PageSize), cancellationToken);
return result.ToHttpResult();
backend/Hosts/Musify.Api/Endpoints/LikeEndpoints.cs
+2 -2
View File
@@ -38,8 +38,8 @@ public static class LikeEndpoints
private static async Task<IResult> GetLikedTracks(
IMediator mediator,
CurrentUser currentUser,
CancellationToken cancellationToken,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetLikedTracksQuery(currentUser.RequiredId, page.PageNumber, page.PageSize), cancellationToken);
return Results.Ok(result);
backend/Hosts/Musify.Api/Endpoints/PlayListEndpoints.cs
+4 -4
View File
@@ -125,9 +125,9 @@ public static class PlayListEndpoints
IMediator mediator,
CurrentUser currentUser,
long userId,
CancellationToken cancellationToken,
string? name,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetPlayListsByUserIdQuery(userId, name, page.PageNumber, page.PageSize, currentUser.Id), cancellationToken);
return Results.Ok(result);
@@ -137,8 +137,8 @@ public static class PlayListEndpoints
IMediator mediator,
CurrentUser currentUser,
Guid id,
CancellationToken cancellationToken,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetPlayListTracksQuery(id, page.PageNumber, page.PageSize, currentUser.Id), cancellationToken);
return result.ToHttpResult();
backend/Hosts/Musify.Api/Endpoints/TrackEndpoints.cs
+4 -4
View File
@@ -97,10 +97,10 @@ public static class TrackEndpoints
private static async Task<IResult> GetTracks(
IMediator mediator,
CancellationToken cancellationToken,
string? name,
GenreParameter? genre,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetTracksQuery(name, page.PageNumber, page.PageSize, genre?.Value), cancellationToken);
return Results.Ok(result);
@@ -152,9 +152,9 @@ public static class TrackEndpoints
private static async Task<IResult> GetTracksByUserId(
IMediator mediator,
long userId,
CancellationToken cancellationToken,
string? name,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetTracksByUserIdQuery(userId, name, page.PageNumber, page.PageSize), cancellationToken);
return result.ToHttpResult();
backend/Hosts/Musify.Api/Endpoints/UserEndpoints.cs
+6 -6
View File
@@ -100,9 +100,9 @@ public static class UserEndpoints
private static async Task<IResult> GetUsers(
IMediator mediator,
CurrentUser currentUser,
CancellationToken cancellationToken,
string? usernameSearch,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetUsersQuery(page.PageNumber, page.PageSize, usernameSearch, currentUser.Id), cancellationToken);
return Results.Ok(result);
@@ -162,8 +162,8 @@ public static class UserEndpoints
IMediator mediator,
CurrentUser currentUser,
long id,
CancellationToken cancellationToken,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetUserFollowersQuery(currentUser.Id, id, page.PageNumber, page.PageSize), cancellationToken);
return result.ToHttpResult();
@@ -173,8 +173,8 @@ public static class UserEndpoints
IMediator mediator,
CurrentUser currentUser,
long id,
CancellationToken cancellationToken,
[AsParameters] PageQuery page)
[AsParameters] PageQuery page,
CancellationToken cancellationToken)
{
var result = await mediator.Send(new GetUserFollowingQuery(currentUser.Id, id, page.PageNumber, page.PageSize), cancellationToken);
return result.ToHttpResult();
backend/Tests/Musify.Api.Tests/Endpoints/AlbumEndpointsTests.cs
+1 -1
View File
@@ -4,8 +4,8 @@ using Musify.Api.DataTransferObjects;
using Musify.Api.DataTransferObjects.Albums;
using Musify.Api.Tests.TestSupport;
using Musify.Application.Albums.Responses;
using Musify.Application.Pictures.Responses;
using Musify.Application.Contracts;
using Musify.Application.Pictures.Responses;
using NSubstitute;
using Xunit;
backend/Tests/Musify.Api.Tests/TestSupport/ApiTestFixture.cs
+2 -1
View File
@@ -1,3 +1,4 @@
using System.Globalization;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
@@ -64,7 +65,7 @@ public sealed class ApiTestFixture : WebApplicationFactory<Program>, IAsyncLifet
public HttpClient CreateAuthenticatedClient(long userId, string userName = "test-user")
{
var client = CreateClient();
client.DefaultRequestHeaders.Add(FakeAuthenticationHandler.UserIdHeader, userId.ToString());
client.DefaultRequestHeaders.Add(FakeAuthenticationHandler.UserIdHeader, userId.ToString(CultureInfo.InvariantCulture));
client.DefaultRequestHeaders.Add("X-Test-User-Name", userName);
return client;
}
backend/Tests/Musify.Application.Tests/Genres/GetAvailableGenresQueryHandlerTests.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Musify.Application.Genres;
using Musify.Application.Genres.Responses;
using Musify.Domain.ValueObjects;
using Xunit;
using Musify.Application.Genres.Responses;
namespace Musify.Application.Tests.Genres;
backend/Tests/Musify.Application.Tests/TestSupport/HandlerTestBase.cs
+5 -1
View File
@@ -12,7 +12,11 @@ public abstract class HandlerTestBase : IAsyncLifetime
public async ValueTask InitializeAsync() => database = await TestDatabase.CreateAsync();
public ValueTask DisposeAsync() => database.DisposeAsync();
public ValueTask DisposeAsync()
{
GC.SuppressFinalize(this);
return database.DisposeAsync();
}
protected static ILogger<T> NoOpLogger<T>() => NullLogger<T>.Instance;
backend/Tests/Musify.Infrastructure.Tests/MassTransit/DeleteRoutingSlipBuilderTests.cs
+8 -2
View File
@@ -18,7 +18,10 @@ public sealed class DeleteRoutingSlipBuilderTests(InfrastructureTestFixture fixt
{
var album = await SeedAlbumAsync(new EntityPictures
{
OriginalName = "original.webp", SmallName = "small.webp", MediumName = "medium.webp", LargeName = "large.webp"
OriginalName = "original.webp",
SmallName = "small.webp",
MediumName = "medium.webp",
LargeName = "large.webp"
});
await using var database = fixture.CreateDatabase();
@@ -116,7 +119,10 @@ public sealed class DeleteRoutingSlipBuilderTests(InfrastructureTestFixture fixt
var track = await SeedTrackAsync(
new TrackPictures
{
OriginalName = "original.webp", SmallName = "s.webp", MediumName = "m.webp", LargeName = "l.webp",
OriginalName = "original.webp",
SmallName = "s.webp",
MediumName = "m.webp",
LargeName = "l.webp",
ProcessingStatus = ProcessingStatus.Completed
},
new TrackAudio { OriginalName = "audio.mp3", FolderName = "folder", TranscodeStatus = ProcessingStatus.Completed });
backend/Tests/Musify.Infrastructure.Tests/TestSupport/InfrastructureTestFixture.cs
+3 -1
View File
@@ -18,6 +18,8 @@ public sealed class InfrastructureTestFixture : IAsyncLifetime
public const string S3SecretKey = "musify-test-secret";
public const string S3Bucket = "musify-test-bucket";
private static readonly string[] S3Actions = ["Admin", "Read", "Write"];
private readonly PostgreSqlContainer postgres = new PostgreSqlBuilder("postgres:17-alpine")
.WithDatabase("musify_test")
.WithUsername("postgres")
@@ -83,7 +85,7 @@ public sealed class InfrastructureTestFixture : IAsyncLifetime
{
name = "musify-test",
credentials = new[] { new { accessKey = S3AccessKey, secretKey = S3SecretKey } },
actions = new[] { "Admin", "Read", "Write" }
actions = S3Actions
}
}
});
backend/Tests/Musify.StreamingGateway.Tests/Authentication/TicketValidatorTests.cs
+2 -1
View File
@@ -1,3 +1,4 @@
using System.Globalization;
using System.Security.Cryptography;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Tokens;
@@ -36,7 +37,7 @@ public sealed class TicketValidatorTests : IDisposable
{
var claims = new Dictionary<string, object> { ["prefix"] = prefix };
if (maxBytes != null)
claims["maxBytes"] = maxBytes.Value.ToString();
claims["maxBytes"] = maxBytes.Value.ToString(CultureInfo.InvariantCulture);
var descriptor = new SecurityTokenDescriptor
{
backend/Tests/Musify.StreamingGateway.Tests/Middleware/TicketValidationMiddlewareTests.cs
+2 -1
View File
@@ -1,3 +1,4 @@
using System.Globalization;
using System.Security.Cryptography;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging.Abstractions;
@@ -39,7 +40,7 @@ public sealed class TicketValidationMiddlewareTests : IDisposable
{
var claims = new Dictionary<string, object> { ["prefix"] = prefix };
if (maxBytes != null)
claims["maxBytes"] = maxBytes.Value.ToString();
claims["maxBytes"] = maxBytes.Value.ToString(CultureInfo.InvariantCulture);
return new JsonWebTokenHandler().CreateToken(new SecurityTokenDescriptor
{