prtsie/schengen-visa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

задал прослушиваемые url-адреса в appsettings.json

Browse Source
This commit is contained in:
prtsie
2025-05-09 20:33:04 +03:00
parent a55eff43fb
commit 6ab5b9f1df
7 changed files with 722 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SchengenVisaApi/Infrastructure/DependencyInjection.cs
View File

@@ -21,13 +21,11 @@ public static class DependencyInjection
{
/// Add services needed for Infrastructure layer
public static IServiceCollection AddInfrastructure(this IServiceCollection services,
IConfigurationManager configurationManager,
bool isDevelopment)
IConfigurationManager configurationManager)
{
var databaseName = isDevelopment ? "developmentDB" : "normal'naya database";
services.AddDbContext<DatabaseContext>(opts =>
opts.UseNpgsql(configurationManager.GetConnectionString(databaseName)));
opts.UseNpgsql(configurationManager.GetConnectionString("connectionString")));
services.AddScoped<IGenericReader>(serviceProvider => serviceProvider.GetRequiredService<DatabaseContext>());
services.AddScoped<IGenericWriter>(serviceProvider => serviceProvider.GetRequiredService<DatabaseContext>());

502
SchengenVisaApi/Infrastructure/Migrations/20250509170104_TimeStampTypeChange.Designer.cs generated Normal file
View File

