Skip to content

Commit 198600c

Browse files
authored
Merge branch 'main' into query-get-deletion-process-by-id
2 parents 8c187d1 + 46920ec commit 198600c

File tree

291 files changed

+836
-1173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+836
-1173
lines changed

AdminUi/src/AdminUi.Infrastructure.Database.Postgres/AdminUi.Infrastructure.Database.Postgres.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<Nullable>enable</Nullable>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<ProjectReference Include="..\AdminUi.Infrastructure\AdminUi.Infrastructure.csproj" />
95
</ItemGroup>

AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/AdminUi.Infrastructure.Database.SqlServer.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<Nullable>enable</Nullable>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<ProjectReference Include="..\AdminUi.Infrastructure\AdminUi.Infrastructure.csproj" />
95
</ItemGroup>

AdminUi/src/AdminUi.Infrastructure/AdminUi.Infrastructure.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<Nullable>enable</Nullable>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<ProjectReference Include="..\..\..\BuildingBlocks\src\BuildingBlocks.Infrastructure\BuildingBlocks.Infrastructure.csproj" />
95
</ItemGroup>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
namespace Backbone.AdminUi.Infrastructure.DTOs;
22
public class ClientOverview
33
{
4-
public string ClientId { get; set; }
5-
public string DisplayName { get; set; }
6-
public TierDTO DefaultTier { get; set; }
7-
public DateTime CreatedAt { get; set; }
4+
public required string ClientId { get; set; }
5+
public required string DisplayName { get; set; }
6+
public required TierDTO DefaultTier { get; set; }
7+
public required DateTime CreatedAt { get; set; }
88
public int? MaxIdentities { get; set; }
9-
public int NumberOfIdentities { get; set; }
9+
public required int NumberOfIdentities { get; set; }
1010
}

AdminUi/src/AdminUi.Infrastructure/DTOs/IdentityOverview.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
public class IdentityOverview
44
{
5-
public string Address { get; set; }
6-
public DateTime CreatedAt { get; set; }
5+
public required string Address { get; set; }
6+
public required DateTime CreatedAt { get; set; }
77
public DateTime? LastLoginAt { get; set; }
88
public string? CreatedWithClient { get; set; }
99
public int? DatawalletVersion { get; set; }
10-
public byte IdentityVersion { get; set; }
11-
public TierDTO Tier { get; set; }
10+
public required byte IdentityVersion { get; set; }
11+
public required TierDTO Tier { get; set; }
1212
public int? NumberOfDevices { get; set; }
1313
}

AdminUi/src/AdminUi.Infrastructure/DTOs/RelationshipOverview.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
namespace Backbone.AdminUi.Infrastructure.DTOs;
22
public class RelationshipOverview
33
{
4-
public string From { get; set; }
5-
public string To { get; set; }
6-
public string RelationshipTemplateId { get; set; }
7-
public RelationshipStatus Status { get; set; }
8-
public DateTime CreatedAt { get; set; }
4+
public required string From { get; set; }
5+
public required string To { get; set; }
6+
public required string RelationshipTemplateId { get; set; }
7+
public required RelationshipStatus Status { get; set; }
8+
public required DateTime CreatedAt { get; set; }
99
public DateTime? AnsweredAt { get; set; }
10-
public string CreatedByDevice { get; set; }
11-
public string? AnsweredByDevice { get; set; }
10+
public required string CreatedByDevice { get; set; }
11+
public required string? AnsweredByDevice { get; set; }
1212
}
1313

1414
public enum RelationshipStatus
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace Backbone.AdminUi.Infrastructure.DTOs;
22
public class TierOverview
33
{
4-
public string Id { get; set; }
5-
public string Name { get; set; }
6-
public int NumberOfIdentities { get; set; }
4+
public required string Id { get; set; }
5+
public required string Name { get; set; }
6+
public required int NumberOfIdentities { get; set; }
77
}

AdminUi/src/AdminUi.Infrastructure/Persistence/Database/AdminUiDbContext.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public AdminUiDbContext(DbContextOptions<AdminUiDbContext> options, IServiceProv
1818
{
1919
}
2020

21-
public DbSet<IdentityOverview> IdentityOverviews { get; set; }
21+
public DbSet<IdentityOverview> IdentityOverviews { get; set; } = null!;
2222

23-
public DbSet<TierOverview> TierOverviews { get; set; }
23+
public DbSet<TierOverview> TierOverviews { get; set; } = null!;
2424

25-
public DbSet<ClientOverview> ClientOverviews { get; set; }
25+
public DbSet<ClientOverview> ClientOverviews { get; set; } = null!;
2626

27-
public DbSet<RelationshipOverview> RelationshipOverviews { get; set; }
27+
public DbSet<RelationshipOverview> RelationshipOverviews { get; set; } = null!;
2828

2929
protected override void OnModelCreating(ModelBuilder builder)
3030
{

AdminUi/src/AdminUi.Infrastructure/Persistence/IServiceCollectionExtension.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static IServiceCollection AddDatabase(this IServiceCollection services, S
2626
public static IServiceCollection AddDatabase(this IServiceCollection services, Action<DbOptions> setupOptions)
2727
{
2828
var options = new DbOptions();
29-
setupOptions?.Invoke(options);
29+
setupOptions.Invoke(options);
3030

3131
services
3232
.AddDbContext<AdminUiDbContext>(dbContextOptions =>
@@ -61,8 +61,8 @@ public static IServiceCollection AddDatabase(this IServiceCollection services, A
6161

6262
public class DbOptions
6363
{
64-
public string Provider { get; set; }
65-
public string ConnectionString { get; set; }
64+
public string Provider { get; set; } = null!;
65+
public string ConnectionString { get; set; } = null!;
6666
public RetryOptions RetryOptions { get; set; } = new();
6767
}
6868

AdminUi/src/AdminUi/AdminUi.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<Nullable>enable</Nullable>
54
<IsPackable>false</IsPackable>
65
<SpaRoot>ClientApp\</SpaRoot>
76
<SpaProxyServerUrl>http://localhost:4200</SpaProxyServerUrl>
@@ -12,9 +11,9 @@
1211

1312
<ItemGroup>
1413
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.4" />
15-
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.1" />
14+
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.2" />
1615
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
1817
<PrivateAssets>all</PrivateAssets>
1918
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2019
</PackageReference>
@@ -23,7 +22,7 @@
2322
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
2423
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />
2524
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
26-
<PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.1" />
25+
<PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2" />
2726
<PackageReference Include="Serilog" Version="3.1.1" />
2827
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
2928
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />

0 commit comments

Comments
 (0)