Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
<PackageVersion Include="HdrHistogram" Version="2.5.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.21" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.21" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
Expand Down Expand Up @@ -50,6 +54,7 @@
<PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.2" />
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.9" />
<PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="8.1.9" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
<PackageVersion Include="NuGet.Versioning" Version="6.14.0" />
<PackageVersion Include="NUnit" Version="4.4.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
Expand All @@ -62,6 +67,7 @@
<PackageVersion Include="Particular.LicensingComponent.Report" Version="1.0.0" />
<PackageVersion Include="Particular.Obsoletes" Version="1.0.0" />
<PackageVersion Include="Polly.Core" Version="8.5.2" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
<PackageVersion Include="PropertyChanging.Fody" Version="1.30.3" />
<PackageVersion Include="PublicApiGenerator" Version="11.5.4" />
Expand All @@ -78,6 +84,9 @@
<PackageVersion Include="System.Reactive.Linq" Version="6.0.1" />
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="8.0.1" />
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.2.0" />
<PackageVersion Include="Testcontainers.MySql" Version="4.2.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.2.0" />
<PackageVersion Include="Validar.Fody" Version="1.9.0" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
</ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/ServiceControl.Persistence.Sql.Core/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*.cs]

# Justification: ServiceControl app has no synchronization context
dotnet_diagnostic.CA2007.severity = none
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace ServiceControl.Persistence.Sql.Core.Abstractions;

public interface IDatabaseMigrator
{
Task ApplyMigrations(CancellationToken cancellationToken = default);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace ServiceControl.Persistence.Sql.Core.Abstractions;

using ServiceControl.Persistence;

public abstract class SqlPersisterSettings : PersistenceSettings
{
public required string ConnectionString { get; set; }
public int CommandTimeout { get; set; } = 30;
public bool EnableSensitiveDataLogging { get; set; } = false;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
namespace ServiceControl.Persistence.Sql.Core.DbContexts;

using Entities;
using EntityConfigurations;
using Microsoft.EntityFrameworkCore;

public abstract class ServiceControlDbContextBase : DbContext
{
protected ServiceControlDbContextBase(DbContextOptions options) : base(options)
{
}

public DbSet<TrialLicenseEntity> TrialLicenses { get; set; }
public DbSet<LicensingMetadataEntity> LicensingMetadata { get; set; }
public DbSet<ThroughputEndpointEntity> Endpoints { get; set; }
public DbSet<DailyThroughputEntity> Throughput { get; set; }

protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);

modelBuilder.ApplyConfiguration(new TrialLicenseConfiguration());
modelBuilder.ApplyConfiguration(new LicensingMetadataEntityConfiguration());
modelBuilder.ApplyConfiguration(new ThroughputEndpointConfiguration());
modelBuilder.ApplyConfiguration(new DailyThroughputConfiguration());

OnModelCreatingProvider(modelBuilder);
}

protected virtual void OnModelCreatingProvider(ModelBuilder modelBuilder)
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace ServiceControl.Persistence.Sql.Core.Entities;

public class DailyThroughputEntity
{
public int Id { get; set; }
public required string EndpointName { get; set; }
public required string ThroughputSource { get; set; }
public required DateOnly Date { get; set; }
public required long MessageCount { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace ServiceControl.Persistence.Sql.Core.Entities;

public class LicensingMetadataEntity
{
public int Id { get; set; }
public required string Key { get; set; }
public required string Data { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace ServiceControl.Persistence.Sql.Core.Entities;

public class ThroughputEndpointEntity
{
public int Id { get; set; }
public required string EndpointName { get; set; }
public required string ThroughputSource { get; set; }
public string? SanitizedEndpointName { get; set; }
public string? EndpointIndicators { get; set; }
public string? UserIndicator { get; set; }
public string? Scope { get; set; }
public DateOnly LastCollectedData { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace ServiceControl.Persistence.Sql.Core.Entities;

public class TrialLicenseEntity
{
public int Id { get; set; }
public DateOnly TrialEndDate { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
namespace ServiceControl.Persistence.Sql.Core.EntityConfigurations;

using Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

class DailyThroughputConfiguration : IEntityTypeConfiguration<DailyThroughputEntity>
{
public void Configure(EntityTypeBuilder<DailyThroughputEntity> builder)
{
builder.ToTable("DailyThroughput")
.HasIndex(e => new
{
e.EndpointName,
e.ThroughputSource,
e.Date
}, "UC_DailyThroughput_EndpointName_ThroughputSource_Date")
.IsUnique();
builder.HasKey(e => e.Id);
builder.Property(e => e.EndpointName)
.IsRequired()
.HasMaxLength(200);
builder.Property(e => e.ThroughputSource)
.IsRequired()
.HasMaxLength(50);
builder.Property(e => e.Date)
.IsRequired();
builder.Property(e => e.MessageCount)
.IsRequired();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace ServiceControl.Persistence.Sql.Core.EntityConfigurations;

using Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

class LicensingMetadataEntityConfiguration : IEntityTypeConfiguration<LicensingMetadataEntity>
{
public void Configure(EntityTypeBuilder<LicensingMetadataEntity> builder)
{
builder.ToTable("LicensingMetadata")
.HasIndex(e => e.Key)
.IsUnique();
builder.HasKey(e => e.Id);
builder.Property(e => e.Key)
.IsRequired()
.HasMaxLength(200);
builder.Property(e => e.Data)
.IsRequired()
.HasMaxLength(2000);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
namespace ServiceControl.Persistence.Sql.Core.EntityConfigurations;

using Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

class ThroughputEndpointConfiguration : IEntityTypeConfiguration<ThroughputEndpointEntity>
{
public void Configure(EntityTypeBuilder<ThroughputEndpointEntity> builder)
{
builder.ToTable("ThroughputEndpoint")
.HasIndex(e => new
{
e.EndpointName,
e.ThroughputSource
}, "UC_ThroughputEndpoint_EndpointName_ThroughputSource")
.IsUnique();
builder.HasKey(e => e.Id);
builder.Property(e => e.EndpointName)
.IsRequired()
.HasMaxLength(200);
builder.Property(e => e.ThroughputSource)
.IsRequired()
.HasMaxLength(50);

builder.Property(e => e.SanitizedEndpointName);
builder.Property(e => e.EndpointIndicators);
builder.Property(e => e.UserIndicator);
builder.Property(e => e.Scope);
builder.Property(e => e.LastCollectedData);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
namespace ServiceControl.Persistence.Sql.Core.EntityConfigurations;

using Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

class TrialLicenseConfiguration : IEntityTypeConfiguration<TrialLicenseEntity>
{
public void Configure(EntityTypeBuilder<TrialLicenseEntity> builder)
{
builder.ToTable("TrialLicense");

builder.HasKey(e => e.Id);

// Ensure only one row exists by using a fixed primary key
builder.Property(e => e.Id)
.HasDefaultValue(1)
.ValueGeneratedNever();

builder.Property(e => e.TrialEndDate)
.IsRequired();
}
}
Loading
Loading