lmasi/webzine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'refactor: application env database et seed config' (#153) from j3/refactor/appsetting into dev

Browse Source 
Reviewed-on: https://10.4.0.131/gitea/DI1-P4-E1/Webzine/pulls/153
Reviewed-by: Loic Masi <loic.masi@diiage.org>
This commit is contained in:
c.bobin
2026-03-31 15:52:41 +02:00
parent ea077d9398 690c348b35
commit 21e1ab438c
7 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Webzine.WebApplication/Dockerfile → Dockerfile
View File

@@ -7,7 +7,7 @@ EXPOSE 8081
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
WORKDIR /src WORKDIR /src
COPY ["Webzine.WebApplication/Webzine.WebApplication.csproj", "Webzine.WebApplication/"] COPY ["./Webzine.WebApplication/Webzine.WebApplication.csproj", "Webzine.WebApplication/"]
RUN dotnet restore "Webzine.WebApplication/Webzine.WebApplication.csproj" RUN dotnet restore "Webzine.WebApplication/Webzine.WebApplication.csproj"
COPY . . COPY . .
WORKDIR "/src/Webzine.WebApplication" WORKDIR "/src/Webzine.WebApplication"

13
Webzine.WebApplication/Configuration/AppEnums.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace Webzine.WebApplication.Configuration;
public enum SeederType
{
Local,
Spotify
}
public enum RepositoryType
{
Local,
Db
}

2
Webzine.WebApplication/Controllers/ApiController.cs
View File

@@ -29,7 +29,7 @@ public class ApiController : ControllerBase
return this.Ok(new return this.Ok(new
{ {
nom = "webzine", nom = "webzine",
version = "2.0", version = "3.0",
}); });
} }
} }

30
Webzine.WebApplication/Program.cs
View File

@@ -11,6 +11,7 @@ using Webzine.Entity;
using Webzine.Entity.Fixtures; using Webzine.Entity.Fixtures;
using Webzine.Repository; using Webzine.Repository;
using Webzine.Repository.Contracts; using Webzine.Repository.Contracts;
using Webzine.WebApplication.Configuration;
using Webzine.WebApplication.Extensions; using Webzine.WebApplication.Extensions;
// Initiation du logger NLog pour la classe courante afin de pouvoir l'utiliser pour logger des messages d'information, d'erreur, etc avant la construction de l'application. // Initiation du logger NLog pour la classe courante afin de pouvoir l'utiliser pour logger des messages d'information, d'erreur, etc avant la construction de l'application.
@@ -35,19 +36,19 @@ try
builder.Host.UseNLog(); builder.Host.UseNLog();
// En fonction de la configuration, utilise soit les repositories basés sur une base de données, soit les repositories basés sur des listes locales. // En fonction de la configuration, utilise soit les repositories basés sur une base de données, soit les repositories basés sur des listes locales.
bool useDatabase = builder.Configuration.GetValue<bool>("UseDatabase"); var repositoryType = builder.Configuration.GetValue<RepositoryType>("Repository");
bool isSQLite = builder.Configuration.GetValue<bool>("IsSQLite"); var seederType = builder.Configuration.GetValue<SeederType>("Seeder");
if (useDatabase) if (repositoryType == RepositoryType.Db)
{ {
if (isSQLite) if (builder.Environment.IsProduction())
{ {
builder.Services.AddDbContext<WebzineDbContext>(options => builder.Services.AddDbContext<WebzineDbContext>(options =>
options.UseSqlite(builder.Configuration.GetConnectionString("SqliteConnection"))); options.UseNpgsql(builder.Configuration.GetConnectionString("PostGreSQLConnection")));
} }
else else
{ {
builder.Services.AddDbContext<WebzineDbContext>(options => builder.Services.AddDbContext<WebzineDbContext>(options =>
options.UseNpgsql(builder.Configuration.GetConnectionString("PostGreSQLConnection"))); options.UseSqlite(builder.Configuration.GetConnectionString("SqliteConnection")));
} }
builder.Services.AddScoped<DbEntityRepository>(); builder.Services.AddScoped<DbEntityRepository>();
@@ -71,9 +72,7 @@ try
var app = builder.Build(); var app = builder.Build();
if (useDatabase) if (repositoryType == RepositoryType.Db)
{
if (isSQLite)
{ {
using (var scope = app.Services.CreateScope()) using (var scope = app.Services.CreateScope())
{ {
@@ -85,19 +84,6 @@ try
} }
} }
else else
{
using (var scope = app.Services.CreateScope())
{
// TODO : A modifier pour ne pas supprimer la base de donnée en prod
var db = scope.ServiceProvider.GetRequiredService<WebzineDbContext>();
db.Database.EnsureDeleted();
db.Database.EnsureCreated();
var repo = scope.ServiceProvider.GetRequiredService<DbEntityRepository>();
repo.SeedBaseDeDonnees();
}
}
}
else
{ {
using (var scope = app.Services.CreateScope()) using (var scope = app.Services.CreateScope())
{ {

8
Webzine.WebApplication/appsettings.Development.json
View File

@@ -1,8 +1,4 @@
{ {
"Logging": { "Seeder": "Local",
"LogLevel": { "Repository": "Db"
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
} }

4
Webzine.WebApplication/appsettings.Production.json Normal file
View File

@@ -0,0 +1,4 @@
{
"Seeder": "Local",
"Repository": "Db"
}

2
Webzine.WebApplication/appsettings.json
View File

@@ -9,8 +9,6 @@
"NombreDerniereChronique": 3, "NombreDerniereChronique": 3,
"NombreDeTopTitres": 3 "NombreDeTopTitres": 3
}, },
"UseDatabase": true,
"IsSQLite": true,
"ConnectionStrings": { "ConnectionStrings": {
"SqliteConnection": "Data Source=Data/webzine.sqlite", "SqliteConnection": "Data Source=Data/webzine.sqlite",
"PostGreSQLConnection": "Host=localhost;Port=5432;Username=admin;Password=admin123;Database=webzine_db" "PostGreSQLConnection": "Host=localhost;Port=5432;Username=admin;Password=admin123;Database=webzine_db"