From bf23224a51f5d5b3fbaa9344ab54f67f5a05d011 Mon Sep 17 00:00:00 2001 From: XShine555 Date: Tue, 24 Mar 2026 19:47:32 +0100 Subject: [PATCH] Renames and migrations --- Infrastructure/Infrastructure.csproj | 2 - .../Files/RemoveFileFromBucketActivity.cs | 2 +- ...et.cs => TransferFilesToBucketActivity.cs} | 6 +- .../MessagingDependencyInjection.cs | 6 +- .../AudioWorkflowRoutingSlipBuilder.cs | 2 +- .../PictureWorkflowRoutingSlipBuilder.cs | 2 +- .../20260322023145_FirstMigration.Designer.cs | 382 ------------------ ...riginalPictureKeyNameToTrackAndPlayList.cs | 42 -- ...20260324183733_FirstMigration.Designer.cs} | 4 +- ...on.cs => 20260324183733_FirstMigration.cs} | 2 + 10 files changed, 13 insertions(+), 437 deletions(-) rename Infrastructure/MassTransit/Activities/Files/{TransferFilesToBucket.cs => TransferFilesToBucketActivity.cs} (96%) delete mode 100644 Infrastructure/Persistence/Migrations/20260322023145_FirstMigration.Designer.cs delete mode 100644 Infrastructure/Persistence/Migrations/20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.cs rename Infrastructure/Persistence/Migrations/{20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.Designer.cs => 20260324183733_FirstMigration.Designer.cs} (99%) rename Infrastructure/Persistence/Migrations/{20260322023145_FirstMigration.cs => 20260324183733_FirstMigration.cs} (97%) diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj index 61aa300..e59fe3f 100644 --- a/Infrastructure/Infrastructure.csproj +++ b/Infrastructure/Infrastructure.csproj @@ -38,10 +38,8 @@ - - diff --git a/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs index 28ff4f4..82a5f8b 100644 --- a/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs +++ b/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs @@ -12,7 +12,7 @@ namespace Musify.Infrastructure.Messaging.Activities IProcessTrackingStore processTrackingStore) : IExecuteActivity { - public const string ExecuteEndpointName = "Remove-File"; + public const string ExecuteEndpointName = "Remove-File-From-Bucket"; public async Task Execute(ExecuteContext executeContext) { diff --git a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucket.cs b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs similarity index 96% rename from Infrastructure/MassTransit/Activities/Files/TransferFilesToBucket.cs rename to Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs index 4fb8380..8ee6c9d 100644 --- a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucket.cs +++ b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs @@ -7,9 +7,9 @@ using Musify.Infrastructure.Messaging.Activities.Logs; namespace Musify.Infrastructure.Messaging.Activities { - public class TransferFilesToBucket( + public class TransferFilesToBucketActivity( IStorageHandler storageHandler, - ILogger logger, + ILogger logger, IProcessTrackingStore processTrackingStore) : IActivity { @@ -26,7 +26,7 @@ namespace Musify.Infrastructure.Messaging.Activities var stepId = await processTrackingStore.StartStepAsync( processId, - nameof(TransferFilesToBucket), + nameof(TransferFilesToBucketActivity), ProcessStepComponentType.Activity, 0, executeContext.CancellationToken); diff --git a/Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs b/Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs index 4879893..1fff97a 100644 --- a/Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs +++ b/Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs @@ -47,7 +47,7 @@ namespace Musify.Infrastructure.Messaging options.AddActivity(); options.AddActivity(); options.AddActivity(); - options.AddActivity(); + options.AddActivity(); options.UsingRabbitMq((busRegistrationContext, busFactoryConfigurator) => { @@ -117,10 +117,10 @@ namespace Musify.Infrastructure.Messaging busRegistrationContext, TranscodeDashAudioActivity.ExecuteEndpointName); - ConfigureActivityEndpoint( + ConfigureActivityEndpoint( busFactoryConfigurator, busRegistrationContext, - TransferFilesToBucket.ExecuteEndpointName); + TransferFilesToBucketActivity.ExecuteEndpointName); } ); } ); diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs index 5ca26af..b3cf18a 100644 --- a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs +++ b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs @@ -39,7 +39,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders routingSlipBuilder.AddActivity( ActivityNames.UploadFiles, - MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName), + MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucketActivity.ExecuteEndpointName), new TransferFilesToBucketArguments( message.DestinationBucketName, RoutingSlipVariableNames.Audio.TranscodedDirectory, diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs index 9334473..95d7b5c 100644 --- a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs +++ b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs @@ -131,7 +131,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders routingSlipBuilder.AddActivity( ActivityNames.UploadFiles, - MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName), + MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucketActivity.ExecuteEndpointName), new TransferFilesToBucketArguments( sourceBucketName, RoutingSlipVariableNames.Workflow.TempDirectory, diff --git a/Infrastructure/Persistence/Migrations/20260322023145_FirstMigration.Designer.cs b/Infrastructure/Persistence/Migrations/20260322023145_FirstMigration.Designer.cs deleted file mode 100644 index da7a421..0000000 --- a/Infrastructure/Persistence/Migrations/20260322023145_FirstMigration.Designer.cs +++ /dev/null @@ -1,382 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Musify.Infrastructure.Persistence; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -#nullable disable - -namespace Musify.Infrastructure.Persistence.Migrations -{ - [DbContext(typeof(Database))] - [Migration("20260322023145_FirstMigration")] - partial class FirstMigration - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "10.0.5") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("Musify.Domain.Entities.PlayList", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("CreatedDate") - .HasColumnType("timestamp with time zone"); - - b.Property("Description") - .IsRequired() - .HasMaxLength(254) - .HasColumnType("character varying(254)"); - - b.Property("LargePictureKeyName") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("character varying(64)"); - - b.Property("MediumPictureKeyName") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("character varying(64)"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("character varying(50)"); - - b.Property("NormalizedName") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("character varying(50)"); - - b.Property("SmallPictureKeyName") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("character varying(64)"); - - b.Property("UpdatedDate") - .HasColumnType("timestamp with time zone"); - - b.Property("UserId") - .HasColumnType("uuid"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("PlayLists"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.PlayListHasTrack", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("AddedAt") - .HasColumnType("timestamp with time zone"); - - b.Property("PlayListId") - .HasColumnType("uuid"); - - b.Property("Position") - .HasColumnType("integer"); - - b.Property("TrackId") - .HasColumnType("uuid"); - - b.HasKey("Id"); - - b.HasIndex("PlayListId"); - - b.HasIndex("TrackId"); - - b.ToTable("PlayListHasTrack"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.ProcessExecution", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("ConversationId") - .HasColumnType("uuid"); - - b.Property("CorrelationId") - .HasColumnType("uuid"); - - b.Property("ErrorMessage") - .HasMaxLength(2048) - .HasColumnType("character varying(2048)"); - - b.Property("FinishedDateTime") - .HasColumnType("timestamp with time zone"); - - b.Property("MessageId") - .HasColumnType("uuid"); - - b.Property("ProcessName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.Property("StartedDateTime") - .HasColumnType("timestamp with time zone"); - - b.Property("Status") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("CorrelationId", "ProcessName"); - - b.ToTable("ProcessExecution"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.ProcessStepExecution", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("Attempt") - .HasColumnType("integer"); - - b.Property("ComponentType") - .HasColumnType("integer"); - - b.Property("ErrorMessage") - .HasMaxLength(2048) - .HasColumnType("character varying(2048)"); - - b.Property("FinishedDateTime") - .HasColumnType("timestamp with time zone"); - - b.Property("ProcessExecutionId") - .HasColumnType("uuid"); - - b.Property("StartedDateTime") - .HasColumnType("timestamp with time zone"); - - b.Property("Status") - .HasColumnType("integer"); - - b.Property("StepName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.HasKey("Id"); - - b.HasIndex("ProcessExecutionId", "StepName"); - - b.ToTable("ProcessStepExecution"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.Track", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("CreatedDate") - .HasColumnType("timestamp with time zone"); - - b.Property("LargePictureKeyName") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("character varying(64)"); - - b.Property("MediumPictureKeyName") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("character varying(64)"); - - b.Property("NormalizedTitle") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("character varying(50)"); - - b.Property("SmallPictureKeyName") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("character varying(64)"); - - b.Property("Title") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("character varying(50)"); - - b.Property("UpdatedDate") - .HasColumnType("timestamp with time zone"); - - b.HasKey("Id"); - - b.ToTable("Tracks"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.Upload", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("BucketName") - .IsRequired() - .HasColumnType("text"); - - b.Property("ContentType") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreatedTime") - .HasColumnType("timestamp with time zone"); - - b.Property("KeyName") - .IsRequired() - .HasColumnType("text"); - - b.Property("State") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.ToTable("Upload"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("CreatedAt") - .HasColumnType("timestamp with time zone"); - - b.Property("UpdatedAt") - .HasColumnType("timestamp with time zone"); - - b.HasKey("Id"); - - b.ToTable("User"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.UserHasTrack", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("TrackId") - .HasColumnType("uuid"); - - b.Property("UserId") - .HasColumnType("uuid"); - - b.HasKey("Id"); - - b.HasIndex("TrackId"); - - b.HasIndex("UserId"); - - b.ToTable("UserHasTrack"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.PlayList", b => - { - b.HasOne("Musify.Domain.Entities.User", "User") - .WithMany("PlayLists") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("User"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.PlayListHasTrack", b => - { - b.HasOne("Musify.Domain.Entities.PlayList", "PlayList") - .WithMany("PlayListTracks") - .HasForeignKey("PlayListId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Musify.Domain.Entities.Track", "Track") - .WithMany("PlayListTracks") - .HasForeignKey("TrackId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("PlayList"); - - b.Navigation("Track"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.ProcessStepExecution", b => - { - b.HasOne("Musify.Domain.Entities.ProcessExecution", "ProcessExecution") - .WithMany("Steps") - .HasForeignKey("ProcessExecutionId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("ProcessExecution"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.UserHasTrack", b => - { - b.HasOne("Musify.Domain.Entities.Track", "Track") - .WithMany("UserTracks") - .HasForeignKey("TrackId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Musify.Domain.Entities.User", "User") - .WithMany("UserTracks") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Track"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.PlayList", b => - { - b.Navigation("PlayListTracks"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.ProcessExecution", b => - { - b.Navigation("Steps"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.Track", b => - { - b.Navigation("PlayListTracks"); - - b.Navigation("UserTracks"); - }); - - modelBuilder.Entity("Musify.Domain.Entities.User", b => - { - b.Navigation("PlayLists"); - - b.Navigation("UserTracks"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Infrastructure/Persistence/Migrations/20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.cs b/Infrastructure/Persistence/Migrations/20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.cs deleted file mode 100644 index 983bcd9..0000000 --- a/Infrastructure/Persistence/Migrations/20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Musify.Infrastructure.Persistence.Migrations -{ - /// - public partial class AddOriginalPictureKeyNameToTrackAndPlayList : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "OriginalPictureKeyName", - table: "Tracks", - type: "character varying(64)", - maxLength: 64, - nullable: false, - defaultValue: ""); - - migrationBuilder.AddColumn( - name: "OriginalPictureKeyName", - table: "PlayLists", - type: "character varying(64)", - maxLength: 64, - nullable: false, - defaultValue: ""); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "OriginalPictureKeyName", - table: "Tracks"); - - migrationBuilder.DropColumn( - name: "OriginalPictureKeyName", - table: "PlayLists"); - } - } -} diff --git a/Infrastructure/Persistence/Migrations/20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.Designer.cs b/Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.Designer.cs similarity index 99% rename from Infrastructure/Persistence/Migrations/20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.Designer.cs rename to Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.Designer.cs index 34c7024..3eea4a7 100644 --- a/Infrastructure/Persistence/Migrations/20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList.Designer.cs +++ b/Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.Designer.cs @@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace Musify.Infrastructure.Persistence.Migrations { [DbContext(typeof(Database))] - [Migration("20260323233603_AddOriginalPictureKeyNameToTrackAndPlayList")] - partial class AddOriginalPictureKeyNameToTrackAndPlayList + [Migration("20260324183733_FirstMigration")] + partial class FirstMigration { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/Infrastructure/Persistence/Migrations/20260322023145_FirstMigration.cs b/Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.cs similarity index 97% rename from Infrastructure/Persistence/Migrations/20260322023145_FirstMigration.cs rename to Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.cs index e32ecc2..43e95a3 100644 --- a/Infrastructure/Persistence/Migrations/20260322023145_FirstMigration.cs +++ b/Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.cs @@ -37,6 +37,7 @@ namespace Musify.Infrastructure.Persistence.Migrations Id = table.Column(type: "uuid", nullable: false), Title = table.Column(type: "character varying(50)", maxLength: 50, nullable: false), NormalizedTitle = table.Column(type: "character varying(50)", maxLength: 50, nullable: false), + OriginalPictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false), SmallPictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false), MediumPictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false), LargePictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false), @@ -111,6 +112,7 @@ namespace Musify.Infrastructure.Persistence.Migrations Name = table.Column(type: "character varying(50)", maxLength: 50, nullable: false), NormalizedName = table.Column(type: "character varying(50)", maxLength: 50, nullable: false), Description = table.Column(type: "character varying(254)", maxLength: 254, nullable: false), + OriginalPictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false), SmallPictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false), MediumPictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false), LargePictureKeyName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false),