handle database in TestFixture

This commit is contained in:
meysamhadeli 2022-05-11 00:50:11 +04:30
parent e60b22ec1e
commit 7213b37db3
14 changed files with 42 additions and 26 deletions

View File

@ -1,5 +1,5 @@
# https://github.com/Huachao/vscode-restclient
@api-gateway=https://localhost:5001
@api-gateway=https://localhost:5000
@identity-api=https://localhost:5005
@flight-api=https://localhost:5003
@passenger-api=https://localhost:5012

View File

@ -13,8 +13,8 @@ services:
dockerfile: src/ApiGateway/Dockerfile
container_name: booking-gateway
ports:
- "5000:80"
- "5001:443"
- "5001:80"
- "5000:443"
depends_on:
- db
- rabbitmq

View File

@ -13,7 +13,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5000;https://localhost:5001",
"applicationUrl": "https://localhost:5000;http://localhost:5001",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

View File

@ -66,7 +66,7 @@ if (app.Environment.IsDevelopment())
}
app.UseSerilogRequestLogging();
app.UseMigrations();
app.UseMigrations(env);
app.UseCorrelationId();
app.UseRouting();
app.UseHttpMetrics();

View File

@ -1,18 +1,22 @@
using Booking.Data;
using BuildingBlocks.EFCore;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
namespace Booking.Extensions;
public static class MigrationsExtensions
{
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app)
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app, IWebHostEnvironment env)
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
if (!env.IsEnvironment("test"))
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
}
return app;
}

View File

@ -81,7 +81,7 @@ app.UseSerilogRequestLogging();
app.UseCorrelationId();
app.UseRouting();
app.UseHttpMetrics();
app.UseMigrations();
app.UseMigrations(env);
app.UseProblemDetails();
app.UseHttpsRedirection();
app.UseAuthentication();

View File

@ -1,6 +1,6 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=.\\sqlexpress;Database=FlightDBTest;Trusted_Connection=True;MultipleActiveResultSets=true"
"DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true"
},
"RabbitMq": {
"HostName": "rabbitmq",

View File

@ -2,17 +2,22 @@ using System;
using BuildingBlocks.EFCore;
using Flight.Data;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
namespace Flight.Extensions;
public static class MigrationsExtensions
{
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app)
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app, IWebHostEnvironment env)
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
if (!env.IsEnvironment("test"))
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
}
return app;
}

View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BuildingBlocks.Domain.Model;
@ -19,7 +18,6 @@ using Microsoft.Extensions.Logging;
using Moq;
using Respawn;
using Xunit;
using Xunit.Abstractions;
namespace Integration.Test;
@ -38,7 +36,6 @@ public class TestFixture : IAsyncLifetime
private readonly WebApplicationFactory<Program> _factory;
private readonly IServiceScopeFactory _scopeFactory;
private static InMemoryTestHarness _harness;
public ITestOutputHelper Output { get; set; }
public TestFixture()
{

View File

@ -60,11 +60,10 @@ if (app.Environment.IsDevelopment())
}
app.UseSerilogRequestLogging();
app.UseMigrations();
app.UseMigrations(env);
app.UseCorrelationId();
app.UseRouting();
app.UseHttpMetrics();
app.UseMigrations();
app.UseProblemDetails();
app.UseHttpsRedirection();
app.UseAuthentication();

View File