@@ -0,0 +1,502 @@
// <auto-generated />
using System;
using Infrastructure.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Infrastructure.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20250509170104_TimeStampTypeChange")]
partial class TimeStampTypeChange
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "9.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Domains.ApplicantDomain.Applicant", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<DateTime>("BirthDate")
.HasColumnType("timestamp without time zone");
b.Property<string>("Citizenship")
.IsRequired()
.HasMaxLength(30)
.IsUnicode(false)
.HasColumnType("character varying(30)");
b.Property<string>("CitizenshipByBirth")
.IsRequired()
.HasMaxLength(30)
.IsUnicode(false)
.HasColumnType("character varying(30)");
b.Property<string>("CityOfBirth")
.IsRequired()
.HasMaxLength(70)
.IsUnicode(false)
.HasColumnType("character varying(70)");
b.Property<string>("CountryOfBirth")
.IsRequired()
.HasMaxLength(70)
.IsUnicode(false)
.HasColumnType("character varying(70)");
b.Property<int>("Gender")
.HasColumnType("integer");
b.Property<bool>("IsNonResident")
.HasColumnType("boolean");
b.Property<string>("JobTitle")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b.Property<int>("MaritalStatus")
.HasColumnType("integer");
b.Property<Guid>("PlaceOfWorkId")
.HasColumnType("uuid");
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("PlaceOfWorkId");
b.HasIndex("UserId")
.IsUnique();
b.ToTable("Applicant");
});
modelBuilder.Entity("Domains.ApplicantDomain.PlaceOfWork", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(200)
.IsUnicode(false)
.HasColumnType("character varying(200)");
b.Property<string>("PhoneNum")
.IsRequired()
.HasMaxLength(13)
.IsUnicode(false)
.HasColumnType("character varying(13)");
b.HasKey("Id");
b.ToTable("PlaceOfWork");
});
modelBuilder.Entity("Domains.Users.User", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("Email")
.IsRequired()
.HasMaxLength(254)
.IsUnicode(false)
.HasColumnType("character varying(254)");
b.Property<string>("Password")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b.Property<int>("Role")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("Email")
.IsUnique();
b.ToTable("User");
});
modelBuilder.Entity("Domains.VisaApplicationDomain.VisaApplication", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<Guid>("ApplicantId")
.HasColumnType("uuid");
b.Property<string>("DestinationCountry")
.IsRequired()
.HasMaxLength(70)
.IsUnicode(false)
.HasColumnType("character varying(70)");
b.Property<bool>("ForGroup")
.HasColumnType("boolean");
b.Property<DateTime>("RequestDate")
.HasColumnType("timestamp without time zone");
b.Property<int>("RequestedNumberOfEntries")
.HasColumnType("integer");
b.Property<int>("Status")
.HasColumnType("integer");
b.Property<int>("ValidDaysRequested")
.HasColumnType("integer");
b.Property<int>("VisaCategory")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("ApplicantId");
b.ToTable("VisaApplication");
});
modelBuilder.Entity("Domains.ApplicantDomain.Applicant", b =>
{
b.HasOne("Domains.ApplicantDomain.PlaceOfWork", "PlaceOfWork")
.WithMany()
.HasForeignKey("PlaceOfWorkId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Domains.Users.User", null)
.WithOne()
.HasForeignKey("Domains.ApplicantDomain.Applicant", "UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.OwnsOne("Domains.ApplicantDomain.Name", "FatherName", b1 =>
{
b1.Property<Guid>("ApplicantId")
.HasColumnType("uuid");
b1.Property<string>("FirstName")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.Property<string>("Patronymic")
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.Property<string>("Surname")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.HasKey("ApplicantId");
b1.ToTable("Applicant");
b1.WithOwner()
.HasForeignKey("ApplicantId");
});
b.OwnsOne("Domains.ApplicantDomain.Name", "MotherName", b1 =>
{
b1.Property<Guid>("ApplicantId")
.HasColumnType("uuid");
b1.Property<string>("FirstName")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.Property<string>("Patronymic")
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.Property<string>("Surname")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.HasKey("ApplicantId");
b1.ToTable("Applicant");
b1.WithOwner()
.HasForeignKey("ApplicantId");
});
b.OwnsOne("Domains.ApplicantDomain.Name", "Name", b1 =>
{
b1.Property<Guid>("ApplicantId")
.HasColumnType("uuid");
b1.Property<string>("FirstName")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.Property<string>("Patronymic")
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.Property<string>("Surname")
.IsRequired()
.HasMaxLength(50)
.IsUnicode(false)
.HasColumnType("character varying(50)");
b1.HasKey("ApplicantId");
b1.ToTable("Applicant");
b1.WithOwner()
.HasForeignKey("ApplicantId");
});
b.OwnsOne("Domains.ApplicantDomain.Passport", "Passport", b1 =>
{
b1.Property<Guid>("ApplicantId")
.HasColumnType("uuid");
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp without time zone");
b1.Property<DateTime>("IssueDate")
.HasColumnType("timestamp without time zone");
b1.Property<string>("Issuer")
.IsRequired()
.HasMaxLength(200)
.IsUnicode(false)
.HasColumnType("character varying(200)");
b1.Property<string>("Number")
.IsRequired()
.HasMaxLength(20)
.IsUnicode(false)
.HasColumnType("character varying(20)");
b1.HasKey("ApplicantId");
b1.ToTable("Applicant");
b1.WithOwner()
.HasForeignKey("ApplicantId");
});
b.Navigation("FatherName")
.IsRequired();
b.Navigation("MotherName")
.IsRequired();
b.Navigation("Name")
.IsRequired();
b.Navigation("Passport")
.IsRequired();
b.Navigation("PlaceOfWork");
});
modelBuilder.Entity("Domains.ApplicantDomain.PlaceOfWork", b =>
{
b.OwnsOne("Domains.ApplicantDomain.Address", "Address", b1 =>
{
b1.Property<Guid>("PlaceOfWorkId")
.HasColumnType("uuid");
b1.Property<string>("Building")
.IsRequired()
.HasMaxLength(10)
.IsUnicode(false)
.HasColumnType("character varying(10)");
b1.Property<string>("City")
.IsRequired()
.HasMaxLength(70)
.IsUnicode(false)
.HasColumnType("character varying(70)");
b1.Property<string>("Country")
.IsRequired()
.HasMaxLength(70)
.IsUnicode(false)
.HasColumnType("character varying(70)");
b1.Property<string>("Street")
.IsRequired()
.HasMaxLength(100)
.IsUnicode(false)
.HasColumnType("character varying(100)");
b1.HasKey("PlaceOfWorkId");
b1.ToTable("PlaceOfWork");
b1.WithOwner()
.HasForeignKey("PlaceOfWorkId");
});
b.Navigation("Address")
.IsRequired();
});
modelBuilder.Entity("Domains.VisaApplicationDomain.VisaApplication", b =>
{
b.HasOne("Domains.ApplicantDomain.Applicant", null)
.WithMany()
.HasForeignKey("ApplicantId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.OwnsMany("Domains.VisaApplicationDomain.PastVisa", "PastVisas", b1 =>
{
b1.Property<Guid>("VisaApplicationId")
.HasColumnType("uuid");
b1.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp without time zone");
b1.Property<DateTime>("IssueDate")
.HasColumnType("timestamp without time zone");
b1.Property<string>("Name")
.IsRequired()
.HasMaxLength(70)
.IsUnicode(false)
.HasColumnType("character varying(70)");
b1.HasKey("VisaApplicationId", "Id");
b1.ToTable("PastVisa");
b1.WithOwner()
.HasForeignKey("VisaApplicationId");
});
b.OwnsMany("Domains.VisaApplicationDomain.PastVisit", "PastVisits", b1 =>
{
b1.Property<Guid>("VisaApplicationId")
.HasColumnType("uuid");
b1.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
b1.Property<string>("DestinationCountry")
.IsRequired()
.HasMaxLength(70)
.IsUnicode(false)
.HasColumnType("character varying(70)");
b1.Property<DateTime>("EndDate")
.HasColumnType("timestamp without time zone");
b1.Property<DateTime>("StartDate")
.HasColumnType("timestamp without time zone");
b1.HasKey("VisaApplicationId", "Id");
b1.ToTable("PastVisit");
b1.WithOwner()
.HasForeignKey("VisaApplicationId");
});
b.OwnsOne("Domains.VisaApplicationDomain.PermissionToDestCountry", "PermissionToDestCountry", b1 =>
{
b1.Property<Guid>("VisaApplicationId")
.HasColumnType("uuid");
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp without time zone");
b1.Property<string>("Issuer")
.IsRequired()
.HasMaxLength(200)
.IsUnicode(false)
.HasColumnType("character varying(200)");
b1.HasKey("VisaApplicationId");
b1.ToTable("VisaApplication");
b1.WithOwner()
.HasForeignKey("VisaApplicationId");
});
b.OwnsOne("Domains.VisaApplicationDomain.ReentryPermit", "ReentryPermit", b1 =>
{
b1.Property<Guid>("VisaApplicationId")
.HasColumnType("uuid");
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp without time zone");
b1.Property<string>("Number")
.IsRequired()
.HasMaxLength(25)
.IsUnicode(false)
.HasColumnType("character varying(25)");
b1.HasKey("VisaApplicationId");
b1.ToTable("VisaApplication");
b1.WithOwner()
.HasForeignKey("VisaApplicationId");
});
b.Navigation("PastVisas");
b.Navigation("PastVisits");
b.Navigation("PermissionToDestCountry");
b.Navigation("ReentryPermit");
});
#pragma warning restore 612, 618
}
}
}

