From 9feecb624feb04b22fc1fdb24b3d63b751eb941b Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Thu, 13 May 2021 19:03:34 +0430 Subject: [PATCH] using AddDbContextPool --- GanjooRazor/Startup.cs | 4 +++ RMuseum/DbContext/RMuseumDbContext.cs | 25 ++------------ RMuseum/RMuseum.xml | 16 --------- .../ArtifactService-HarvardDirectly.cs | 8 ++--- .../ArtifactService-ImportBritishLibrary.cs | 34 +++++++++---------- .../ArtifactService-ImportCambridge.cs | 16 ++++----- .../ArtifactService-ImportChesterBeatty.cs | 12 +++---- .../ArtifactService-ImportHarvard.cs | 18 +++++----- .../ArtifactService-ImportHathiTrust.cs | 18 +++++----- .../ArtifactService-ImportLoc.cs | 14 ++++---- .../ArtifactService-ImportPenLibraries.cs | 20 +++++------ .../ArtifactService-ImportServerFolder.cs | 10 +++--- .../ArtifactService-ImportWalters.cs | 14 ++++---- .../ArtificatService-ImportPrinceton.cs | 16 ++++----- .../GanjoorService-MySqlImports.cs | 4 +-- .../Services/Implementation/GanjoorService.cs | 2 +- .../Implementation/MusicCatalogueService.cs | 2 +- .../Implementation/PictureFileService.cs | 4 +-- .../Implementation/RecitationService.cs | 2 +- .../DbContext/RSecurityDbContext.cs | 21 ++++++++++-- RSecurityBackend/RSecurityBackend.xml | 8 ++++- 21 files changed, 129 insertions(+), 139 deletions(-) diff --git a/GanjooRazor/Startup.cs b/GanjooRazor/Startup.cs index 2463187e..22085266 100644 --- a/GanjooRazor/Startup.cs +++ b/GanjooRazor/Startup.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.UI.Services; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; @@ -51,6 +52,9 @@ namespace GanjooRazor options.Conventions.AddPageRoute("/index", "{*url}"); }); + services.AddDbContextPool( + options => options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection"))); + services.AddDbContext(); Audit.Core.Configuration.JsonSettings.ContractResolver = AuditNetEnvironmentSkippingContractResolver.Instance; diff --git a/RMuseum/DbContext/RMuseumDbContext.cs b/RMuseum/DbContext/RMuseumDbContext.cs index b7bf4420..0e0efdf2 100644 --- a/RMuseum/DbContext/RMuseumDbContext.cs +++ b/RMuseum/DbContext/RMuseumDbContext.cs @@ -12,6 +12,7 @@ using RSecurityBackend.Models.Auth.Db; using System; using RMuseum.Models.Ganjoor; using RMuseum.Models.MusicCatalogue; +using System.IO; namespace RMuseum.DbContext { @@ -20,29 +21,7 @@ namespace RMuseum.DbContext /// public class RMuseumDbContext : RSecurityDbContext { - /// - /// constructor - /// - public RMuseumDbContext(IConfiguration configuration) - { - Configuration = configuration; - Database.Migrate(); - } - - /// - /// - /// - public IConfiguration Configuration { get; } - - /// - /// - /// - /// - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - optionsBuilder.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")); - base.OnConfiguring(optionsBuilder); - } + public RMuseumDbContext(DbContextOptions options) : base(options) { } /// /// diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index a1b2f095..573343dd 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -1291,22 +1291,6 @@ Museum Database Context - - - constructor - - - - - - - - - - - - - diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-HarvardDirectly.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-HarvardDirectly.cs index 15f4589a..6e1727dd 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-HarvardDirectly.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-HarvardDirectly.cs @@ -79,7 +79,7 @@ namespace RMuseum.Services.Implementation { try { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { RArtifactMasterRecord book = new RArtifactMasterRecord($"extracted from harvard resource number {job.ResourceNumber}", $"extracted from harvard resource number {job.ResourceNumber}") { @@ -115,7 +115,7 @@ namespace RMuseum.Services.Implementation meta.Add(tag); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -138,7 +138,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -165,7 +165,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportBritishLibrary.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportBritishLibrary.cs index b9b383dd..05ed5495 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportBritishLibrary.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportBritishLibrary.cs @@ -98,7 +98,7 @@ namespace RMuseum.Services.Implementation { if (result.IsSuccessStatusCode) { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { if ( (await context.Artifacts.Where(a => a.FriendlyUrl == job.FriendlyUrl).SingleOrDefaultAsync()) @@ -106,7 +106,7 @@ namespace RMuseum.Services.Implementation null ) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -132,7 +132,7 @@ namespace RMuseum.Services.Implementation string html = await result.Content.ReadAsStringAsync(); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -145,7 +145,7 @@ namespace RMuseum.Services.Implementation int nIdxStart = html.IndexOf("PageList"); if (nIdxStart == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -159,7 +159,7 @@ namespace RMuseum.Services.Implementation nIdxStart = html.IndexOf("value=\"", nIdxStart); if (nIdxStart == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -177,7 +177,7 @@ namespace RMuseum.Services.Implementation nIdxStart = html.IndexOf("TextList"); if (nIdxStart == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -191,7 +191,7 @@ namespace RMuseum.Services.Implementation nIdxStart = html.IndexOf("value=\"", nIdxStart); if (nIdxStart == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -209,7 +209,7 @@ namespace RMuseum.Services.Implementation nIdxStart = html.IndexOf("TitleList"); if (nIdxStart == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -223,7 +223,7 @@ namespace RMuseum.Services.Implementation nIdxStart = html.IndexOf("value=\"", nIdxStart); if (nIdxStart == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -244,7 +244,7 @@ namespace RMuseum.Services.Implementation if (PageUrls.Length != PageTexts.Length || PageTexts.Length != PageTitles.Length) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -285,7 +285,7 @@ namespace RMuseum.Services.Implementation continue; order++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order; importJobUpdaterDb.Update(job); @@ -456,7 +456,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -508,7 +508,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -552,7 +552,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -627,7 +627,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -653,7 +653,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -669,7 +669,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportCambridge.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportCambridge.cs index bf65b225..d5673d8e 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportCambridge.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportCambridge.cs @@ -113,7 +113,7 @@ namespace RMuseum.Services.Implementation { if (result.IsSuccessStatusCode) { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { if ( (await context.Artifacts.Where(a => a.FriendlyUrl == job.FriendlyUrl).SingleOrDefaultAsync()) @@ -121,7 +121,7 @@ namespace RMuseum.Services.Implementation null ) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -197,7 +197,7 @@ namespace RMuseum.Services.Implementation string imageReproPageURL = "https://image01.cudl.lib.cam.ac.uk"; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -231,7 +231,7 @@ namespace RMuseum.Services.Implementation { order++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order; importJobUpdaterDb.Update(job); @@ -394,7 +394,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -419,7 +419,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -445,7 +445,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -461,7 +461,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportChesterBeatty.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportChesterBeatty.cs index cb95d7f2..904fce30 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportChesterBeatty.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportChesterBeatty.cs @@ -83,7 +83,7 @@ namespace RMuseum.Services.Implementation { try { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { RArtifactMasterRecord book = new RArtifactMasterRecord($"extracted from url {job.ResourceNumber}", $"extracted from url {job.ResourceNumber}") { @@ -112,7 +112,7 @@ namespace RMuseum.Services.Implementation - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -130,7 +130,7 @@ namespace RMuseum.Services.Implementation order++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order; importJobUpdaterDb.Update(job); @@ -283,7 +283,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -314,7 +314,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -341,7 +341,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHarvard.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHarvard.cs index d5d3f66f..8a29f323 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHarvard.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHarvard.cs @@ -90,7 +90,7 @@ namespace RMuseum.Services.Implementation { if (result.IsSuccessStatusCode) { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { RArtifactMasterRecord book = new RArtifactMasterRecord($"extracted from {url}", $"extracted from {url}") { @@ -108,7 +108,7 @@ namespace RMuseum.Services.Implementation string html = await result.Content.ReadAsStringAsync(); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -170,7 +170,7 @@ namespace RMuseum.Services.Implementation nStartIndex = html.IndexOf("https://pds.lib.harvard.edu/pds/view/"); if (nStartIndex == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -199,7 +199,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -226,7 +226,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -242,7 +242,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -299,7 +299,7 @@ namespace RMuseum.Services.Implementation foreach (JToken canvas in canvases) { order++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order * 100 / (decimal)pageCount; importJobUpdaterDb.Update(job); @@ -447,7 +447,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -468,7 +468,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHathiTrust.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHathiTrust.cs index 74c433e4..4202e08e 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHathiTrust.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportHathiTrust.cs @@ -98,7 +98,7 @@ namespace RMuseum.Services.Implementation { if (result.IsSuccessStatusCode) { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { if ( (await context.Artifacts.Where(a => a.FriendlyUrl == job.FriendlyUrl).SingleOrDefaultAsync()) @@ -106,7 +106,7 @@ namespace RMuseum.Services.Implementation null ) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -132,7 +132,7 @@ namespace RMuseum.Services.Implementation string xml = await result.Content.ReadAsStringAsync(); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -213,7 +213,7 @@ namespace RMuseum.Services.Implementation if (string.IsNullOrEmpty(pdfResourceNumber)) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -253,7 +253,7 @@ namespace RMuseum.Services.Implementation while (true) { order++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order; importJobUpdaterDb.Update(job); @@ -427,7 +427,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -452,7 +452,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -478,7 +478,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -494,7 +494,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportLoc.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportLoc.cs index ce793379..05ee279f 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportLoc.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportLoc.cs @@ -97,7 +97,7 @@ namespace RMuseum.Services.Implementation { try { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -123,7 +123,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -157,7 +157,7 @@ namespace RMuseum.Services.Implementation { //here is a problem, this method could be called from a background service where _context is disposed, so I need to renew it - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { RArtifactMasterRecord book = new RArtifactMasterRecord($"extracted from {url}", $"extracted from {url}") { @@ -269,7 +269,7 @@ namespace RMuseum.Services.Implementation } */ - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order * 100 / (decimal)pageCount; importJobUpdaterDb.Update(job); @@ -455,7 +455,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -503,7 +503,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -519,7 +519,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportPenLibraries.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportPenLibraries.cs index 0f6e27ae..ecb9f69b 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportPenLibraries.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportPenLibraries.cs @@ -96,7 +96,7 @@ namespace RMuseum.Services.Implementation { if (result.IsSuccessStatusCode) { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { if ( (await context.Artifacts.Where(a => a.FriendlyUrl == job.FriendlyUrl).SingleOrDefaultAsync()) @@ -104,7 +104,7 @@ namespace RMuseum.Services.Implementation null ) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -130,7 +130,7 @@ namespace RMuseum.Services.Implementation string html = await result.Content.ReadAsStringAsync(); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -146,7 +146,7 @@ namespace RMuseum.Services.Implementation int nIdxStart = html.IndexOf("https://repo.library.upenn.edu/djatoka/resolver?"); if (nIdxStart == -1) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -225,7 +225,7 @@ namespace RMuseum.Services.Implementation { order++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order; importJobUpdaterDb.Update(job); @@ -349,7 +349,7 @@ namespace RMuseum.Services.Implementation { if (order > 1) break; //finished - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -407,7 +407,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -432,7 +432,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -458,7 +458,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -474,7 +474,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportServerFolder.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportServerFolder.cs index 8cbcff4d..ab28ac8e 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportServerFolder.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportServerFolder.cs @@ -80,7 +80,7 @@ namespace RMuseum.Services.Implementation { try { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { RArtifactMasterRecord book = new RArtifactMasterRecord($"extracted from server folder {job.ResourceNumber}", $"extracted from server folder {job.ResourceNumber}") { @@ -106,7 +106,7 @@ namespace RMuseum.Services.Implementation meta.Add(tag); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -120,7 +120,7 @@ namespace RMuseum.Services.Implementation int order = 0; foreach (string fileName in fileNames) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order * 100 / (decimal)fileNames.Length; importJobUpdaterDb.Update(job); @@ -214,7 +214,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -241,7 +241,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportWalters.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportWalters.cs index f8a73751..082cd306 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportWalters.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtifactService-ImportWalters.cs @@ -95,7 +95,7 @@ namespace RMuseum.Services.Implementation { if (result.IsSuccessStatusCode) { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { RArtifactMasterRecord book = new RArtifactMasterRecord($"extracted from {url}", $"extracted from {url}") { @@ -113,7 +113,7 @@ namespace RMuseum.Services.Implementation string xml = await result.Content.ReadAsStringAsync(); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -240,7 +240,7 @@ namespace RMuseum.Services.Implementation order++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = order; importJobUpdaterDb.Update(job); @@ -386,7 +386,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -418,7 +418,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -445,7 +445,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -461,7 +461,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtificatService-ImportPrinceton.cs b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtificatService-ImportPrinceton.cs index 10d7e26e..c93e5df0 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Imports/ArtificatService-ImportPrinceton.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Imports/ArtificatService-ImportPrinceton.cs @@ -95,7 +95,7 @@ namespace RMuseum.Services.Implementation { if (result.IsSuccessStatusCode) { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { RArtifactMasterRecord book = new RArtifactMasterRecord($"extracted from {url}", $"extracted from {url}") { @@ -113,7 +113,7 @@ namespace RMuseum.Services.Implementation string xml = await result.Content.ReadAsStringAsync(); - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.StartTime = DateTime.Now; job.Status = ImportJobStatus.Running; @@ -173,7 +173,7 @@ namespace RMuseum.Services.Implementation { if (structure.Element("div") == null || structure.Element("div").Element("OrderedList") == null) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -191,7 +191,7 @@ namespace RMuseum.Services.Implementation foreach (var div in structure.Element("div").Element("OrderedList").Elements("div")) { inlineOrder++; - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.ProgressPercent = inlineOrder * 100 / (decimal)pageCount; importJobUpdaterDb.Update(job); @@ -338,7 +338,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -409,7 +409,7 @@ namespace RMuseum.Services.Implementation if (pages.Count == 0) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -436,7 +436,7 @@ namespace RMuseum.Services.Implementation } else { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; @@ -452,7 +452,7 @@ namespace RMuseum.Services.Implementation } catch (Exception exp) { - using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(Configuration)) + using (RMuseumDbContext importJobUpdaterDb = new RMuseumDbContext(new DbContextOptions())) { job.EndTime = DateTime.Now; job.Status = ImportJobStatus.Failed; diff --git a/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-MySqlImports.cs b/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-MySqlImports.cs index ec8231d0..91dd5bca 100644 --- a/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-MySqlImports.cs +++ b/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-MySqlImports.cs @@ -39,8 +39,8 @@ namespace RMuseum.Services.Implementation async token => { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) //this is long running job, so _context might be already been freed/collected by GC - using (RMuseumDbContext contextReport = new RMuseumDbContext(Configuration)) //this is long running job, so _context might be already been freed/collected by GC + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) //this is long running job, so _context might be already been freed/collected by GC + using (RMuseumDbContext contextReport = new RMuseumDbContext(new DbContextOptions())) //this is long running job, so _context might be already been freed/collected by GC { LongRunningJobProgressServiceEF jobProgressServiceEF = new LongRunningJobProgressServiceEF(contextReport); diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs index fe83c52c..63c2d3b7 100644 --- a/RMuseum/Services/Implementation/GanjoorService.cs +++ b/RMuseum/Services/Implementation/GanjoorService.cs @@ -2228,7 +2228,7 @@ namespace RMuseum.Services.Implementation ( async token => { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) //this is long running job, so _context might be already been freed/collected by GC + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) //this is long running job, so _context might be already been freed/collected by GC { LongRunningJobProgressServiceEF jobProgressServiceEF = new LongRunningJobProgressServiceEF(context); var job = (await jobProgressServiceEF.NewJob("HealthCheckContents", "Query data")).Result; diff --git a/RMuseum/Services/Implementation/MusicCatalogueService.cs b/RMuseum/Services/Implementation/MusicCatalogueService.cs index 5d4fe07d..fe6a7338 100644 --- a/RMuseum/Services/Implementation/MusicCatalogueService.cs +++ b/RMuseum/Services/Implementation/MusicCatalogueService.cs @@ -89,7 +89,7 @@ namespace RMuseum.Services.Implementation { - using (RMuseumDbContext context = new RMuseumDbContext(Configuration)) //this is long running job, so _context might be already been freed/collected by GC + using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) //this is long running job, so _context might be already been freed/collected by GC { if(await context.GolhaCollections.AnyAsync()) { diff --git a/RMuseum/Services/Implementation/PictureFileService.cs b/RMuseum/Services/Implementation/PictureFileService.cs index b704180e..9addd374 100644 --- a/RMuseum/Services/Implementation/PictureFileService.cs +++ b/RMuseum/Services/Implementation/PictureFileService.cs @@ -84,7 +84,7 @@ namespace RMuseum.Services.Implementation //here is a problem, this method could be called from a background service where _context is disposed, so I need to renew it - /*using(RMuseumDbContext context = new RMuseumDbContext(Configuration)) + /*using(RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { await context.PictureFiles.AddAsync(pictureFile.Result); await context.SaveChangesAsync(); @@ -144,7 +144,7 @@ namespace RMuseum.Services.Implementation return new RServiceResult(null, pictureFile.ExceptionString); //here is a problem, this method could be called from a background service where _context is disposed, so I need to renew it - /*using(RMuseumDbContext context = new RMuseumDbContext(Configuration)) + /*using(RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) { await context.PictureFiles.AddAsync(pictureFile.Result); await context.SaveChangesAsync(); diff --git a/RMuseum/Services/Implementation/RecitationService.cs b/RMuseum/Services/Implementation/RecitationService.cs index f0fb348b..ea12940c 100644 --- a/RMuseum/Services/Implementation/RecitationService.cs +++ b/RMuseum/Services/Implementation/RecitationService.cs @@ -748,7 +748,7 @@ namespace RMuseum.Services.Implementationa ( async token => { - using RMuseumDbContext context = new RMuseumDbContext(Configuration); + using RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions()); session.ProcessStartTime = DateTime.Now; double fileCount = session.UploadedFiles.Count; int processFilesCount = 0; diff --git a/RSecurityBackend/DbContext/RSecurityDbContext.cs b/RSecurityBackend/DbContext/RSecurityDbContext.cs index 8a8f5163..0a529f83 100644 --- a/RSecurityBackend/DbContext/RSecurityDbContext.cs +++ b/RSecurityBackend/DbContext/RSecurityDbContext.cs @@ -1,12 +1,14 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using RSecurityBackend.Models.Audit.Db; using RSecurityBackend.Models.Auth.Db; using RSecurityBackend.Models.Generic.Db; using RSecurityBackend.Models.Image; using RSecurityBackend.Models.Notification; using System; +using System.IO; namespace RSecurityBackend.DbContext { @@ -21,8 +23,8 @@ namespace RSecurityBackend.DbContext /// /// parameterless constructor /// - public RSecurityDbContext() - : base() + public RSecurityDbContext(DbContextOptions options) + : base(options) { } @@ -33,6 +35,21 @@ namespace RSecurityBackend.DbContext { Database.EnsureDeleted(); } + /// + /// OnConfiguring + /// + /// + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + if (!optionsBuilder.IsConfigured) + { + IConfigurationRoot configuration = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile("appsettings.json") + .Build(); + + optionsBuilder.UseSqlServer(configuration.GetConnectionString("DefaultConnection")); + } + } /// /// diff --git a/RSecurityBackend/RSecurityBackend.xml b/RSecurityBackend/RSecurityBackend.xml index 5866b935..596744f0 100644 --- a/RSecurityBackend/RSecurityBackend.xml +++ b/RSecurityBackend/RSecurityBackend.xml @@ -597,7 +597,7 @@ Security EF DbContext - + parameterless constructor @@ -607,6 +607,12 @@ delete db + + + OnConfiguring + + +