@ -0,0 +1 @@
{"Version":1,"Id":"278877ED714C54A83CDAEF062491E880","Created":"2022-05-10T18:36:41.851832Z","Algorithm":"RS256","IsX509Certificate":false,"Data":"CfDJ8Pyl4Q0BTFBNj7ITVoMSIQjZOI0m28DbhLN9FfcLU2RNyyq6bhVmtnMTE-lHtjLLyF4A5xI-Ah4YV38OKLaGxRgNCET8ahafy1N879KJMQE9AT9iOI3hkMsKT2aBPlQS9Qzm0S_PEzdDHMrY9y9rhdXZwG7hisjMGtuAXqCcCEQuFOXOn12yGLPMVtCmIVriElJ2evkem9Ccnpy02wywUSlM9bJ46w2a0MXRzTFvC-TGuEYYcShrij_quEqKqTdcmnO-gafbKrJBCwkrbpi0lZzmu5LMbPjYsj1GM4Sn0df3koL4ShP3-hI-kQYqmOBsHB742IHBMeIo_iIbfkeefCihTI6gUq7JgV6SpEM0zIbTLCH-fykB7wVlsmN8xa-X9fONpEQ9ZJfuLh0f9LiTrgjuCP2wgH_btlFmIN1dZb3o2PHLD1CfAkLrPAgMmNH1Wlc6XlMcD4aM9yLNVQX6JV4Wg4tfteolPuKGTznwk27ePZZ3iyEcEHW36A4OwnkA_n-4gjkpj7XCzS8NP1GgtEzV_9P9l2Sijcqyab2lZ1VB-HLVj4AwE4yJM0-TJSQ2QGQl3K5evuuGrajWCeVXyCZqjtA8KKd6L4Edb0z7y0INstn_DJyNj3NHoHQBtfbjOJWjSUhERCPCyQaMBGG4at-I6FKIkftOX3rsYvGRYUIcFMALNcYizdP4jElVM3Wh2voiouP57G_JGFgTMnb8R64UVsOpBIkvvC_3Xla3xlRWUvGX5YUxvf3r9vcmHKnPfsDPmXHj89GLZZcCjcQyCwzMazXQoEGNqAApsHmHTZkq1Cj91xv3Q1jZwB7zJ8Zz8A0M6kmhh2fdvfQI7l8yN0q-1eauGF8peCzCgWSrv6zwGXwHU5exn2CUNC23ei2FEgMeMdOAhnPs78X9EhbfjXsi6IHvYV9Tt1LDGDEKBkgBOvAMEYMfZDdcLfqSKDXedj3rlyFNXlDvrXVfcosXTacNi7QruJx5QyZRmezNOYd5SGO_gKzTFHzklrT56ExaZyOlv8tdOXAG5IYQSkEbVYbpITaysrY8V0lcMbKtXX2KpquqiRA33b7JuGZpISIQkQR7C_M4Ck7MtbiWfjGXR3cGaUFXquWqnYExAwq0yOCU9U3xC4jSd6NyA9LZ-sgj3cd9mDgWeQh-vSu20SPLuBXddqUYfziZz7FNo7I2C0StyITbIFBP0ABUYM4AfSt-hDfWK2yAbzSowuksUetvp3c1dT2LhCB0YMmLYGsmP5NbzNd6h71smxaTxTn6kR5oNzfeQV4WfJI80wE80hMl9ow1_laRqsV5BCV69I2Kl7zv5Fcu4UY6CPBuvrbvEfv52wSv19Vl7RGFRnJ1jKtaytll8B5s1oB0u7VU61Gb6jv6Q_LassYf6ygPGr0x5ZrgpI-CBWmZqIGLUDIRFrA_iuAjzw619w6n0LvyfsRu5-baB30popGUIJQPncMQN1_nu4al3O5fDGchfO7BvHD1mjI0oAGkO4OSABoQAq43EKGLygch1stUn9rB9tfk2D89zZMP66j98Br64O8sBQb2F6bOOzXuRZzsKhqGcrqXOk_zWOSrkUlbJ_YvVHYcpFm_OQEQ-CNgqrf658ZMrj4rrIrG2U6s1sT6AdmLgt90svSYWqB9UmJuSHL4vq5bBkoXVEBzeGhPralPCdKZaX4Iq1lPBskWI8B7bd_XcqVvww7b9TOzQ0z6UOuURLXCjH_t595AVI8pVpxJenQ_W1ATaNBU8S0TpMioaI3LiMUjDg55ART-m6ywSzOzp3jWfwyTzgVJEDy65Ob2dUS7Qo1jvDIUIDHRobEmqj-lKQz7S7Xs6jFuDqsMMoHLImxcxCPNoWN13dbTNzCkz9JqnOGmm27b-jBd5lkIpn_4fgRo4rHdLVUXrrYx1cvdRyhqyMU8Qw1FAwf5KZ37fNBZQSyV-17ww_THTTN6-SO5fcGzsHZyyoj93qFvjROATMFaEU9J1WBtFbKg5jep8lpFvhtTiuuHVpdLxjmR3rJWEiDbjggnt66_a5MN9wlffXb7Dei9purK2KDYcbDcZIJya3ZjXhgYXk-cgLqDPsCCfc4m8gG9eNymy4AiB-golUBeB4FSUnp1O4wOqB7iA6enrDR5m-lFns0tWqvzG_77S40ewUMMIjHFZNtX3ILgzccrUtqSzb8fA-0cTSKH6oXxIl71jWe8Y7XFc5uH_T6Z1dQsWlN6y666sc75T3-35c1z4VHx8zzb5CU0JaWUX9zbvHuhKKxVKMzr-1FSBvi0OM77QU0FPqKBLieYVOqOPxCIVhbAguCEbXmItsbWiusx3yUHiKZnGCq2EkYLbJw3HgENX3kgayuuSbJOnc2XR8A-0eb1_8z5KEUCLzoG_ntZ5ay7WTtu5gBfBssSufXLfACrMXWyS2_bymuyr7F2QPOa6E-qLo6jQZgPjQivrxkTZN6CC_rmpva-KpEBmFQ1g2BD1g9i","DataProtected":true}

View File

@ -2,17 +2,22 @@ using System;
using BuildingBlocks.EFCore;
using Identity.Data;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
namespace Identity.Extensions;
public static class MigrationsExtensions
{
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app)
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app, IWebHostEnvironment env)
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
if (!env.IsEnvironment("test"))
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
}
return app;
}

View File

@ -62,7 +62,7 @@ if (app.Environment.IsDevelopment())
}
app.UseSerilogRequestLogging();
app.UseMigrations();
app.UseMigrations(env);
app.UseCorrelationId();
app.UseRouting();
app.UseHttpMetrics();

View File

@ -1,17 +1,22 @@
using BuildingBlocks.EFCore;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Passenger.Data;
namespace Passenger.Extensions;
public static class MigrationsExtensions
{
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app)
public static IApplicationBuilder UseMigrations(this IApplicationBuilder app, IWebHostEnvironment env)
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
if (!env.IsEnvironment("test"))
{
MigrateDatabase(app.ApplicationServices);
SeedData(app.ApplicationServices);
}
return app;
}