From 3adf4faebfb778151b7c16ac33cb5500b6b5aa70 Mon Sep 17 00:00:00 2001 From: "LAPTOP-1BL52TMD\\kasia" Date: Mon, 25 Oct 2021 12:53:02 +0200 Subject: [PATCH 1/2] Add database config --- .../ApplicationDbContext.cs | 11 +++++++++++ WizardWorldApi/WizardWorld.Persistance/Class1.cs | 8 -------- .../IServiceCollectionExtensions.cs | 15 +++++++++++++++ .../WizardWorld.Persistance.csproj | 1 + WizardWorldApi/WizardWorldApi/Startup.cs | 3 ++- .../WizardWorldApi/appsettings.Development.json | 4 ++++ 6 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 WizardWorldApi/WizardWorld.Persistance/ApplicationDbContext.cs delete mode 100644 WizardWorldApi/WizardWorld.Persistance/Class1.cs create mode 100644 WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs diff --git a/WizardWorldApi/WizardWorld.Persistance/ApplicationDbContext.cs b/WizardWorldApi/WizardWorld.Persistance/ApplicationDbContext.cs new file mode 100644 index 0000000..e4c4119 --- /dev/null +++ b/WizardWorldApi/WizardWorld.Persistance/ApplicationDbContext.cs @@ -0,0 +1,11 @@ +using Microsoft.EntityFrameworkCore; + +namespace WizardWorld.Persistance { + public class ApplicationDbContext : DbContext { + public ApplicationDbContext(DbContextOptions options) : base(options) { } + + protected override void OnModelCreating(ModelBuilder modelBuilder) { + modelBuilder.ApplyConfigurationsFromAssembly(typeof(ApplicationDbContext).Assembly); + } + } +} \ No newline at end of file diff --git a/WizardWorldApi/WizardWorld.Persistance/Class1.cs b/WizardWorldApi/WizardWorld.Persistance/Class1.cs deleted file mode 100644 index dab0a28..0000000 --- a/WizardWorldApi/WizardWorld.Persistance/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace WizardWorld.Persistance -{ - public class Class1 - { - } -} diff --git a/WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs b/WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs new file mode 100644 index 0000000..f4a4bce --- /dev/null +++ b/WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; + +namespace WizardWorld.Persistance +{ + public static class IServiceCollectionExtensions + { + public static void AddApplicationDbContext(this IServiceCollection serviceExtensions, string connectionString) { + serviceExtensions.AddDbContext( options => options.UseNpgsql(connectionString)); + } + } +} diff --git a/WizardWorldApi/WizardWorld.Persistance/WizardWorld.Persistance.csproj b/WizardWorldApi/WizardWorld.Persistance/WizardWorld.Persistance.csproj index fa9f5ea..bdaefac 100644 --- a/WizardWorldApi/WizardWorld.Persistance/WizardWorld.Persistance.csproj +++ b/WizardWorldApi/WizardWorld.Persistance/WizardWorld.Persistance.csproj @@ -6,6 +6,7 @@ + diff --git a/WizardWorldApi/WizardWorldApi/Startup.cs b/WizardWorldApi/WizardWorldApi/Startup.cs index 8de382b..5a55145 100644 --- a/WizardWorldApi/WizardWorldApi/Startup.cs +++ b/WizardWorldApi/WizardWorldApi/Startup.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using WizardWorld.Persistance; namespace WizardWorldApi { @@ -26,7 +27,7 @@ public Startup(IConfiguration configuration) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - + services.AddApplicationDbContext(Configuration.GetConnectionString(Configuration["DefaultConnection"])); services.AddControllers(); services.AddSwaggerGen(c => { diff --git a/WizardWorldApi/WizardWorldApi/appsettings.Development.json b/WizardWorldApi/WizardWorldApi/appsettings.Development.json index 8983e0f..5010ddd 100644 --- a/WizardWorldApi/WizardWorldApi/appsettings.Development.json +++ b/WizardWorldApi/WizardWorldApi/appsettings.Development.json @@ -5,5 +5,9 @@ "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DefaultConnection": "User ID=root;Password=MossPiglets;Host=localhost;Port=5432;Database=WizardWorld;Pooling=true;Min Pool Size=0;Max Pool Size=100;Connection Lifetime=0;" } } From 8a0e085549710be9da51ba4d4bf200e4b67b3b75 Mon Sep 17 00:00:00 2001 From: "LAPTOP-1BL52TMD\\kasia" Date: Wed, 27 Oct 2021 13:01:03 +0200 Subject: [PATCH 2/2] Small fixes --- .../.idea/.idea.WizardWorldApi/.idea/.gitignore | 13 +++++++++++++ .../.idea/.idea.WizardWorldApi/.idea/encodings.xml | 4 ++++ .../.idea.WizardWorldApi/.idea/indexLayout.xml | 8 ++++++++ .../.idea/.idea.WizardWorldApi/.idea/vcs.xml | 6 ++++++ .../IServiceCollectionExtensions.cs | 2 +- WizardWorldApi/WizardWorldApi/Startup.cs | 2 +- 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/.gitignore create mode 100644 WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/encodings.xml create mode 100644 WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/indexLayout.xml create mode 100644 WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/vcs.xml diff --git a/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/.gitignore b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/.gitignore new file mode 100644 index 0000000..c1d6bcf --- /dev/null +++ b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/.idea.WizardWorldApi.iml +/projectSettingsUpdater.xml +/modules.xml +/contentModel.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/encodings.xml b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/indexLayout.xml b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/vcs.xml b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs b/WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs index f4a4bce..0abf495 100644 --- a/WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs +++ b/WizardWorldApi/WizardWorld.Persistance/IServiceCollectionExtensions.cs @@ -9,7 +9,7 @@ namespace WizardWorld.Persistance public static class IServiceCollectionExtensions { public static void AddApplicationDbContext(this IServiceCollection serviceExtensions, string connectionString) { - serviceExtensions.AddDbContext( options => options.UseNpgsql(connectionString)); + serviceExtensions.AddDbContext(options => options.UseNpgsql(connectionString)); } } } diff --git a/WizardWorldApi/WizardWorldApi/Startup.cs b/WizardWorldApi/WizardWorldApi/Startup.cs index 5a55145..fdc7451 100644 --- a/WizardWorldApi/WizardWorldApi/Startup.cs +++ b/WizardWorldApi/WizardWorldApi/Startup.cs @@ -27,7 +27,7 @@ public Startup(IConfiguration configuration) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - services.AddApplicationDbContext(Configuration.GetConnectionString(Configuration["DefaultConnection"])); + services.AddApplicationDbContext(Configuration.GetConnectionString("DefaultConnection")); services.AddControllers(); services.AddSwaggerGen(c => {