From b01c932a6d17142073fddaef71be4d8418abd8db Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Fri, 26 Nov 2021 12:10:46 -0600 Subject: [PATCH] =?UTF-8?q?refactor(dir):=20=E2=99=BB=20convert=20all=20su?= =?UTF-8?q?rrogate=20keys=20to=20longs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CreateList.cs | 2 +- .../Queries/GetChanges.cs | 23 +++++++------------ .../ChangeTypeConfiguration.cs | 2 +- .../FilterListChangeTypeConfiguration.cs | 2 +- .../FilterListTypeConfiguration.cs | 2 +- .../FilterListViewUrlTypeConfiguration.cs | 2 +- .../LicenseTypeConfiguration.cs | 2 +- .../Persistence/Queries/Entities/Change.cs | 20 +++++++--------- 8 files changed, 22 insertions(+), 33 deletions(-) diff --git a/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs b/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs index 772d82ccc..f3a797f36 100644 --- a/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs +++ b/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs @@ -12,7 +12,7 @@ public static class CreateList public record Command(string Name, IEnumerable ViewUrls, string? Description = default, - int? LicenseId = default, + long? LicenseId = default, Uri? HomeUrl = default, Uri? OnionUrl = default, Uri? PolicyUrl = default, diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetChanges.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetChanges.cs index a5c3e293e..b83a4f175 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetChanges.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetChanges.cs @@ -44,7 +44,7 @@ public ChangesVmProfile() public record ChangesVm { - public int Id { get; private init; } + public long Id { get; private init; } public string? Reason { get; private init; } public DateTime SubmittedAt { get; private init; } public DateTime? ApprovedAt { get; private init; } @@ -53,19 +53,12 @@ public record ChangesVm public JsonDocument? Before { get; private init; } public JsonDocument? After { get; private init; } public AggregateType AggregateType { get; private init; } - public int? FilterListId { get; private init; } - public FilterList? FilterList { get; } - public string? LanguageIso6391 { get; private init; } - public Language? Language { get; } - public int? LicenseId { get; private init; } - public License? License { get; } - public int? MaintainerId { get; private init; } - public Maintainer? Maintainer { get; } - public int? SoftwareId { get; private init; } - public Software? Software { get; } - public int? SyntaxId { get; private init; } - public Syntax? Syntax { get; } - public int? TagId { get; private init; } - public Tag? Tag { get; } + public long? FilterListId { get; private init; } + public long? LanguageId { get; private init; } + public long? LicenseId { get; private init; } + public long? MaintainerId { get; private init; } + public long? SoftwareId { get; private init; } + public long? SyntaxId { get; private init; } + public long? TagId { get; private init; } } } diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/ChangeTypeConfiguration.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/ChangeTypeConfiguration.cs index 87ca3bea4..bff1b0a02 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/ChangeTypeConfiguration.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/ChangeTypeConfiguration.cs @@ -17,6 +17,6 @@ public virtual void Configure(EntityTypeBuilder builder) builder.ToTable($"{nr.RewriteName(nameof(Change))}s"); builder.HasDiscriminator(nr.RewriteName(nameof(Queries.Entities.Change.AggregateType))) .HasValue(AggregateType.FilterList); - builder.Property(nameof(Queries.Entities.Change.Id)); + builder.Property(nameof(Queries.Entities.Change.Id)); } } diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListChangeTypeConfiguration.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListChangeTypeConfiguration.cs index 6ac477c5e..c7aee2a1b 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListChangeTypeConfiguration.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListChangeTypeConfiguration.cs @@ -9,7 +9,7 @@ internal class FilterListChangeTypeConfiguration : IEntityTypeConfiguration builder) { - builder.Property(nameof(Change.FilterListId)); + builder.Property(nameof(Change.FilterListId)); builder.Property(c => c.Before) .HasColumnType("jsonb"); builder.Property(c => c.After) diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListTypeConfiguration.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListTypeConfiguration.cs index d25e5df71..7bb158279 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListTypeConfiguration.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListTypeConfiguration.cs @@ -9,7 +9,7 @@ internal class FilterListTypeConfiguration : IEntityTypeConfiguration builder) { - builder.Property(nameof(Queries.Entities.FilterList.Id)); + builder.Property(nameof(Queries.Entities.FilterList.Id)); builder.HasMany(c => c.Changes) .WithOne() .HasForeignKey(nameof(Change.FilterListId)); diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListViewUrlTypeConfiguration.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListViewUrlTypeConfiguration.cs index 1ba97b8cd..f727252aa 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListViewUrlTypeConfiguration.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/FilterListViewUrlTypeConfiguration.cs @@ -14,6 +14,6 @@ public virtual void Configure(EntityTypeBuilder builder) var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture); builder.ToTable($"{nr.RewriteName(nameof(Queries.Entities.FilterListViewUrl))}s"); - builder.Property(nameof(Queries.Entities.FilterListViewUrl.Id)); + builder.Property(nameof(Queries.Entities.FilterListViewUrl.Id)); } } diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/LicenseTypeConfiguration.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/LicenseTypeConfiguration.cs index ddff32b36..7643865bb 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/LicenseTypeConfiguration.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/EntityTypeConfigurations/LicenseTypeConfiguration.cs @@ -8,6 +8,6 @@ internal class LicenseTypeConfiguration : IEntityTypeConfiguration { public virtual void Configure(EntityTypeBuilder builder) { - builder.Property(nameof(Queries.Entities.License.Id)); + builder.Property(nameof(Queries.Entities.License.Id)); } } diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Change.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Change.cs index 87514156f..696ac5126 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Change.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Change.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; public record Change { - public int Id { get; private init; } + public long Id { get; private init; } public string? Reason { get; private init; } public DateTime SubmittedAt { get; private init; } public DateTime? ApprovedAt { get; private init; } @@ -16,19 +16,19 @@ public record Change public JsonDocument? Before { get; private init; } public JsonDocument? After { get; private init; } public AggregateType AggregateType { get; private init; } - public int? FilterListId { get; private init; } + public long? FilterListId { get; private init; } public FilterList? FilterList { get; } - public string? LanguageIso6391 { get; private init; } + public long? LanguageId { get; private init; } public Language? Language { get; } - public int? LicenseId { get; private init; } + public long? LicenseId { get; private init; } public License? License { get; } - public int? MaintainerId { get; private init; } + public long? MaintainerId { get; private init; } public Maintainer? Maintainer { get; } - public int? SoftwareId { get; private init; } + public long? SoftwareId { get; private init; } public Software? Software { get; } - public int? SyntaxId { get; private init; } + public long? SyntaxId { get; private init; } public Syntax? Syntax { get; } - public int? TagId { get; private init; } + public long? TagId { get; private init; } public Tag? Tag { get; } } @@ -38,9 +38,5 @@ public virtual void Configure(EntityTypeBuilder builder) { builder.Property(c => c.SubmittedAt) .HasDefaultValueSql("CURRENT_TIMESTAMP"); - builder.HasOne(c => c.Language) - .WithMany(l => l.Changes) - .HasForeignKey(c => c.LanguageIso6391) - .HasConstraintName("fk_changes_languages_language_iso6391"); } }