diff --git a/Controllers/DisableController.cs b/Controllers/DisableController.cs index 78248a5..587493c 100644 --- a/Controllers/DisableController.cs +++ b/Controllers/DisableController.cs @@ -1706,8 +1706,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers }) .FirstOrDefaultAsync(); - // return Success(new { data, ExamCount = data == null || data.CitizenId == "" ? 0 : GetExamCountTe(data.CitizenId) }); - return Success(data); + return Success(new { data, ExamCount = data == null || data.CitizenId == "" ? 0 : _disableService.GetExamCount(data.CitizenId) }); } catch (Exception ex) { diff --git a/Data/MetadataDbContext.cs b/Data/MetadataDbContext.cs index 578579d..03fb08a 100644 --- a/Data/MetadataDbContext.cs +++ b/Data/MetadataDbContext.cs @@ -20,19 +20,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Data // special "local" folder for your platform. protected override void OnConfiguring(DbContextOptionsBuilder options) { - if (!options.IsConfigured) - { - var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configurationBuilder = new ConfigurationBuilder() - .AddJsonFile("appsettings.json", optional: true, true) - .AddJsonFile($"appsettings.{environment}.json", true, true) - .AddEnvironmentVariables() - .Build(); + // if (!options.IsConfigured) + // { + // var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; + // var configurationBuilder = new ConfigurationBuilder() + // .AddJsonFile("appsettings.json", optional: true, true) + // .AddJsonFile($"appsettings.{environment}.json", true, true) + // .AddEnvironmentVariables() + // .Build(); - var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection"); - options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection)); + // var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection"); + // options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection)); - } + // } } // public DbSet ProfileOrganizations { get; set; } // public DbSet Profiles { get; set; } diff --git a/Data/OrgDbContext.cs b/Data/OrgDbContext.cs index c199ccc..696143e 100644 --- a/Data/OrgDbContext.cs +++ b/Data/OrgDbContext.cs @@ -20,19 +20,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Data // special "local" folder for your platform. protected override void OnConfiguring(DbContextOptionsBuilder options) { - if (!options.IsConfigured) - { - var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configurationBuilder = new ConfigurationBuilder() - .AddJsonFile("appsettings.json", optional: true, true) - .AddJsonFile($"appsettings.{environment}.json", true, true) - .AddEnvironmentVariables() - .Build(); + // if (!options.IsConfigured) + // { + // var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; + // var configurationBuilder = new ConfigurationBuilder() + // .AddJsonFile("appsettings.json", optional: true, true) + // .AddJsonFile($"appsettings.{environment}.json", true, true) + // .AddEnvironmentVariables() + // .Build(); - var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection"); - options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection)); + // var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection"); + // options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection)); - } + // } } public DbSet prefixe { get; set; } public DbSet religion { get; set; } diff --git a/Program.cs b/Program.cs index c2b8de5..077f7d1 100644 --- a/Program.cs +++ b/Program.cs @@ -64,13 +64,13 @@ builder.Host.UseSerilog(); // Register DbContext var examConnection = builder.Configuration.GetConnectionString("ExamConnection"); builder.Services.AddDbContext(options => - options.UseMySql(examConnection, ServerVersion.AutoDetect(examConnection))); + options.UseMySql(examConnection, ServerVersion.AutoDetect(examConnection)), ServiceLifetime.Transient); var orgConnection = builder.Configuration.GetConnectionString("OrgConnection"); builder.Services.AddDbContext(options => - options.UseMySql(orgConnection, ServerVersion.AutoDetect(orgConnection))); + options.UseMySql(orgConnection, ServerVersion.AutoDetect(orgConnection)), ServiceLifetime.Transient); var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection"); builder.Services.AddDbContext(options => - options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection))); + options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)), ServiceLifetime.Transient); // Add config CORS builder.Services.AddCors(options => options.AddDefaultPolicy(builder => diff --git a/appsettings.json b/appsettings.json index 84e115d..96572ba 100644 --- a/appsettings.json +++ b/appsettings.json @@ -13,13 +13,13 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" + "HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", diff --git a/bin/Debug/net7.0/appsettings.json b/bin/Debug/net7.0/appsettings.json index 84e115d..96572ba 100644 --- a/bin/Debug/net7.0/appsettings.json +++ b/bin/Debug/net7.0/appsettings.json @@ -13,13 +13,13 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" + "HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",