Skip to content

Commit

Permalink
Unify namespaces and introduce Directory.build.props files (#355)
Browse files Browse the repository at this point in the history
* chore: introduce Directory.build.props

* chore: use Assembly name instead of MSBuildProjectName as root namespace

* refractor: fix namespaces

* fix: add Directory.Build.props file to Dockerfiles

* fix: use correct assemblyname in Dockerfiles

* fix: use correct assembly names for sanity checks

* test: use new assembly names in ArchUnit tests

* fix: import top level Directory.Build.props from the Modules one

* test: use correct assembly name for SpecFlowCucumberResultsExporter in specflow.json

* chore: fix namespaces

* fix: re-resolve integration event handlers after exception

* fix: dont use import in Directory.Build.props, because it seems to override the properties defined in the file

* refactor: fix namespaces

* chore: do not use "global::" for Admin UI compiled model

* refactor: rename Backbone.Infrastructure project to Infrastructure

* fix: remove namespace from partial class Program

* chore: remove redundant type parameters

* refactor: fix namespaces

* fix: use correct assembly name for AdminUi migration assemblies

* fix: use correct assembly name for AdminUi migration assemblies

* fix: use correct assembly name for AdminUi migration assemblies

* fix: await Handle methods

* fix: call database seeders after all migrations of all modules are applied

* fix: log unexpected exception in exception filter

* chore: improve seeder

* fix: use new SeedDbContext method

* fix: register seeders and rename them

* fix: fix namespace AdminUi compiled models

* chore: make AdminUi and ConsumerApi internals visible to their integration tests

* chore: formatting

* test: fix visibilities

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
tnotheis and github-actions[bot] authored Oct 26, 2023
1 parent be51759 commit e481161
Show file tree
Hide file tree
Showing 1,052 changed files with 3,059 additions and 3,467 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <auto-generated />
using System;
using AdminUi.Infrastructure.Persistence.Database;
using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <auto-generated />
using System;
using AdminUi.Infrastructure.Persistence.Database;
using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
// <auto-generated />
using AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;

#pragma warning disable 219, 612, 618
#nullable enable

namespace AdminUi.Infrastructure.CompiledModels.Postgres
{
[DbContext(typeof(AdminUiDbContext))]
public partial class AdminUiDbContextModel : RuntimeModel
{
static AdminUiDbContextModel()
{
var model = new AdminUiDbContextModel();
model.Initialize();
model.Customize();
_instance = model;
}

private static AdminUiDbContextModel _instance;
public static IModel Instance => _instance;

partial void Initialize();

partial void Customize();
}
}
// <auto-generated />
using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;

#pragma warning disable 219, 612, 618
#nullable enable

namespace AdminUi.Infrastructure.CompiledModels.Postgres
{
[DbContext(typeof(AdminUiDbContext))]
public partial class AdminUiDbContextModel : RuntimeModel
{
static AdminUiDbContextModel()
{
var model = new AdminUiDbContextModel();
model.Initialize();
model.Customize();
_instance = model;
}

private static AdminUiDbContextModel _instance;
public static IModel Instance => _instance;

partial void Initialize();

partial void Customize();
}
}
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

#pragma warning disable 219, 612, 618
#nullable enable

namespace AdminUi.Infrastructure.CompiledModels.Postgres
{
public partial class AdminUiDbContextModel
{
partial void Initialize()
{
var clientOverview = ClientOverviewEntityType.Create(this);
var tierDTO = TierDTOEntityType.Create(this);
var identityOverview = IdentityOverviewEntityType.Create(this);
var tierDTO0 = TierDTO0EntityType.Create(this);
var tierOverview = TierOverviewEntityType.Create(this);

TierDTOEntityType.CreateForeignKey1(tierDTO, clientOverview);
TierDTO0EntityType.CreateForeignKey1(tierDTO0, identityOverview);

ClientOverviewEntityType.CreateAnnotations(clientOverview);
TierDTOEntityType.CreateAnnotations(tierDTO);
IdentityOverviewEntityType.CreateAnnotations(identityOverview);
TierDTO0EntityType.CreateAnnotations(tierDTO0);
TierOverviewEntityType.CreateAnnotations(tierOverview);

AddAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
AddAnnotation("ProductVersion", "7.0.11");
AddAnnotation("Relational:MaxIdentifierLength", 63);
}
}
}
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

#pragma warning disable 219, 612, 618
#nullable enable

namespace AdminUi.Infrastructure.CompiledModels.Postgres
{
public partial class AdminUiDbContextModel
{
partial void Initialize()
{
var clientOverview = ClientOverviewEntityType.Create(this);
var tierDTO = TierDTOEntityType.Create(this);
var identityOverview = IdentityOverviewEntityType.Create(this);
var tierDTO0 = TierDTO0EntityType.Create(this);
var tierOverview = TierOverviewEntityType.Create(this);

TierDTOEntityType.CreateForeignKey1(tierDTO, clientOverview);
TierDTO0EntityType.CreateForeignKey1(tierDTO0, identityOverview);

ClientOverviewEntityType.CreateAnnotations(clientOverview);
TierDTOEntityType.CreateAnnotations(tierDTO);
IdentityOverviewEntityType.CreateAnnotations(identityOverview);
TierDTO0EntityType.CreateAnnotations(tierDTO0);
TierOverviewEntityType.CreateAnnotations(tierOverview);

AddAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
AddAnnotation("ProductVersion", "7.0.12");
AddAnnotation("Relational:MaxIdentifierLength", 63);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
// <auto-generated />
using System;
using System.Reflection;
using AdminUi.Infrastructure.DTOs;
using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;

#pragma warning disable 219, 612, 618
#nullable enable

namespace AdminUi.Infrastructure.CompiledModels.Postgres
{
internal partial class ClientOverviewEntityType
{
public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType? baseEntityType = null)
{
var runtimeEntityType = model.AddEntityType(
"AdminUi.Infrastructure.DTOs.ClientOverview",
typeof(ClientOverview),
baseEntityType);

var clientId = runtimeEntityType.AddProperty(
"ClientId",
typeof(string),
propertyInfo: typeof(ClientOverview).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
afterSaveBehavior: PropertySaveBehavior.Throw);

var createdAt = runtimeEntityType.AddProperty(
"CreatedAt",
typeof(DateTime),
propertyInfo: typeof(ClientOverview).GetProperty("CreatedAt", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<CreatedAt>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
valueConverter: new DateTimeValueConverter());

var displayName = runtimeEntityType.AddProperty(
"DisplayName",
typeof(string),
propertyInfo: typeof(ClientOverview).GetProperty("DisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<DisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));

var numberOfIdentities = runtimeEntityType.AddProperty(
"NumberOfIdentities",
typeof(int),
propertyInfo: typeof(ClientOverview).GetProperty("NumberOfIdentities", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<NumberOfIdentities>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));

var key = runtimeEntityType.AddKey(
new[] { clientId });
runtimeEntityType.SetPrimaryKey(key);

return runtimeEntityType;
}

public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
{
runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
runtimeEntityType.AddAnnotation("Relational:Schema", null);
runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
runtimeEntityType.AddAnnotation("Relational:TableName", null);
runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
runtimeEntityType.AddAnnotation("Relational:ViewName", "ClientOverviews");
runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);

Customize(runtimeEntityType);
}

static partial void Customize(RuntimeEntityType runtimeEntityType);
}
}
// <auto-generated />
using System;
using System.Reflection;
using Backbone.AdminUi.Infrastructure.DTOs;
using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;

#pragma warning disable 219, 612, 618
#nullable enable

namespace AdminUi.Infrastructure.CompiledModels.Postgres
{
internal partial class ClientOverviewEntityType
{
public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType? baseEntityType = null)
{
var runtimeEntityType = model.AddEntityType(
"Backbone.AdminUi.Infrastructure.DTOs.ClientOverview",
typeof(ClientOverview),
baseEntityType);

var clientId = runtimeEntityType.AddProperty(
"ClientId",
typeof(string),
propertyInfo: typeof(ClientOverview).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
afterSaveBehavior: PropertySaveBehavior.Throw);

var createdAt = runtimeEntityType.AddProperty(
"CreatedAt",
typeof(DateTime),
propertyInfo: typeof(ClientOverview).GetProperty("CreatedAt", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<CreatedAt>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
valueConverter: new DateTimeValueConverter());

var displayName = runtimeEntityType.AddProperty(
"DisplayName",
typeof(string),
propertyInfo: typeof(ClientOverview).GetProperty("DisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<DisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));

var numberOfIdentities = runtimeEntityType.AddProperty(
"NumberOfIdentities",
typeof(int),
propertyInfo: typeof(ClientOverview).GetProperty("NumberOfIdentities", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
fieldInfo: typeof(ClientOverview).GetField("<NumberOfIdentities>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));

var key = runtimeEntityType.AddKey(
new[] { clientId });
runtimeEntityType.SetPrimaryKey(key);

return runtimeEntityType;
}

public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
{
runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
runtimeEntityType.AddAnnotation("Relational:Schema", null);
runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
runtimeEntityType.AddAnnotation("Relational:TableName", null);
runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
runtimeEntityType.AddAnnotation("Relational:ViewName", "ClientOverviews");
runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);

Customize(runtimeEntityType);
}

static partial void Customize(RuntimeEntityType runtimeEntityType);
}
}
Loading

0 comments on commit e481161

Please sign in to comment.