183
SchengenVisaApi/Infrastructure/Migrations/20250509170104_TimeStampTypeChange.cs Normal file
View File

@@ -0,0 +1,183 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Infrastructure.Migrations
{
/// <inheritdoc />
public partial class TimeStampTypeChange : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTime>(
name: "RequestDate",
table: "VisaApplication",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ReentryPermit_ExpirationDate",
table: "VisaApplication",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "PermissionToDestCountry_ExpirationDate",
table: "VisaApplication",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "StartDate",
table: "PastVisit",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "EndDate",
table: "PastVisit",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "IssueDate",
table: "PastVisa",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ExpirationDate",
table: "PastVisa",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Passport_IssueDate",
table: "Applicant",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Passport_ExpirationDate",
table: "Applicant",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "BirthDate",
table: "Applicant",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTime>(
name: "RequestDate",
table: "VisaApplication",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ReentryPermit_ExpirationDate",
table: "VisaApplication",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "PermissionToDestCountry_ExpirationDate",
table: "VisaApplication",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "StartDate",
table: "PastVisit",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "EndDate",
table: "PastVisit",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "IssueDate",
table: "PastVisa",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ExpirationDate",
table: "PastVisa",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Passport_IssueDate",
table: "Applicant",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Passport_ExpirationDate",
table: "Applicant",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "BirthDate",
table: "Applicant",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
}
}
}

