mirror of
https://github.com/collinbarrett/FilterLists.git
synced 2026-03-11 09:04:27 +00:00
refactor(directory): ♻ use ints for IDs for better EF support
This commit is contained in:
parent
e390adda4b
commit
bbd1f46347
18 changed files with 26 additions and 26 deletions
|
|
@ -2,6 +2,6 @@
|
|||
{
|
||||
internal interface IHaveSurrogateKey
|
||||
{
|
||||
ushort Id { get; }
|
||||
int Id { get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
{
|
||||
public class FilterList : IHaveSurrogateKey
|
||||
{
|
||||
public ushort Id { get; private set; }
|
||||
public int Id { get; private set; }
|
||||
public string Name { get; private set; } = null!;
|
||||
public string? Description { get; private set; }
|
||||
public License? License { get; private set; }
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
{
|
||||
public class License : IHaveSurrogateKey
|
||||
{
|
||||
public ushort Id { get; private set; }
|
||||
public int Id { get; private set; }
|
||||
public string Name { get; private set; } = null!;
|
||||
public string? GitHubKey { get; private set; }
|
||||
public Uri? Url { get; private set; }
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
{
|
||||
public class Maintainer : IHaveSurrogateKey
|
||||
{
|
||||
public ushort Id { get; private set; }
|
||||
public int Id { get; private set; }
|
||||
public string Name { get; private set; } = null!;
|
||||
public Uri? Url { get; private set; }
|
||||
public string? EmailAddress { get; private set; }
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
{
|
||||
public class Software : IHaveSurrogateKey
|
||||
{
|
||||
public ushort Id { get; private set; }
|
||||
public int Id { get; private set; }
|
||||
public string Name { get; private set; } = null!;
|
||||
public string? Description { get; private set; }
|
||||
public Uri? HomeUrl { get; private set; }
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
{
|
||||
public class Syntax : IHaveSurrogateKey
|
||||
{
|
||||
public ushort Id { get; private set; }
|
||||
public int Id { get; private set; }
|
||||
public string Name { get; private set; } = null!;
|
||||
public string? Description { get; private set; }
|
||||
public Uri? Url { get; private set; }
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
{
|
||||
public class Tag : IHaveSurrogateKey
|
||||
{
|
||||
public ushort Id { get; private set; }
|
||||
public int Id { get; private set; }
|
||||
public string Name { get; private set; } = null!;
|
||||
public string? Description { get; private set; }
|
||||
public ICollection<FilterListTag> FilterListTags { get; private set; } = new HashSet<FilterListTag>();
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
{
|
||||
public class ViewUrlMirror : IHaveSurrogateKey
|
||||
{
|
||||
public ushort Id { get; private set; }
|
||||
public int Id { get; private set; }
|
||||
public FilterList FilterList { get; private set; } = null!;
|
||||
public Uri Url { get; private set; } = null!;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
|
|||
public class ViewUrlPartial
|
||||
{
|
||||
public FilterList FilterList { get; private set; } = null!;
|
||||
public ushort Position { get; private set; }
|
||||
public int Position { get; private set; }
|
||||
public Uri Url { get; private set; } = null!;
|
||||
}
|
||||
}
|
||||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string dependencyFilterListId = nameof(Dependent.DependencyFilterList) + "Id";
|
||||
const string dependentFilterListId = nameof(Dependent.DependentFilterList) + "Id";
|
||||
builder.Property<ushort>(dependencyFilterListId);
|
||||
builder.Property<ushort>(dependentFilterListId);
|
||||
builder.Property<int>(dependencyFilterListId);
|
||||
builder.Property<int>(dependentFilterListId);
|
||||
builder.HasKey(dependencyFilterListId, dependentFilterListId);
|
||||
builder.HasOne(d => d.DependencyFilterList)
|
||||
.WithMany(f => (IEnumerable<TEntity>)f.DependencyFilterLists)
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string filterListId = nameof(FilterListLanguage.FilterList) + "Id";
|
||||
const string languageId = nameof(FilterListLanguage.Language) + "Id";
|
||||
builder.Property<ushort>(filterListId);
|
||||
builder.Property<ushort>(languageId);
|
||||
builder.Property<int>(filterListId);
|
||||
builder.Property<int>(languageId);
|
||||
builder.HasKey(filterListId, languageId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string filterListId = nameof(FilterListMaintainer.FilterList) + "Id";
|
||||
const string maintainerId = nameof(FilterListMaintainer.Maintainer) + "Id";
|
||||
builder.Property<ushort>(filterListId);
|
||||
builder.Property<ushort>(maintainerId);
|
||||
builder.Property<int>(filterListId);
|
||||
builder.Property<int>(maintainerId);
|
||||
builder.HasKey(filterListId, maintainerId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string filterListId = nameof(FilterListSyntax.FilterList) + "Id";
|
||||
const string syntaxId = nameof(FilterListSyntax.Syntax) + "Id";
|
||||
builder.Property<ushort>(filterListId);
|
||||
builder.Property<ushort>(syntaxId);
|
||||
builder.Property<int>(filterListId);
|
||||
builder.Property<int>(syntaxId);
|
||||
builder.HasKey(filterListId, syntaxId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string filterListId = nameof(FilterListTag.FilterList) + "Id";
|
||||
const string tagId = nameof(FilterListTag.Tag) + "Id";
|
||||
builder.Property<ushort>(filterListId);
|
||||
builder.Property<ushort>(tagId);
|
||||
builder.Property<int>(filterListId);
|
||||
builder.Property<int>(tagId);
|
||||
builder.HasKey(filterListId, tagId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string upstreamFilterListId = nameof(Fork.UpstreamFilterList) + "Id";
|
||||
const string forkFilterListId = nameof(Fork.ForkFilterList) + "Id";
|
||||
builder.Property<ushort>(upstreamFilterListId);
|
||||
builder.Property<ushort>(forkFilterListId);
|
||||
builder.Property<int>(upstreamFilterListId);
|
||||
builder.Property<int>(forkFilterListId);
|
||||
builder.HasKey(upstreamFilterListId, forkFilterListId);
|
||||
builder.HasOne(f => f.UpstreamFilterList)
|
||||
.WithMany(f => (IEnumerable<TEntity>)f.UpstreamFilterLists)
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string includedInFilterListId = nameof(Merge.IncludedInFilterList) + "Id";
|
||||
const string includesFilterListId = nameof(Merge.IncludesFilterList) + "Id";
|
||||
builder.Property<ushort>(includedInFilterListId);
|
||||
builder.Property<ushort>(includesFilterListId);
|
||||
builder.Property<int>(includedInFilterListId);
|
||||
builder.Property<int>(includesFilterListId);
|
||||
builder.HasKey(includedInFilterListId, includesFilterListId);
|
||||
builder.HasOne(m => m.IncludedInFilterList)
|
||||
.WithMany(f => (IEnumerable<TEntity>)f.IncludedInFilterLists)
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
|
||||
const string softwareId = nameof(SoftwareSyntax.Software) + "Id";
|
||||
const string syntaxId = nameof(SoftwareSyntax.Syntax) + "Id";
|
||||
builder.Property<ushort>(softwareId);
|
||||
builder.Property<ushort>(syntaxId);
|
||||
builder.Property<int>(softwareId);
|
||||
builder.Property<int>(syntaxId);
|
||||
builder.HasKey(softwareId, syntaxId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
|
|||
_ = builder ?? throw new ArgumentNullException(nameof(builder));
|
||||
|
||||
const string filterListId = nameof(ViewUrlPartial.FilterList) + "Id";
|
||||
builder.Property<ushort>(filterListId);
|
||||
builder.Property<int>(filterListId);
|
||||
builder.HasKey(filterListId, nameof(ViewUrlPartial.Position));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue