diff --git a/Application/Common/ImageSize.cs b/Application/Common/ImageSize.cs index 1a1d107..17b104f 100644 --- a/Application/Common/ImageSize.cs +++ b/Application/Common/ImageSize.cs @@ -1,4 +1,4 @@ -namespace Musify.Application.Events +namespace Musify.Application.Common { public record ImageSize( string SavePath, diff --git a/Application/Contracts/Application/IFileData.cs b/Application/Contracts/Application/IFileData.cs deleted file mode 100644 index af7438c..0000000 --- a/Application/Contracts/Application/IFileData.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Musify.Application.Contracts.Application -{ - public interface IFileData - { - Stream FileStream { get; } - - string FileName { get; } - - string FileType { get; } - - string ContentType { get; } - } -} \ No newline at end of file diff --git a/Application/Contracts/Infrastructure/IAudioTranscoderService.cs b/Application/Contracts/IAudioTranscoderService.cs similarity index 83% rename from Application/Contracts/Infrastructure/IAudioTranscoderService.cs rename to Application/Contracts/IAudioTranscoderService.cs index 41ec61d..d2c06dd 100644 --- a/Application/Contracts/Infrastructure/IAudioTranscoderService.cs +++ b/Application/Contracts/IAudioTranscoderService.cs @@ -1,4 +1,4 @@ -namespace Musify.Application.Contracts.Infrastructure +namespace Musify.Application.Contracts { public interface IAudioTranscoderService { diff --git a/Application/Contracts/Infrastructure/IDatabase.cs b/Application/Contracts/IDatabase.cs similarity index 92% rename from Application/Contracts/Infrastructure/IDatabase.cs rename to Application/Contracts/IDatabase.cs index bf75e6a..8fbaf26 100644 --- a/Application/Contracts/Infrastructure/IDatabase.cs +++ b/Application/Contracts/IDatabase.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; using Musify.Domain.Entities; -namespace Musify.Application.Contracts.Infrastructure +namespace Musify.Application.Contracts { public interface IDatabase { diff --git a/Application/Contracts/Infrastructure/IDatabaseTransaction.cs b/Application/Contracts/IDatabaseTransaction.cs similarity index 73% rename from Application/Contracts/Infrastructure/IDatabaseTransaction.cs rename to Application/Contracts/IDatabaseTransaction.cs index 1aedc2e..42e6185 100644 --- a/Application/Contracts/Infrastructure/IDatabaseTransaction.cs +++ b/Application/Contracts/IDatabaseTransaction.cs @@ -1,4 +1,4 @@ -namespace Musify.Application.Contracts.Infrastructure +namespace Musify.Application.Contracts { public interface IDatabaseTransaction : IAsyncDisposable { diff --git a/Application/Contracts/Infrastructure/IEventBus.cs b/Application/Contracts/IEventBus.cs similarity index 72% rename from Application/Contracts/Infrastructure/IEventBus.cs rename to Application/Contracts/IEventBus.cs index 2d41fea..1f5acb9 100644 --- a/Application/Contracts/Infrastructure/IEventBus.cs +++ b/Application/Contracts/IEventBus.cs @@ -1,4 +1,4 @@ -namespace Musify.Application.Contracts.Infrastructure +namespace Musify.Application.Contracts { public interface IEventBus { diff --git a/Application/Contracts/Infrastructure/IPictureService.cs b/Application/Contracts/IPictureService.cs similarity index 77% rename from Application/Contracts/Infrastructure/IPictureService.cs rename to Application/Contracts/IPictureService.cs index f881fc7..8c8ccd2 100644 --- a/Application/Contracts/Infrastructure/IPictureService.cs +++ b/Application/Contracts/IPictureService.cs @@ -1,4 +1,4 @@ -namespace Musify.Application.Contracts.Infrastructure +namespace Musify.Application.Contracts { public interface IPictureService { diff --git a/Application/Contracts/Infrastructure/IStorageService.cs b/Application/Contracts/IStorageService.cs similarity index 92% rename from Application/Contracts/Infrastructure/IStorageService.cs rename to Application/Contracts/IStorageService.cs index f58df25..388d680 100644 --- a/Application/Contracts/Infrastructure/IStorageService.cs +++ b/Application/Contracts/IStorageService.cs @@ -1,11 +1,11 @@ -namespace Musify.Application.Contracts.Infrastructure +namespace Musify.Application.Contracts { public interface IStorageService { Task GetFileAsync(string bucket, string key, CancellationToken cancellationToken); // Returns null if the object does not exist - Task HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken); + Task HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken); Task GetUrlAsync(string bucket, string key, TimeSpan ExpirationTime, CancellationToken cancellationToken); diff --git a/Application/Contracts/Infrastructure/ObjectMetadata.cs b/Application/Contracts/Infrastructure/ObjectMetadata.cs deleted file mode 100644 index 13061c9..0000000 --- a/Application/Contracts/Infrastructure/ObjectMetadata.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Musify.Application.Contracts.Infrastructure -{ - public record ObjectMetadata(string ContentType, long ContentLength); -} diff --git a/Application/Contracts/ObjectMetaData.cs b/Application/Contracts/ObjectMetaData.cs new file mode 100644 index 0000000..6406463 --- /dev/null +++ b/Application/Contracts/ObjectMetaData.cs @@ -0,0 +1,4 @@ +namespace Musify.Application.Contracts +{ + public record ObjectMetaData(string ContentType, long ContentLength); +} diff --git a/Application/Events/CreatePlayListResourcesEvent.cs b/Application/Events/CreatePlayListResourcesEvent.cs index 89523fb..3954a90 100644 --- a/Application/Events/CreatePlayListResourcesEvent.cs +++ b/Application/Events/CreatePlayListResourcesEvent.cs @@ -1,3 +1,5 @@ +using Musify.Application.Common; + namespace Musify.Application.Events { public record CreatePlayListResourcesEvent( diff --git a/Application/Events/CreateTrackResourcesEvent.cs b/Application/Events/CreateTrackResourcesEvent.cs index 987ce4c..2482d25 100644 --- a/Application/Events/CreateTrackResourcesEvent.cs +++ b/Application/Events/CreateTrackResourcesEvent.cs @@ -1,3 +1,5 @@ +using Musify.Application.Common; + namespace Musify.Application.Events { public record CreateTrackResourcesEvent( diff --git a/Application/Events/UpdatePlayListPictureEvent.cs b/Application/Events/UpdatePlayListPictureEvent.cs index 3063a5e..2a3e760 100644 --- a/Application/Events/UpdatePlayListPictureEvent.cs +++ b/Application/Events/UpdatePlayListPictureEvent.cs @@ -1,3 +1,5 @@ +using Musify.Application.Common; + namespace Musify.Application.Events { public record UpdatePlayListPictureEvent( diff --git a/Application/Events/UpdatePlayListPictureSourceEvent.cs b/Application/Events/UpdatePlayListPictureSourceEvent.cs index 2638c8d..fdc7cbd 100644 --- a/Application/Events/UpdatePlayListPictureSourceEvent.cs +++ b/Application/Events/UpdatePlayListPictureSourceEvent.cs @@ -1,3 +1,5 @@ +using Musify.Application.Common; + namespace Musify.Application.Events { public record UpdatePlayListPictureSourceEvent( diff --git a/Application/Events/UpdateTrackPictureEvent.cs b/Application/Events/UpdateTrackPictureEvent.cs index 2d8c80b..3fd0547 100644 --- a/Application/Events/UpdateTrackPictureEvent.cs +++ b/Application/Events/UpdateTrackPictureEvent.cs @@ -1,3 +1,5 @@ +using Musify.Application.Common; + namespace Musify.Application.Events { public record UpdateTrackPictureEvent( diff --git a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs index 85dd51b..1b7d894 100644 --- a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs @@ -3,13 +3,15 @@ using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Musify.Application.Configuration; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Common; using Musify.Application.Events; using Musify.Application.PlayLists.Commands; using Musify.Application.PlayLists.Responses; using Musify.Application.Extensions; using Musify.Application.Services; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; namespace Musify.Application.PlayLists.Handlers { diff --git a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs index dbb6acb..a27da58 100644 --- a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs @@ -2,10 +2,11 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Application.Events; using Musify.Application.PlayLists.Commands; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; namespace Musify.Application.PlayLists.Handlers { diff --git a/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs index 3c65440..b6881b6 100644 --- a/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs +++ b/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs @@ -1,9 +1,9 @@ using Ardalis.Result; using Microsoft.EntityFrameworkCore; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.PlayLists.Responses; using Musify.Application.PlayLists.Queries; using Mediator; +using Musify.Application.Contracts; namespace Musify.Application.PlayLists.Handlers { diff --git a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs index b493509..2a0506b 100644 --- a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs +++ b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs @@ -1,11 +1,11 @@ using Ardalis.Result; using Microsoft.EntityFrameworkCore; using Musify.Application.Pagination; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.PlayLists.Responses; using Musify.Application.PlayLists.Queries; using X.PagedList.EF; using Mediator; +using Musify.Application.Contracts; namespace Musify.Application.PlayLists.Handlers { diff --git a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs index 89b3b24..c1a1f6d 100644 --- a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs +++ b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs @@ -1,11 +1,11 @@ using Ardalis.Result; using Microsoft.EntityFrameworkCore; using Musify.Application.Pagination; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.PlayLists.Responses; using Musify.Application.PlayLists.Queries; using X.PagedList.EF; using Mediator; +using Musify.Application.Contracts; namespace Musify.Application.PlayLists.Handlers { diff --git a/Application/PlayLists/Handlers/RequestPlayListPictureUploadCommandHandler.cs b/Application/PlayLists/Handlers/RequestPlayListPictureUploadCommandHandler.cs index d1ccb96..4c0d25d 100644 --- a/Application/PlayLists/Handlers/RequestPlayListPictureUploadCommandHandler.cs +++ b/Application/PlayLists/Handlers/RequestPlayListPictureUploadCommandHandler.cs @@ -2,12 +2,13 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; using Musify.Application.PlayLists.Commands; using Musify.Application.PlayLists.Responses; using Musify.Application.Services; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; namespace Musify.Application.PlayLists.Handlers { diff --git a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs index aeea8f1..45f01b8 100644 --- a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs @@ -3,13 +3,15 @@ using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Musify.Application.Configuration; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Common; using Musify.Application.Events; using Musify.Application.PlayLists.Commands; using Musify.Application.PlayLists.Responses; using Musify.Application.Extensions; using Musify.Application.Services; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; namespace Musify.Application.PlayLists.Handlers { diff --git a/Application/Services/UploadIntentValidator.cs b/Application/Services/UploadIntentValidator.cs index aeb43aa..380fbb7 100644 --- a/Application/Services/UploadIntentValidator.cs +++ b/Application/Services/UploadIntentValidator.cs @@ -1,8 +1,9 @@ using Ardalis.Result; using Microsoft.EntityFrameworkCore; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; namespace Musify.Application.Services; diff --git a/Application/Tracks/Handlers/CreateTrackCommandHandler.cs b/Application/Tracks/Handlers/CreateTrackCommandHandler.cs index 7f4fbe9..b33ce1a 100644 --- a/Application/Tracks/Handlers/CreateTrackCommandHandler.cs +++ b/Application/Tracks/Handlers/CreateTrackCommandHandler.cs @@ -3,15 +3,17 @@ using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Musify.Application.Configuration; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Common; using Musify.Application.Events; using Musify.Application.Tracks.Commands; using Musify.Application.Tracks.Responses; using Musify.Application.Extensions; using Musify.Application.Services; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; -namespace Musify.Application.Tracks.Handler +namespace Musify.Application.Tracks.Handlers { public class CreateTrackCommandHandler( IDatabase database, diff --git a/Application/Tracks/Handlers/DeleteTrackCommandHandler.cs b/Application/Tracks/Handlers/DeleteTrackCommandHandler.cs index 66a85c5..eb1ff77 100644 --- a/Application/Tracks/Handlers/DeleteTrackCommandHandler.cs +++ b/Application/Tracks/Handlers/DeleteTrackCommandHandler.cs @@ -2,12 +2,13 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Tracks.Commands; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; using Musify.Application.Events; +using Musify.Application.Contracts; -namespace Musify.Application.Tracks.Handler +namespace Musify.Application.Tracks.Handlers { public class DeleteTrackCommandHandler( IDatabase database, diff --git a/Application/Tracks/Handlers/GetTrackByIdQueryHandler.cs b/Application/Tracks/Handlers/GetTrackByIdQueryHandler.cs index df277c0..52e48c0 100644 --- a/Application/Tracks/Handlers/GetTrackByIdQueryHandler.cs +++ b/Application/Tracks/Handlers/GetTrackByIdQueryHandler.cs @@ -1,11 +1,11 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Application.Tracks.Queries; using Musify.Application.Tracks.Responses; -namespace Musify.Application.Tracks.Handler +namespace Musify.Application.Tracks.Handlers { public class GetTrackByIdQueryHandler(IDatabase database) : IQueryHandler > diff --git a/Application/Tracks/Handlers/GetTracksByUserIdQueryHandler.cs b/Application/Tracks/Handlers/GetTracksByUserIdQueryHandler.cs index 6412908..bf76206 100644 --- a/Application/Tracks/Handlers/GetTracksByUserIdQueryHandler.cs +++ b/Application/Tracks/Handlers/GetTracksByUserIdQueryHandler.cs @@ -2,12 +2,12 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Musify.Application.Pagination; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Tracks.Queries; using Musify.Application.Tracks.Responses; using X.PagedList.EF; +using Musify.Application.Contracts; -namespace Musify.Application.Tracks.Handler +namespace Musify.Application.Tracks.Handlers { public class GetTracksByUserIdQueryHandler(IDatabase database) : IQueryHandler> > diff --git a/Application/Tracks/Handlers/GetTracksQueryHandler.cs b/Application/Tracks/Handlers/GetTracksQueryHandler.cs index 2219fda..694b328 100644 --- a/Application/Tracks/Handlers/GetTracksQueryHandler.cs +++ b/Application/Tracks/Handlers/GetTracksQueryHandler.cs @@ -2,12 +2,12 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Musify.Application.Pagination; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Tracks.Queries; using Musify.Application.Tracks.Responses; using X.PagedList.EF; +using Musify.Application.Contracts; -namespace Musify.Application.Tracks.Handler +namespace Musify.Application.Tracks.Handlers { public class GetTracksQueryHandler(IDatabase database) : IQueryHandler> > diff --git a/Application/Tracks/Handlers/RequestTrackUploadUrlsCommandHandler.cs b/Application/Tracks/Handlers/RequestTrackUploadUrlsCommandHandler.cs index 22cf8a4..f20c9b3 100644 --- a/Application/Tracks/Handlers/RequestTrackUploadUrlsCommandHandler.cs +++ b/Application/Tracks/Handlers/RequestTrackUploadUrlsCommandHandler.cs @@ -2,14 +2,15 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; using Musify.Application.Services; using Musify.Application.Tracks.Commands; using Musify.Application.Tracks.Responses; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; -namespace Musify.Application.Tracks.Handler +namespace Musify.Application.Tracks.Handlers { public class RequestTrackUploadUrlsCommandHandler( IDatabase database, diff --git a/Application/Users/Handlers/CreateUserCommandHandler.cs b/Application/Users/Handlers/CreateUserCommandHandler.cs index 84a9c0e..fabcd17 100644 --- a/Application/Users/Handlers/CreateUserCommandHandler.cs +++ b/Application/Users/Handlers/CreateUserCommandHandler.cs @@ -2,7 +2,7 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Application.Users.Commands; using Musify.Application.Users.Responses; diff --git a/Application/Users/Handlers/GetUserByIdQueryHandler.cs b/Application/Users/Handlers/GetUserByIdQueryHandler.cs index 1d14715..9abc9fc 100644 --- a/Application/Users/Handlers/GetUserByIdQueryHandler.cs +++ b/Application/Users/Handlers/GetUserByIdQueryHandler.cs @@ -1,7 +1,7 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Application.Users.Queries; using Musify.Application.Users.Responses; diff --git a/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs b/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs index 10fb204..db8173b 100644 --- a/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs +++ b/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs @@ -1,7 +1,7 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Application.Users.Queries; using Musify.Application.Users.Responses; diff --git a/Application/Users/Handlers/GetUsersQueryHandler.cs b/Application/Users/Handlers/GetUsersQueryHandler.cs index 4688869..e6d9723 100644 --- a/Application/Users/Handlers/GetUsersQueryHandler.cs +++ b/Application/Users/Handlers/GetUsersQueryHandler.cs @@ -2,10 +2,10 @@ using Ardalis.Result; using Mediator; using Microsoft.EntityFrameworkCore; using Musify.Application.Pagination; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Users.Queries; using Musify.Application.Users.Responses; using X.PagedList.EF; +using Musify.Application.Contracts; namespace Musify.Application.Users.Handlers { diff --git a/Domain/Entities/PlayList.cs b/Domain/Entities/PlayList.cs index e01985f..6e6c7a8 100644 --- a/Domain/Entities/PlayList.cs +++ b/Domain/Entities/PlayList.cs @@ -1,6 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Musify.Domain.ValueObjects; + namespace Musify.Domain.Entities { #pragma warning disable CS8618 diff --git a/Domain/Entities/Track.cs b/Domain/Entities/Track.cs index 182b56b..c569b5a 100644 --- a/Domain/Entities/Track.cs +++ b/Domain/Entities/Track.cs @@ -2,6 +2,8 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Diagnostics.CodeAnalysis; +using Musify.Domain.ValueObjects; + namespace Musify.Domain.Entities { #pragma warning disable CS8618 diff --git a/Domain/Entities/Upload.cs b/Domain/Entities/Upload.cs index 9e8c42b..1cb9cb7 100644 --- a/Domain/Entities/Upload.cs +++ b/Domain/Entities/Upload.cs @@ -1,6 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Musify.Domain.ValueObjects; + namespace Musify.Domain.Entities { [Table("Upload")] diff --git a/Domain/Entities/UploadIntent.cs b/Domain/Entities/UploadIntent.cs index 3502950..11a44f3 100644 --- a/Domain/Entities/UploadIntent.cs +++ b/Domain/Entities/UploadIntent.cs @@ -1,6 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Musify.Domain.ValueObjects; + namespace Musify.Domain.Entities { [Table("UploadIntents")] diff --git a/Domain/ValueObjects/LifeCycleStatus.cs b/Domain/ValueObjects/LifeCycleStatus.cs index bd4c7dc..bed197e 100644 --- a/Domain/ValueObjects/LifeCycleStatus.cs +++ b/Domain/ValueObjects/LifeCycleStatus.cs @@ -1,4 +1,4 @@ -namespace Musify.Domain.Entities +namespace Musify.Domain.ValueObjects { public enum LifeCycleStatus { diff --git a/Domain/ValueObjects/ProcessingStatus.cs b/Domain/ValueObjects/ProcessingStatus.cs index 583ac67..66aa32e 100644 --- a/Domain/ValueObjects/ProcessingStatus.cs +++ b/Domain/ValueObjects/ProcessingStatus.cs @@ -1,4 +1,4 @@ -namespace Musify.Domain.Entities +namespace Musify.Domain.ValueObjects { public enum ProcessingStatus { diff --git a/Domain/ValueObjects/UploadIntentPurpose.cs b/Domain/ValueObjects/UploadIntentPurpose.cs index f0a7f08..dc0339b 100644 --- a/Domain/ValueObjects/UploadIntentPurpose.cs +++ b/Domain/ValueObjects/UploadIntentPurpose.cs @@ -1,4 +1,4 @@ -namespace Musify.Domain.Entities +namespace Musify.Domain.ValueObjects { public enum UploadIntentPurpose { diff --git a/Domain/ValueObjects/UploadIntentStatus.cs b/Domain/ValueObjects/UploadIntentStatus.cs index be3956b..7a6e23f 100644 --- a/Domain/ValueObjects/UploadIntentStatus.cs +++ b/Domain/ValueObjects/UploadIntentStatus.cs @@ -1,4 +1,4 @@ -namespace Musify.Domain.Entities +namespace Musify.Domain.ValueObjects { public enum UploadIntentStatus { diff --git a/Domain/ValueObjects/UploadState.cs b/Domain/ValueObjects/UploadState.cs index 50a4dfc..5bcaf5b 100644 --- a/Domain/ValueObjects/UploadState.cs +++ b/Domain/ValueObjects/UploadState.cs @@ -1,4 +1,4 @@ -namespace Musify.Domain.Entities +namespace Musify.Domain.ValueObjects { public enum UploadState { diff --git a/Infrastructure/Jobs/TemporalUploadsCleanupJob.cs b/Infrastructure/Jobs/TemporalUploadsCleanupJob.cs index 24b71f4..d11924a 100644 --- a/Infrastructure/Jobs/TemporalUploadsCleanupJob.cs +++ b/Infrastructure/Jobs/TemporalUploadsCleanupJob.cs @@ -1,21 +1,21 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; +using Musify.Application.Contracts; namespace Musify.Infrastructure.Jobs { - public class TemporalUploadsCleanupJob( + public class TemporalUploadsCleanUpJob( IServiceScopeFactory scopeFactory, - ILogger logger, + ILogger logger, ApplicationStorageConfiguration storageConfiguration, UploadIntentConfiguration uploadIntentConfiguration) : BackgroundService { protected override async Task ExecuteAsync(CancellationToken stoppingToken) { - logger.LogInformation("TemporalUploadsCleanupJob started (interval: {Interval}s, prefix: {Prefix})", + logger.LogInformation("TemporalUploadsCleanUpJob started (interval: {Interval}s, prefix: {Prefix})", uploadIntentConfiguration.TempCleanupJobIntervalSeconds, uploadIntentConfiguration.TempRootPrefix); @@ -27,7 +27,7 @@ namespace Musify.Infrastructure.Jobs } catch (Exception exception) when (exception is not OperationCanceledException) { - logger.LogError(exception, "Error in TemporalUploadsCleanupJob"); + logger.LogError(exception, "Error in TemporalUploadsCleanUpJob"); } await Task.Delay(TimeSpan.FromSeconds(uploadIntentConfiguration.TempCleanupJobIntervalSeconds), stoppingToken); @@ -39,7 +39,7 @@ namespace Musify.Infrastructure.Jobs await using var scope = scopeFactory.CreateAsyncScope(); var storageService = scope.ServiceProvider.GetRequiredService(); - var cutoff = DateTime.UtcNow.AddDays(-uploadIntentConfiguration.TempUploadsRetentionDays); + var cutOff = DateTime.UtcNow.AddDays(-uploadIntentConfiguration.TempUploadsRetentionDays); var deleted = 0; var errors = 0; @@ -48,7 +48,7 @@ namespace Musify.Infrastructure.Jobs uploadIntentConfiguration.TempRootPrefix, cancellationToken)) { - if (lastModified >= cutoff) + if (lastModified >= cutOff) continue; try @@ -64,7 +64,7 @@ namespace Musify.Infrastructure.Jobs } if (deleted > 0 || errors > 0) - logger.LogInformation("TemporalUploadsCleanupJob: deleted {Deleted} orphaned objects, {Errors} errors", deleted, errors); + logger.LogInformation("TemporalUploadsCleanUpJob: deleted {Deleted} orphaned objects, {Errors} errors", deleted, errors); } } } diff --git a/Infrastructure/Jobs/UploadIntentExpirationJob.cs b/Infrastructure/Jobs/UploadIntentExpirationJob.cs index ce74e86..2f21219 100644 --- a/Infrastructure/Jobs/UploadIntentExpirationJob.cs +++ b/Infrastructure/Jobs/UploadIntentExpirationJob.cs @@ -2,9 +2,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; -using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; namespace Musify.Infrastructure.Jobs { diff --git a/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs b/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs index b53337f..b404528 100644 --- a/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs +++ b/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs @@ -1,9 +1,10 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Domain.Entities; -using Musify.Infrastructure.MassTransit.Activities.Arguments; +using Musify.Domain.ValueObjects; +using Musify.Infrastructure.MassTransit.Arguments; namespace Musify.Infrastructure.MassTransit.Activities { diff --git a/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs b/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs index 4766ae5..3e8f6a8 100644 --- a/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs +++ b/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs @@ -1,10 +1,11 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Domain.Entities; -using Musify.Infrastructure.MassTransit.Activities.Arguments; -using Musify.Infrastructure.MassTransit.Activities.Logs; +using Musify.Domain.ValueObjects; +using Musify.Infrastructure.MassTransit.Arguments; +using Musify.Infrastructure.MassTransit.Logs; namespace Musify.Infrastructure.MassTransit.Activities { diff --git a/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs b/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs index cf32e81..82d4d0b 100644 --- a/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs +++ b/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs @@ -1,8 +1,9 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Logs; diff --git a/Infrastructure/MassTransit/Activities/Files/CopyFileInBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/CopyFileInBucketActivity.cs index 52ce5a7..22e061a 100644 --- a/Infrastructure/MassTransit/Activities/Files/CopyFileInBucketActivity.cs +++ b/Infrastructure/MassTransit/Activities/Files/CopyFileInBucketActivity.cs @@ -1,6 +1,6 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Logs; diff --git a/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs index f7d7db8..53803cf 100644 --- a/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs +++ b/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs @@ -1,8 +1,8 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; -using Musify.Infrastructure.MassTransit.Activities.Arguments; -using Musify.Infrastructure.MassTransit.Activities.Logs; +using Musify.Application.Contracts; +using Musify.Infrastructure.MassTransit.Arguments; +using Musify.Infrastructure.MassTransit.Logs; namespace Musify.Infrastructure.MassTransit.Activities.Files { diff --git a/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs index 911baf9..b148c2b 100644 --- a/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs +++ b/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs @@ -1,9 +1,9 @@ using MassTransit; using Amazon.S3; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; -using Musify.Infrastructure.MassTransit.Activities.Arguments; +using Musify.Infrastructure.MassTransit.Arguments; using System.Net; +using Musify.Application.Contracts; namespace Musify.Infrastructure.MassTransit.Activities.Files { diff --git a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs index 5f6ceb8..8e1db84 100644 --- a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs +++ b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs @@ -1,8 +1,8 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; -using Musify.Infrastructure.MassTransit.Activities.Arguments; -using Musify.Infrastructure.MassTransit.Activities.Logs; +using Musify.Application.Contracts; +using Musify.Infrastructure.MassTransit.Arguments; +using Musify.Infrastructure.MassTransit.Logs; namespace Musify.Infrastructure.MassTransit.Activities { diff --git a/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs index d3e18b6..62961bc 100644 --- a/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs +++ b/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs @@ -1,6 +1,6 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Logs; diff --git a/Infrastructure/MassTransit/Activities/Pictures/GeneratePictureWorkflowPathsActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/GeneratePictureWorkflowPathsActivity.cs index be2f675..f7a0c83 100644 --- a/Infrastructure/MassTransit/Activities/Pictures/GeneratePictureWorkflowPathsActivity.cs +++ b/Infrastructure/MassTransit/Activities/Pictures/GeneratePictureWorkflowPathsActivity.cs @@ -1,6 +1,6 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Infrastructure.MassTransit.Activities.Arguments; +using Musify.Infrastructure.MassTransit.Arguments; namespace Musify.Infrastructure.MassTransit.Activities { diff --git a/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs index 941132b..193b100 100644 --- a/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs +++ b/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs @@ -1,8 +1,8 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; -using Musify.Infrastructure.MassTransit.Activities.Arguments; -using Musify.Infrastructure.MassTransit.Activities.Logs; +using Musify.Application.Contracts; +using Musify.Infrastructure.MassTransit.Arguments; +using Musify.Infrastructure.MassTransit.Logs; namespace Musify.Infrastructure.MassTransit.Activities { diff --git a/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs index c6df282..63dd568 100644 --- a/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs +++ b/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs @@ -1,8 +1,8 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; -using Musify.Infrastructure.MassTransit.Activities.Arguments; -using Musify.Infrastructure.MassTransit.Activities.Logs; +using Musify.Application.Contracts; +using Musify.Infrastructure.MassTransit.Arguments; +using Musify.Infrastructure.MassTransit.Logs; namespace Musify.Infrastructure.MassTransit.Activities { diff --git a/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs index 3c807b8..55e9150 100644 --- a/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs +++ b/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs @@ -1,8 +1,8 @@ using MassTransit; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; -using Musify.Infrastructure.MassTransit.Activities.Arguments; -using Musify.Infrastructure.MassTransit.Activities.Logs; +using Musify.Application.Contracts; +using Musify.Infrastructure.MassTransit.Arguments; +using Musify.Infrastructure.MassTransit.Logs; namespace Musify.Infrastructure.MassTransit.Activities { diff --git a/Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbActivity.cs b/Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbActivity.cs index 8cff6f7..ec77a49 100644 --- a/Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbActivity.cs +++ b/Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbActivity.cs @@ -1,7 +1,8 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; +using Musify.Infrastructure.MassTransit.Arguments; namespace Musify.Infrastructure.MassTransit.Activities.PlayLists { diff --git a/Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingActivity.cs b/Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingActivity.cs index 0f6084a..b68f23a 100644 --- a/Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingActivity.cs +++ b/Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingActivity.cs @@ -1,8 +1,10 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Infrastructure.MassTransit.Arguments; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; namespace Musify.Infrastructure.MassTransit.Activities.PlayLists { diff --git a/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbActivity.cs b/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbActivity.cs index 5e3cbf3..28e4c15 100644 --- a/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbActivity.cs +++ b/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbActivity.cs @@ -1,7 +1,8 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; +using Musify.Infrastructure.MassTransit.Arguments; namespace Musify.Infrastructure.MassTransit.Activities.Tracks { diff --git a/Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingActivity.cs b/Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingActivity.cs index 9f07a62..2256f42 100644 --- a/Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingActivity.cs +++ b/Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingActivity.cs @@ -1,8 +1,10 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Infrastructure.MassTransit.Arguments; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; +using Musify.Application.Contracts; namespace Musify.Infrastructure.MassTransit.Activities.Tracks { diff --git a/Infrastructure/MassTransit/Activities/UploadIntents/ConsumeUploadIntentsActivity.cs b/Infrastructure/MassTransit/Activities/UploadIntents/ConsumeUploadIntentsActivity.cs index 15cb3ef..2f33f2b 100644 --- a/Infrastructure/MassTransit/Activities/UploadIntents/ConsumeUploadIntentsActivity.cs +++ b/Infrastructure/MassTransit/Activities/UploadIntents/ConsumeUploadIntentsActivity.cs @@ -1,8 +1,9 @@ using MassTransit; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Logs; diff --git a/Infrastructure/MassTransit/Arguments/DeletePlayListFromDbArguments.cs b/Infrastructure/MassTransit/Arguments/DeletePlayListFromDbArguments.cs index 9890c26..b455ed9 100644 --- a/Infrastructure/MassTransit/Arguments/DeletePlayListFromDbArguments.cs +++ b/Infrastructure/MassTransit/Arguments/DeletePlayListFromDbArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.PlayLists +namespace Musify.Infrastructure.MassTransit.Arguments { internal record DeletePlayListFromDbArguments( Guid PlayListId); diff --git a/Infrastructure/MassTransit/Arguments/DeleteTrackFromDbArguments.cs b/Infrastructure/MassTransit/Arguments/DeleteTrackFromDbArguments.cs index be5b3ae..982e1ae 100644 --- a/Infrastructure/MassTransit/Arguments/DeleteTrackFromDbArguments.cs +++ b/Infrastructure/MassTransit/Arguments/DeleteTrackFromDbArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Tracks +namespace Musify.Infrastructure.MassTransit.Arguments { internal record DeleteTrackFromDbArguments( Guid TrackId); diff --git a/Infrastructure/MassTransit/Arguments/DownloadFileFromBucketArguments.cs b/Infrastructure/MassTransit/Arguments/DownloadFileFromBucketArguments.cs index 996306d..1579a91 100644 --- a/Infrastructure/MassTransit/Arguments/DownloadFileFromBucketArguments.cs +++ b/Infrastructure/MassTransit/Arguments/DownloadFileFromBucketArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record DownloadFileFromBucketArguments( string Bucket, diff --git a/Infrastructure/MassTransit/Arguments/GenerateAudioWorkflowPathsArguments.cs b/Infrastructure/MassTransit/Arguments/GenerateAudioWorkflowPathsArguments.cs index 2acd8f7..0786562 100644 --- a/Infrastructure/MassTransit/Arguments/GenerateAudioWorkflowPathsArguments.cs +++ b/Infrastructure/MassTransit/Arguments/GenerateAudioWorkflowPathsArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record GenerateAudioWorkflowPathsArguments( Guid TrackId, diff --git a/Infrastructure/MassTransit/Arguments/GeneratePictureWorkflowPathsArguments.cs b/Infrastructure/MassTransit/Arguments/GeneratePictureWorkflowPathsArguments.cs index e112a6d..330a3b8 100644 --- a/Infrastructure/MassTransit/Arguments/GeneratePictureWorkflowPathsArguments.cs +++ b/Infrastructure/MassTransit/Arguments/GeneratePictureWorkflowPathsArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record GeneratePictureWorkflowPathsArguments( string TemporaryRootDirectory, diff --git a/Infrastructure/MassTransit/Arguments/MarkPlayListAsRemovingArguments.cs b/Infrastructure/MassTransit/Arguments/MarkPlayListAsRemovingArguments.cs index fefbf99..8cd63f7 100644 --- a/Infrastructure/MassTransit/Arguments/MarkPlayListAsRemovingArguments.cs +++ b/Infrastructure/MassTransit/Arguments/MarkPlayListAsRemovingArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.PlayLists +namespace Musify.Infrastructure.MassTransit.Arguments { internal record MarkPlayListAsRemovingArguments( Guid PlayListId); diff --git a/Infrastructure/MassTransit/Arguments/MarkTrackAsRemovingArguments.cs b/Infrastructure/MassTransit/Arguments/MarkTrackAsRemovingArguments.cs index 70625ca..5731258 100644 --- a/Infrastructure/MassTransit/Arguments/MarkTrackAsRemovingArguments.cs +++ b/Infrastructure/MassTransit/Arguments/MarkTrackAsRemovingArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Tracks +namespace Musify.Infrastructure.MassTransit.Arguments { internal record MarkTrackAsRemovingArguments( Guid TrackId); diff --git a/Infrastructure/MassTransit/Arguments/PublishPlayListPictureProcessingEventArguments.cs b/Infrastructure/MassTransit/Arguments/PublishPlayListPictureProcessingEventArguments.cs index 2b402ca..d3d6689 100644 --- a/Infrastructure/MassTransit/Arguments/PublishPlayListPictureProcessingEventArguments.cs +++ b/Infrastructure/MassTransit/Arguments/PublishPlayListPictureProcessingEventArguments.cs @@ -1,3 +1,4 @@ +using Musify.Application.Common; using Musify.Application.Events; namespace Musify.Infrastructure.MassTransit.Arguments diff --git a/Infrastructure/MassTransit/Arguments/PublishTrackProcessingEventsArguments.cs b/Infrastructure/MassTransit/Arguments/PublishTrackProcessingEventsArguments.cs index aebba17..6d4926f 100644 --- a/Infrastructure/MassTransit/Arguments/PublishTrackProcessingEventsArguments.cs +++ b/Infrastructure/MassTransit/Arguments/PublishTrackProcessingEventsArguments.cs @@ -1,3 +1,4 @@ +using Musify.Application.Common; using Musify.Application.Events; namespace Musify.Infrastructure.MassTransit.Arguments diff --git a/Infrastructure/MassTransit/Arguments/RemoveFileFromBucketArguments.cs b/Infrastructure/MassTransit/Arguments/RemoveFileFromBucketArguments.cs index ca2bb1c..5f3e499 100644 --- a/Infrastructure/MassTransit/Arguments/RemoveFileFromBucketArguments.cs +++ b/Infrastructure/MassTransit/Arguments/RemoveFileFromBucketArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record RemoveFileFromBucketArguments( string Bucket, diff --git a/Infrastructure/MassTransit/Arguments/ResizePictureLocalArguments.cs b/Infrastructure/MassTransit/Arguments/ResizePictureLocalArguments.cs index 633d34e..022fc7c 100644 --- a/Infrastructure/MassTransit/Arguments/ResizePictureLocalArguments.cs +++ b/Infrastructure/MassTransit/Arguments/ResizePictureLocalArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record ResizePictureLocalArguments( string SourceFilePathVariable, diff --git a/Infrastructure/MassTransit/Arguments/TranscodeDashAudioArguments.cs b/Infrastructure/MassTransit/Arguments/TranscodeDashAudioArguments.cs index 379a14c..08f0cef 100644 --- a/Infrastructure/MassTransit/Arguments/TranscodeDashAudioArguments.cs +++ b/Infrastructure/MassTransit/Arguments/TranscodeDashAudioArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record TranscodeDashAudioArguments( Guid TrackId, diff --git a/Infrastructure/MassTransit/Arguments/TransferFilesToBucketArguments.cs b/Infrastructure/MassTransit/Arguments/TransferFilesToBucketArguments.cs index d8b9313..48f804d 100644 --- a/Infrastructure/MassTransit/Arguments/TransferFilesToBucketArguments.cs +++ b/Infrastructure/MassTransit/Arguments/TransferFilesToBucketArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record TransferFilesToBucketArguments( string DestinationBucket, diff --git a/Infrastructure/MassTransit/Arguments/UpdatePlayListPictureArguments.cs b/Infrastructure/MassTransit/Arguments/UpdatePlayListPictureArguments.cs index d47d31f..bb05ee6 100644 --- a/Infrastructure/MassTransit/Arguments/UpdatePlayListPictureArguments.cs +++ b/Infrastructure/MassTransit/Arguments/UpdatePlayListPictureArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record UpdatePlayListPictureArguments( Guid PlayListId, diff --git a/Infrastructure/MassTransit/Arguments/UpdateTrackPictureArguments.cs b/Infrastructure/MassTransit/Arguments/UpdateTrackPictureArguments.cs index 005c260..0c48ac3 100644 --- a/Infrastructure/MassTransit/Arguments/UpdateTrackPictureArguments.cs +++ b/Infrastructure/MassTransit/Arguments/UpdateTrackPictureArguments.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Arguments +namespace Musify.Infrastructure.MassTransit.Arguments { public record UpdateTrackPictureArguments( Guid TrackId, diff --git a/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.Registration.cs b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.Registration.cs index 438b5e6..c700164 100644 --- a/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.Registration.cs +++ b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.Registration.cs @@ -2,10 +2,8 @@ using MassTransit; using Microsoft.Extensions.DependencyInjection; using Musify.Infrastructure.Configuration; using Musify.Infrastructure.MassTransit.Activities; -using Musify.Infrastructure.MassTransit.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Audio; using Musify.Infrastructure.MassTransit.Activities.Files; -using Musify.Infrastructure.MassTransit.Activities.Logs; using Musify.Infrastructure.MassTransit.Activities.PlayLists; using Musify.Infrastructure.MassTransit.Activities.Tracks; using Musify.Infrastructure.MassTransit.Activities.UploadIntents; diff --git a/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs index 1c497ce..684a9f6 100644 --- a/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs +++ b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs @@ -1,7 +1,7 @@ using MassTransit; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Infrastructure.Configuration; using Musify.Infrastructure.Persistence; diff --git a/Infrastructure/MassTransit/Logs/DownloadFileFromBucketLog.cs b/Infrastructure/MassTransit/Logs/DownloadFileFromBucketLog.cs index b46f9a5..bb00b6e 100644 --- a/Infrastructure/MassTransit/Logs/DownloadFileFromBucketLog.cs +++ b/Infrastructure/MassTransit/Logs/DownloadFileFromBucketLog.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Logs +namespace Musify.Infrastructure.MassTransit.Logs { public record DownloadFileFromBucketLog( string Bucket, diff --git a/Infrastructure/MassTransit/Logs/GeneratePictureWorkflowPathsLog.cs b/Infrastructure/MassTransit/Logs/GeneratePictureWorkflowPathsLog.cs index 7c23cba..9a9c223 100644 --- a/Infrastructure/MassTransit/Logs/GeneratePictureWorkflowPathsLog.cs +++ b/Infrastructure/MassTransit/Logs/GeneratePictureWorkflowPathsLog.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Logs +namespace Musify.Infrastructure.MassTransit.Logs { public record GeneratePictureWorkflowPathsLog(string WorkingDirectory); } diff --git a/Infrastructure/MassTransit/Logs/ResizePictureLog.cs b/Infrastructure/MassTransit/Logs/ResizePictureLog.cs index bfd59a0..f255d51 100644 --- a/Infrastructure/MassTransit/Logs/ResizePictureLog.cs +++ b/Infrastructure/MassTransit/Logs/ResizePictureLog.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Logs +namespace Musify.Infrastructure.MassTransit.Logs { public record ResizePictureLog(string DestinationFilePath); } diff --git a/Infrastructure/MassTransit/Logs/TranscodeDashAudioLog.cs b/Infrastructure/MassTransit/Logs/TranscodeDashAudioLog.cs index 038ec0b..05c6a9f 100644 --- a/Infrastructure/MassTransit/Logs/TranscodeDashAudioLog.cs +++ b/Infrastructure/MassTransit/Logs/TranscodeDashAudioLog.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Logs +namespace Musify.Infrastructure.MassTransit.Logs { public record TranscodeDashAudioLog(string WorkingDirectory); } \ No newline at end of file diff --git a/Infrastructure/MassTransit/Logs/TransferFilesToBucketLog.cs b/Infrastructure/MassTransit/Logs/TransferFilesToBucketLog.cs index 6eeee6c..5db2002 100644 --- a/Infrastructure/MassTransit/Logs/TransferFilesToBucketLog.cs +++ b/Infrastructure/MassTransit/Logs/TransferFilesToBucketLog.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Logs +namespace Musify.Infrastructure.MassTransit.Logs { public record TransferFilesToBucketLog(string DestinationBucket, string[] UploadedKeys); } diff --git a/Infrastructure/MassTransit/Logs/UpdatePlayListPictureLog.cs b/Infrastructure/MassTransit/Logs/UpdatePlayListPictureLog.cs index 069442f..8135ec8 100644 --- a/Infrastructure/MassTransit/Logs/UpdatePlayListPictureLog.cs +++ b/Infrastructure/MassTransit/Logs/UpdatePlayListPictureLog.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Logs +namespace Musify.Infrastructure.MassTransit.Logs { public record UpdatePlayListPictureLog( Guid PlayListId, diff --git a/Infrastructure/MassTransit/Logs/UpdateTrackPictureLog.cs b/Infrastructure/MassTransit/Logs/UpdateTrackPictureLog.cs index c6e7387..a634c2f 100644 --- a/Infrastructure/MassTransit/Logs/UpdateTrackPictureLog.cs +++ b/Infrastructure/MassTransit/Logs/UpdateTrackPictureLog.cs @@ -1,4 +1,4 @@ -namespace Musify.Infrastructure.MassTransit.Activities.Logs +namespace Musify.Infrastructure.MassTransit.Logs { public record UpdateTrackPictureLog( Guid TrackId, diff --git a/Infrastructure/MassTransit/MassTransitEventBus.cs b/Infrastructure/MassTransit/MassTransitEventBus.cs index 23f69de..beaea4f 100644 --- a/Infrastructure/MassTransit/MassTransitEventBus.cs +++ b/Infrastructure/MassTransit/MassTransitEventBus.cs @@ -1,5 +1,5 @@ using MassTransit; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; namespace Musify.Infrastructure.MassTransit { diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs index b5713b3..d186353 100644 --- a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs +++ b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs @@ -4,10 +4,9 @@ using Musify.Application.Events; using Musify.Infrastructure.Configuration; using Musify.Infrastructure.MassTransit.Activities.Audio; using Musify.Infrastructure.MassTransit.Activities.Files; +using Musify.Infrastructure.MassTransit.Activities; using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Consumers; -using Musify.Infrastructure.MassTransit.Activities; -using Musify.Infrastructure.MassTransit.Activities.Arguments; namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders { diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs index 1d6efa8..efe4837 100644 --- a/Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs +++ b/Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs @@ -1,12 +1,12 @@ using MassTransit; using MassTransit.Courier.Contracts; using Microsoft.EntityFrameworkCore; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; using Musify.Infrastructure.MassTransit.Activities.Files; -using Musify.Infrastructure.MassTransit.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.PlayLists; +using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Consumers; +using Musify.Application.Contracts; namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders { diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/DeleteTrackRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/DeleteTrackRoutingSlipBuilder.cs index eb2e944..f6ed175 100644 --- a/Infrastructure/MassTransit/RoutingSlip/Builders/DeleteTrackRoutingSlipBuilder.cs +++ b/Infrastructure/MassTransit/RoutingSlip/Builders/DeleteTrackRoutingSlipBuilder.cs @@ -1,12 +1,12 @@ using MassTransit; using MassTransit.Courier.Contracts; using Microsoft.EntityFrameworkCore; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; -using Musify.Infrastructure.MassTransit.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Files; using Musify.Infrastructure.MassTransit.Activities.Tracks; +using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Consumers; +using Musify.Application.Contracts; namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders { diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs index fec9322..712298e 100644 --- a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs +++ b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs @@ -1,9 +1,9 @@ using MassTransit; using MassTransit.Courier.Contracts; +using Musify.Application.Common; using Musify.Application.Events; using Musify.Infrastructure.Configuration; using Musify.Infrastructure.MassTransit.Activities; -using Musify.Infrastructure.MassTransit.Activities.Arguments; using Musify.Infrastructure.MassTransit.Activities.Files; using Musify.Infrastructure.MassTransit.Arguments; using Musify.Infrastructure.MassTransit.Consumers; diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/PlayListPictureSourceRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/PlayListPictureSourceRoutingSlipBuilder.cs index 80cf5c2..7e186c9 100644 --- a/Infrastructure/MassTransit/RoutingSlip/Builders/PlayListPictureSourceRoutingSlipBuilder.cs +++ b/Infrastructure/MassTransit/RoutingSlip/Builders/PlayListPictureSourceRoutingSlipBuilder.cs @@ -1,5 +1,6 @@ using MassTransit; using MassTransit.Courier.Contracts; +using Musify.Application.Common; using Musify.Application.Events; using Musify.Infrastructure.MassTransit.Activities.Files; using Musify.Infrastructure.MassTransit.Activities.PlayLists; diff --git a/Infrastructure/Persistence/Database.cs b/Infrastructure/Persistence/Database.cs index f74cf4f..98f1ea1 100644 --- a/Infrastructure/Persistence/Database.cs +++ b/Infrastructure/Persistence/Database.cs @@ -1,10 +1,10 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; using MassTransit; -using Musify.Application.Contracts.Infrastructure; using Musify.Domain.Entities; using Musify.Infrastructure.Configuration; -using AppIDatabase = Musify.Application.Contracts.Infrastructure.IDatabase; +using AppIDatabase = Musify.Application.Contracts.IDatabase; +using Musify.Application.Contracts; namespace Musify.Infrastructure.Persistence { diff --git a/Infrastructure/Persistence/DatabaseDependencyInjection.cs b/Infrastructure/Persistence/DatabaseDependencyInjection.cs index a5eb939..6d3a9d9 100644 --- a/Infrastructure/Persistence/DatabaseDependencyInjection.cs +++ b/Infrastructure/Persistence/DatabaseDependencyInjection.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Infrastructure.Configuration; namespace Musify.Infrastructure.Persistence diff --git a/Infrastructure/Services/AudioTranscoderService.cs b/Infrastructure/Services/AudioTranscoderService.cs index 1bec040..805f4fc 100644 --- a/Infrastructure/Services/AudioTranscoderService.cs +++ b/Infrastructure/Services/AudioTranscoderService.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Infrastructure.Configuration; using System.Diagnostics; diff --git a/Infrastructure/Services/PictureService.cs b/Infrastructure/Services/PictureService.cs index f50f9ba..4237519 100644 --- a/Infrastructure/Services/PictureService.cs +++ b/Infrastructure/Services/PictureService.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Logging; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using SixLabors.ImageSharp; using SixLabors.ImageSharp.Processing; diff --git a/Infrastructure/Services/ServicesDependencyInjection.cs b/Infrastructure/Services/ServicesDependencyInjection.cs index af6ed83..36d9b5c 100644 --- a/Infrastructure/Services/ServicesDependencyInjection.cs +++ b/Infrastructure/Services/ServicesDependencyInjection.cs @@ -2,11 +2,11 @@ using Amazon.S3; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Musify.Application.Contracts.Infrastructure; using Musify.Application.Configuration; using Musify.Infrastructure.Configuration; using Musify.Infrastructure.Jobs; using Musify.Application.Services; +using Musify.Application.Contracts; namespace Musify.Infrastructure.Services { @@ -66,7 +66,7 @@ namespace Musify.Infrastructure.Services serviceDescriptors.AddUploadIntentConfiguration(configuration); serviceDescriptors.AddHostedService(); - serviceDescriptors.AddHostedService(); + serviceDescriptors.AddHostedService(); return serviceDescriptors; } diff --git a/Infrastructure/Services/StorageService.cs b/Infrastructure/Services/StorageService.cs index 757499c..7f11820 100644 --- a/Infrastructure/Services/StorageService.cs +++ b/Infrastructure/Services/StorageService.cs @@ -3,10 +3,11 @@ using Amazon.S3.Model; using Amazon.S3.Transfer; using Microsoft.Extensions.Logging; using MimeMapping; -using Musify.Application.Contracts.Infrastructure; +using Musify.Application.Contracts; using Musify.Domain.Entities; +using Musify.Domain.ValueObjects; using Musify.Infrastructure.Configuration; -using ObjectMetadata = Musify.Application.Contracts.Infrastructure.ObjectMetadata; +using ObjectMetaData = Musify.Application.Contracts.ObjectMetaData; namespace Musify.Infrastructure.Services { @@ -70,12 +71,12 @@ namespace Musify.Infrastructure.Services return await amazonS3.GetPreSignedURLAsync(request); } - public async Task HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken) + public async Task HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken) { try { var response = await amazonS3.GetObjectMetadataAsync(bucket, key, cancellationToken); - return new ObjectMetadata(response.Headers.ContentType, response.ContentLength); + return new ObjectMetaData(response.Headers.ContentType, response.ContentLength); } catch (AmazonS3Exception ex) when (ex.StatusCode == System.Net.HttpStatusCode.NotFound) {