20
SchengenVisaApi/Infrastructure/Migrations/DatabaseContextModelSnapshot.cs
View File

@@ -29,7 +29,7 @@ namespace Infrastructure.Migrations
.HasColumnType("uuid");
b.Property<DateTime>("BirthDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b.Property<string>("Citizenship")
.IsRequired()
@@ -157,7 +157,7 @@ namespace Infrastructure.Migrations
.HasColumnType("boolean");
b.Property<DateTime>("RequestDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b.Property<int>("RequestedNumberOfEntries")
.HasColumnType("integer");
@@ -288,10 +288,10 @@ namespace Infrastructure.Migrations
.HasColumnType("uuid");
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.Property<DateTime>("IssueDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.Property<string>("Issuer")
.IsRequired()
@@ -391,10 +391,10 @@ namespace Infrastructure.Migrations
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.Property<DateTime>("IssueDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.Property<string>("Name")
.IsRequired()
@@ -428,10 +428,10 @@ namespace Infrastructure.Migrations
.HasColumnType("character varying(70)");
b1.Property<DateTime>("EndDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.Property<DateTime>("StartDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.HasKey("VisaApplicationId", "Id");
@@ -447,7 +447,7 @@ namespace Infrastructure.Migrations
.HasColumnType("uuid");
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.Property<string>("Issuer")
.IsRequired()
@@ -469,7 +469,7 @@ namespace Infrastructure.Migrations
.HasColumnType("uuid");
b1.Property<DateTime>("ExpirationDate")
.HasColumnType("timestamp with time zone");
.HasColumnType("timestamp without time zone");
b1.Property<string>("Number")
.IsRequired()

2
SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs
View File

@@ -28,7 +28,7 @@ public static class DependencyInjection
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
builder.Services
.AddInfrastructure(config, environment.IsDevelopment())
.AddInfrastructure(config)
.AddApplicationLayer(environment.IsDevelopment())
.AddAuth(config)
.AddPresentation(environment);

23
SchengenVisaApi/SchengenVisaApi/Program.cs
View File

@@ -1,17 +1,36 @@
using Infrastructure.Database;
using Microsoft.EntityFrameworkCore;
namespace SchengenVisaApi;
#pragma warning disable CS1591
public class Program
{
public static void Main(string[] args)
private const string MigrationKey = "--migrate";
public static async Task Main(string[] args)
{
var builder = WebApplication.CreateBuilder(args);
builder.RegisterServices();
var app = builder.Build();
await HandleMigrationKey(args, app);
app.ConfigurePipelineRequest();
app.Run();
await app.RunAsync();
}
private static async Task HandleMigrationKey(string[] args, WebApplication app)
{
if (args.Contains(MigrationKey))
{
using var scope = app.Services.CreateScope();
await using var context = scope.ServiceProvider.GetRequiredService<DatabaseContext>();
await context.Database.MigrateAsync();
Environment.Exit(0);
}
}
}
#pragma warning restore CS1591

5
SchengenVisaApi/SchengenVisaApi/appsettings.json
View File

@@ -7,9 +7,10 @@
},
"AllowedHosts": "*",
"urls": "http://localhost:5003;https://localhost:7168",
"ConnectionStrings": {
"developmentDB": "Host=localhost;Port=5432;Database=visa;Username=postgres;Password=Qwerty123456!",
"normal'naya db": ""
"connectionString": "Host=localhost;Port=5432;Database=visa;Username=postgres;Password=Qwerty123456!"
},
"JwtSettings": {