Fix namespaces

This commit is contained in:
2026-03-25 18:12:08 +01:00
parent fb34f19076
commit 83aeeeb82a
67 changed files with 71 additions and 75 deletions
@@ -4,7 +4,7 @@ using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.Audio; using Musify.Infrastructure.Audio;
using Musify.Infrastructure.Configuration; using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.Identity; using Musify.Infrastructure.Identity;
using Musify.Infrastructure.Messaging; using Musify.Infrastructure.MassTransit;
using Musify.Infrastructure.Observability; using Musify.Infrastructure.Observability;
using Musify.Infrastructure.Persistence; using Musify.Infrastructure.Persistence;
using Musify.Infrastructure.Pictures; using Musify.Infrastructure.Pictures;
@@ -2,9 +2,9 @@ using MassTransit;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class GenerateAudioWorkflowPathsActivity( public class GenerateAudioWorkflowPathsActivity(
ILogger<GenerateAudioWorkflowPathsActivity> logger, ILogger<GenerateAudioWorkflowPathsActivity> logger,
@@ -2,10 +2,10 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.Logs;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class TranscodeDashAudioActivity( public class TranscodeDashAudioActivity(
IAudioTranscoder audioTranscoder, IAudioTranscoder audioTranscoder,
@@ -4,7 +4,7 @@ using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs; using Musify.Infrastructure.MassTransit.Logs;
using Musify.Infrastructure.Messaging.Activities; using Musify.Infrastructure.MassTransit.Activities;
namespace Musify.Infrastructure.MassTransit.Activities.Audio namespace Musify.Infrastructure.MassTransit.Activities.Audio
{ {
@@ -2,10 +2,10 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.Logs;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class DownloadFileFromBucketActivity( public class DownloadFileFromBucketActivity(
IStorageHandler storageHandler, IStorageHandler storageHandler,
@@ -2,9 +2,9 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class RemoveFileFromBucketActivity( public class RemoveFileFromBucketActivity(
IStorageHandler storageHandler, IStorageHandler storageHandler,
@@ -2,10 +2,10 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.Logs;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class TransferFilesToBucketActivity( public class TransferFilesToBucketActivity(
IStorageHandler storageHandler, IStorageHandler storageHandler,
@@ -2,9 +2,9 @@ using MassTransit;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class GeneratePictureWorkflowPathsActivity( public class GeneratePictureWorkflowPathsActivity(
ILogger<GeneratePictureWorkflowPathsActivity> logger, ILogger<GeneratePictureWorkflowPathsActivity> logger,
@@ -2,10 +2,10 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.Logs;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class ResizePictureActivity( public class ResizePictureActivity(
IPictureHandler pictureHandler, IPictureHandler pictureHandler,
@@ -2,10 +2,10 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.Logs;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class UpdatePlayListPictureActivity( public class UpdatePlayListPictureActivity(
IDatabase database, IDatabase database,
@@ -2,10 +2,10 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.Logs;
namespace Musify.Infrastructure.Messaging.Activities namespace Musify.Infrastructure.MassTransit.Activities
{ {
public class UpdateTrackPictureActivity( public class UpdateTrackPictureActivity(
IDatabase database, IDatabase database,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record DownloadFileFromBucketArguments( public record DownloadFileFromBucketArguments(
string BucketName, string BucketName,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record GenerateAudioWorkflowPathsArguments( public record GenerateAudioWorkflowPathsArguments(
string TemporaryRootDirectory, string TemporaryRootDirectory,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record GeneratePictureWorkflowPathsArguments( public record GeneratePictureWorkflowPathsArguments(
string TemporaryRootDirectory, string TemporaryRootDirectory,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record RemoveFileFromBucketArguments( public record RemoveFileFromBucketArguments(
string BucketName, string BucketName,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record ResizePictureLocalArguments( public record ResizePictureLocalArguments(
string SourceFilePathVariableName, string SourceFilePathVariableName,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record TranscodeDashAudioArguments( public record TranscodeDashAudioArguments(
string SourceFilePathVariableName, string SourceFilePathVariableName,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record TransferFilesToBucketArguments( public record TransferFilesToBucketArguments(
string DestinationBucketName, string DestinationBucketName,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record UpdatePlayListPictureArguments( public record UpdatePlayListPictureArguments(
Guid PlayListId, Guid PlayListId,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Arguments namespace Musify.Infrastructure.MassTransit.Activities.Arguments
{ {
public record UpdateTrackPictureArguments( public record UpdateTrackPictureArguments(
Guid TrackId, Guid TrackId,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Consumers namespace Musify.Infrastructure.MassTransit.Consumers
{ {
internal static class MessagingHelper internal static class MessagingHelper
{ {
@@ -1,8 +1,8 @@
using MassTransit; using MassTransit;
using Musify.Application.Events; using Musify.Application.Events;
using Musify.Infrastructure.Messaging.RoutingSlip.Builders; using Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
namespace Musify.Infrastructure.Messaging.Consumers namespace Musify.Infrastructure.MassTransit.Consumers
{ {
public class RemoveFileConsumer( public class RemoveFileConsumer(
IBus bus, IBus bus,
@@ -1,7 +1,7 @@
using MassTransit; using MassTransit;
using MassTransit.Courier.Contracts; using MassTransit.Courier.Contracts;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Musify.Infrastructure.Messaging; using Musify.Infrastructure.MassTransit;
namespace Musify.Infrastructure.MassTransit.Consumers namespace Musify.Infrastructure.MassTransit.Consumers
{ {
@@ -1,8 +1,8 @@
using MassTransit; using MassTransit;
using Musify.Application.Events; using Musify.Application.Events;
using Musify.Infrastructure.Messaging.RoutingSlip.Builders; using Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
namespace Musify.Infrastructure.Messaging.Consumers namespace Musify.Infrastructure.MassTransit.Consumers
{ {
public class UpdatePlayListPictureConsumer( public class UpdatePlayListPictureConsumer(
IBus bus, IBus bus,
@@ -1,6 +1,6 @@
using MassTransit; using MassTransit;
using Musify.Application.Events; using Musify.Application.Events;
using Musify.Infrastructure.Messaging.RoutingSlip.Builders; using Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
namespace Musify.Infrastructure.MassTransit.Consumers namespace Musify.Infrastructure.MassTransit.Consumers
{ {
@@ -1,8 +1,8 @@
using MassTransit; using MassTransit;
using Musify.Application.Events; using Musify.Application.Events;
using Musify.Infrastructure.Messaging.RoutingSlip.Builders; using Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
namespace Musify.Infrastructure.Messaging.Consumers namespace Musify.Infrastructure.MassTransit.Consumers
{ {
public class UpdateTrackPictureConsumer( public class UpdateTrackPictureConsumer(
IBus bus, IBus bus,
@@ -5,14 +5,13 @@ using Musify.Infrastructure.MassTransit.Activities.Audio;
using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers; using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.MassTransit.Logs; using Musify.Infrastructure.MassTransit.Logs;
using Musify.Infrastructure.Messaging.Activities; using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Infrastructure.Messaging.Consumers; using Musify.Infrastructure.MassTransit.Filters;
using Musify.Infrastructure.Messaging.Filters; using Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
using Musify.Infrastructure.Messaging.RoutingSlip.Builders;
namespace Musify.Infrastructure.Messaging namespace Musify.Infrastructure.MassTransit
{ {
public static class MessagingDependencyInjection public static class MessagingDependencyInjection
{ {
@@ -1,7 +1,7 @@
using MassTransit; using MassTransit;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
namespace Musify.Infrastructure.Messaging namespace Musify.Infrastructure.MassTransit
{ {
public class MassTransitEventBus(IPublishEndpoint publishEndpoint) public class MassTransitEventBus(IPublishEndpoint publishEndpoint)
: IEventBus : IEventBus
@@ -2,7 +2,7 @@ using MassTransit;
using Musify.Application.Contracts.Infrastructure; using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities; using Musify.Domain.Entities;
namespace Musify.Infrastructure.Messaging.Filters namespace Musify.Infrastructure.MassTransit.Filters
{ {
public class ProcessTrackingConsumeFilter<TMessage>(IProcessTrackingStore processTrackingStore) public class ProcessTrackingConsumeFilter<TMessage>(IProcessTrackingStore processTrackingStore)
: IFilter<ConsumeContext<TMessage>> : IFilter<ConsumeContext<TMessage>>
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record DownloadFileFromBucketLog( public record DownloadFileFromBucketLog(
string BucketName, string BucketName,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record GenerateAudioWorkflowPathsLog(string WorkingDirectory); public record GenerateAudioWorkflowPathsLog(string WorkingDirectory);
} }
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record GeneratePictureWorkflowPathsLog(string WorkingDirectory); public record GeneratePictureWorkflowPathsLog(string WorkingDirectory);
} }
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record ResizePictureLog(string DestinationFilePath); public record ResizePictureLog(string DestinationFilePath);
} }
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record TranscodeDashAudioLog(string WorkingDirectory); public record TranscodeDashAudioLog(string WorkingDirectory);
} }
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record TransferFilesToBucketLog(string DestinationBucketName, string[] UploadedKeys); public record TransferFilesToBucketLog(string DestinationBucketName, string[] UploadedKeys);
} }
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record UpdatePlayListPictureLog( public record UpdatePlayListPictureLog(
Guid PlayListId, Guid PlayListId,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.Activities.Logs namespace Musify.Infrastructure.MassTransit.Activities.Logs
{ {
public record UpdateTrackPictureLog( public record UpdateTrackPictureLog(
Guid TrackId, Guid TrackId,
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging.RoutingSlip namespace Musify.Infrastructure.MassTransit.RoutingSlip
{ {
internal static class ActivityNames internal static class ActivityNames
{ {
@@ -5,11 +5,10 @@ using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Activities.Audio; using Musify.Infrastructure.MassTransit.Activities.Audio;
using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers; using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.Messaging.Activities; using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Consumers;
namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
{ {
public class AudioWorkflowRoutingSlipBuilder(WorkerConfiguration workerConfiguration) public class AudioWorkflowRoutingSlipBuilder(WorkerConfiguration workerConfiguration)
{ {
@@ -3,11 +3,10 @@ using MassTransit.Courier.Contracts;
using Musify.Application.Events; using Musify.Application.Events;
using Musify.Infrastructure.Configuration; using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Consumers; using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.Messaging.Activities; using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Consumers;
namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
{ {
public class PictureWorkflowRoutingSlipBuilder(WorkerConfiguration workerConfiguration) public class PictureWorkflowRoutingSlipBuilder(WorkerConfiguration workerConfiguration)
{ {
@@ -2,11 +2,10 @@ using MassTransit;
using MassTransit.Courier.Contracts; using MassTransit.Courier.Contracts;
using Musify.Application.Events; using Musify.Application.Events;
using Musify.Infrastructure.MassTransit.Consumers; using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.Messaging.Activities; using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.Messaging.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.Messaging.Consumers;
namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
{ {
public class RemoveFileFromBucketRoutingSlipBuilder public class RemoveFileFromBucketRoutingSlipBuilder
{ {
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.Messaging namespace Musify.Infrastructure.MassTransit
{ {
internal static class RoutingSlipVariableNames internal static class RoutingSlipVariableNames
{ {