Resolved all merge conflicts
This commit is contained in:
parent
319e643688
commit
2f8feee518
|
@ -27,21 +27,21 @@ namespace ScrumTaskboard
|
||||||
// This method gets called by the runtime. Use this method to add services to the container.
|
// This method gets called by the runtime. Use this method to add services to the container.
|
||||||
public void ConfigureServices(IServiceCollection services)
|
public void ConfigureServices(IServiceCollection services)
|
||||||
{
|
{
|
||||||
{
|
|
||||||
services.AddCors(o => o.AddPolicy("AllowAll", builder =>
|
services.AddCors(o => o.AddPolicy("AllowAll", builder =>
|
||||||
{
|
{
|
||||||
builder.AllowAnyOrigin()
|
builder.AllowAnyOrigin()
|
||||||
.AllowAnyMethod()
|
.AllowAnyMethod()
|
||||||
.AllowAnyHeader();
|
.AllowAnyHeader();
|
||||||
}));
|
}));
|
||||||
services.AddScoped(serviceProvider => new TaskContext(
|
|
||||||
new DbContextOptionsBuilder<TaskContext>()
|
|
||||||
.UseNpgsql(GetConnectionString())
|
|
||||||
services.AddMvc().AddJsonOptions(o =>
|
services.AddMvc().AddJsonOptions(o =>
|
||||||
{
|
{
|
||||||
o.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
|
o.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
|
||||||
o.JsonSerializerOptions.IgnoreNullValues = true;
|
o.JsonSerializerOptions.IgnoreNullValues = true;
|
||||||
});
|
});
|
||||||
|
services.AddScoped(serviceProvider => new TaskContext(
|
||||||
|
new DbContextOptionsBuilder<TaskContext>()
|
||||||
|
.UseNpgsql(GetConnectionString())
|
||||||
|
.Options));
|
||||||
services.AddControllers();
|
services.AddControllers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,5 +71,36 @@ namespace ScrumTaskboard
|
||||||
endpoints.MapControllers();
|
endpoints.MapControllers();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates DB Connection String based on ENV vars and default vars.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string GetConnectionString()
|
||||||
|
{
|
||||||
|
string dbHost;
|
||||||
|
string dbPort;
|
||||||
|
string dbName;
|
||||||
|
string dbUser;
|
||||||
|
string dbPassword;
|
||||||
|
|
||||||
|
dbHost = Environment.GetEnvironmentVariable("DATABASE_HOST");
|
||||||
|
dbPort = Environment.GetEnvironmentVariable("DATABASE_PORT");
|
||||||
|
dbName = Environment.GetEnvironmentVariable("DATABASE_NAME");
|
||||||
|
dbUser = Environment.GetEnvironmentVariable("DATABASE_USER");
|
||||||
|
dbPassword = Environment.GetEnvironmentVariable("DATABASE_PASSWORD");
|
||||||
|
|
||||||
|
if(dbHost == null || dbPort == null || dbName == null || dbUser == null || dbPassword == null)
|
||||||
|
{
|
||||||
|
dbHost = "nig.gl";
|
||||||
|
dbPort = "8543";
|
||||||
|
dbName = "taskboard";
|
||||||
|
dbUser = "scrum";
|
||||||
|
dbPassword = "c6gXud7YvBWp2sgxSgy4wRN";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return $"Host={dbHost}; Port={dbPort}; Username={dbUser}; Database={dbName}; Password={dbPassword}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue