Skip to content

Commit efe53bb

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/access-account
2 parents d3331f0 + 99596ce commit efe53bb

7 files changed

Lines changed: 54 additions & 0 deletions

File tree

Directory.Packages.props

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,24 @@
55
<ItemGroup>
66
<PackageVersion Include="AspNetCore.HealthChecks.AzureKeyVault" Version="9.0.0" />
77
<PackageVersion Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
8+
<PackageVersion Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
89
<PackageVersion Include="AspNetCore.HealthChecks.Publisher.Seq" Version="9.0.0" />
910
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
1011
<PackageVersion Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
1112
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
1213
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
1314
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
1415
<PackageVersion Include="AutoFixture" Version="4.18.1" />
16+
<PackageVersion Include="AutoFixture" Version="4.18.1" />
1517
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
1618
<PackageVersion Include="Azure.Identity" Version="1.17.0" />
1719
<PackageVersion Include="Carter" Version="8.0.0" />
1820
<PackageVersion Include="FluentAssertions" Version="8.8.0" />
1921
<PackageVersion Include="Mapster" Version="7.4.0" />
2022
<PackageVersion Include="MassTransit.EntityFrameworkCore" Version="8.0.11" />
2123
<PackageVersion Include="MassTransit.RabbitMQ" Version="8.0.11" />
24+
<PackageVersion Include="MassTransit.EntityFrameworkCore" Version="8.0.11" />
25+
<PackageVersion Include="MassTransit.RabbitMQ" Version="8.0.11" />
2226
<PackageVersion Include="MediatR" Version="13.1.0" />
2327
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.22" />
2428
<PackageVersion Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
@@ -30,6 +34,12 @@
3034
</PackageVersion>
3135
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.22" />
3236
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
37+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.22">
38+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
39+
<PrivateAssets>all</PrivateAssets>
40+
</PackageVersion>
41+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.22" />
42+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
3343
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
3444
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.2" />
3545
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
@@ -38,6 +48,8 @@
3848
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
3949
<PackageVersion Include="MongoDB.Driver" Version="3.5.2" />
4050
<PackageVersion Include="Moq" Version="4.20.72" />
51+
<PackageVersion Include="MongoDB.Driver" Version="3.5.2" />
52+
<PackageVersion Include="Moq" Version="4.20.72" />
4153
<PackageVersion Include="NSubstitute" Version="5.3.0" />
4254
<PackageVersion Include="Polly" Version="8.6.4" />
4355
<PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
@@ -55,6 +67,7 @@
5567
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.15.0.120848" />
5668
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
5769
<PackageVersion Include="System.Linq.Async" Version="7.0.0" />
70+
<PackageVersion Include="System.Linq.Async" Version="7.0.0" />
5871
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
5972
<PackageVersion Include="xunit.v3" Version="3.2.0" />
6073
</ItemGroup>

src/Account/DependencyInjection.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public static class DependencyInjection
2121
public static IServiceCollection AddAccount(
2222
this IServiceCollection services,
2323
IConfigurationManager config)
24+
IConfigurationManager config)
2425
{
2526
services.Configure<Settings>(config);
2627

@@ -34,6 +35,7 @@ public static IServiceCollection AddAccount(
3435
.AddAuth();
3536
}
3637

38+
public static IBusRegistrationConfigurator ConfigureAccountBus(this IBusRegistrationConfigurator x)
3739
public static IBusRegistrationConfigurator ConfigureAccountBus(this IBusRegistrationConfigurator x)
3840
{
3941
x.AddConsumers(Assembly.GetExecutingAssembly());
@@ -42,6 +44,11 @@ public static IBusRegistrationConfigurator ConfigureAccountBus(this IBusRegistra
4244
c.UseSqlServer();
4345
c.UseBusOutbox();
4446
});
47+
x.AddEntityFrameworkOutbox<AccountContext>(c =>
48+
{
49+
c.UseSqlServer();
50+
c.UseBusOutbox();
51+
});
4552

4653
return x;
4754
}

src/Account/Domain/Enum/Gender.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace Kairos.Account.Domain.Enum;
2+
3+
public enum Gender
4+
{
5+
Unspecified = 0,
6+
Male,
7+
Female,
8+
Other
9+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace Kairos.Account.Domain.Enum;
2+
3+
public enum PersonType
4+
{
5+
/// <summary>
6+
/// Individual
7+
/// </summary>
8+
Natural = 1,
9+
10+
/// <summary>
11+
/// Corporate
12+
/// </summary>
13+
Legal
14+
}

src/Gateway/Filters/ResponseFormatter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ internal sealed class ResponseFormatter(ILogger<ResponseFormatter> logger) : IEn
4545
catch (Exception ex)
4646
{
4747
logger.LogError(ex, "{Error}", ex.Message);
48+
logger.LogError(ex, "{Error}", ex.Message);
4849

4950
return Results.Json(
51+
data: new Response<object?>(null, [ex.Message]),
5052
data: new Response<object?>(null, [ex.Message]),
5153
statusCode: StatusCodes.Status500InternalServerError
5254
);

src/MarketData/Infra/Configuration/Settings.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@ public sealed partial class Database
1313
{
1414
public required DbOptions MarketData { get; init; }
1515
}
16+
17+
public sealed partial class Database
18+
{
19+
public required DbOptions MarketData { get; init; }
20+
}
1621
}

src/Shared/Contracts/Output.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,13 @@ public static Output<TValue> Created(TValue value, IEnumerable<string>? messages
9090
public static Output<TValue> InvalidInput(IEnumerable<string> messages, TValue? value = default) =>
9191
new(value, OutputStatus.InvalidInput, messages);
9292

93+
public static Output<TValue> NotFound(IEnumerable<string> messages, TValue? value = default) =>
94+
new(value, OutputStatus.NotFound, messages);
9395
public static Output<TValue> NotFound(IEnumerable<string> messages, TValue? value = default) =>
9496
new(value, OutputStatus.NotFound, messages);
9597

98+
public static Output<TValue> PolicyViolation(IEnumerable<string> messages, TValue? value = default) =>
99+
new(value, OutputStatus.PolicyViolation, messages);
96100
public static Output<TValue> PolicyViolation(IEnumerable<string> messages, TValue? value = default) =>
97101
new(value, OutputStatus.PolicyViolation, messages);
98102

0 commit comments

Comments
 (0)