ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Program

Browse Source
This commit is contained in:
David Fowler 2023-05-04 07:48:07 -07:00 committed by Reuben Bond
parent c59e66861f
commit d96e4db08c
7 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Services/Basket/Basket.API/Basket.API.csproj
View File

@ -18,4 +18,8 @@
<ItemGroup>
<ProjectReference Include="..\..\Services.Common\Services.Common.csproj" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Basket.FunctionalTests" />
</ItemGroup>
</Project>

2
src/Services/Basket/Basket.API/Controllers/BasketController.cs
View File

@ -71,7 +71,7 @@ public class BasketController : ControllerBase
}
catch (Exception ex)
{
_logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId} from {AppName}", eventMessage.Id, Program.AppName);
_logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId}", eventMessage.Id);
throw;
}

4
src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs
View File

@ -15,9 +15,9 @@ public class OrderStartedIntegrationEventHandler : IIntegrationEventHandler<Orde
public async Task Handle(OrderStartedIntegrationEvent @event)
{
using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}"))
{
_logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
_logger.LogInformation("----- Handling integration event: {IntegrationEventId} - ({@IntegrationEvent})", @event.Id, @event);
await _repository.DeleteBasketAsync(@event.UserId.ToString());
}

4
src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
View File

@ -15,9 +15,9 @@ public class ProductPriceChangedIntegrationEventHandler : IIntegrationEventHandl
public async Task Handle(ProductPriceChangedIntegrationEvent @event)
{
using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}"))
{
_logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
_logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, @event);
var userIds = _repository.GetUsers();

8
src/Services/Basket/Basket.API/Program.cs
View File

@ -63,12 +63,6 @@ try
}
catch (Exception ex)
{
app.Logger.LogCritical(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
app.Logger.LogCritical(ex, "Program terminated unexpectedly");
return 1;
}
public partial class Program
{
private static string Namespace = typeof(Program).Assembly.GetName().Name;
public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
}

8
src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs
View File

@ -3,13 +3,14 @@ using Microsoft.Extensions.Hosting;
namespace Basket.FunctionalTests.Base;
public class BasketScenarioBase : WebApplicationFactory<Program>
public class BasketScenarioBase
{
private const string ApiUrlBase = "api/v1/basket";
public TestServer CreateServer()
{
return Server;
var factory = new BasketApplicaton();
return factory.Server;
}
public static class Get
@ -26,6 +27,8 @@ public class BasketScenarioBase : WebApplicationFactory<Program>
public static string CheckoutOrder = $"{ApiUrlBase}/checkout";
}
private class BasketApplicaton : WebApplicationFactory<Program>
{
protected override IHost CreateHost(IHostBuilder builder)
{
builder.ConfigureServices(services =>
@ -55,4 +58,5 @@ public class BasketScenarioBase : WebApplicationFactory<Program>
};
}
}
}
}

6
src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs
View File

@ -9,7 +9,8 @@ namespace Basket.FunctionalTests
[Fact]
public async Task UpdateBasket_return_and_add_basket()
{
var redis = Services.GetRequiredService<ConnectionMultiplexer>();
var server = CreateServer();
var redis = server.Services.GetRequiredService<ConnectionMultiplexer>();
var redisBasketRepository = BuildBasketRepository(redis);
@ -26,7 +27,8 @@ namespace Basket.FunctionalTests
[Fact]
public async Task Delete_Basket_return_null()
{
var redis = Services.GetRequiredService<ConnectionMultiplexer>();
var server = CreateServer();
var redis = server.Services.GetRequiredService<ConnectionMultiplexer>();
var redisBasketRepository = BuildBasketRepository(redis);