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

refactor: #150 mettre à jour appsettings et introduire des enums pour les types Seeder et Repository

Browse Source
This commit is contained in:
mirage
2026-03-31 10:07:47 +02:00
parent c65c0113af
commit 63e755c5c7
7 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
}

23
Webzine.WebApplication/Dockerfile
View File

@@ -1,23 +0,0 @@
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
USER $APP_UID
WORKDIR /app
EXPOSE 8080
EXPOSE 8081
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Webzine.WebApplication/Webzine.WebApplication.csproj", "Webzine.WebApplication/"]
RUN dotnet restore "Webzine.WebApplication/Webzine.WebApplication.csproj"
COPY . .
WORKDIR "/src/Webzine.WebApplication"
RUN dotnet build "./Webzine.WebApplication.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./Webzine.WebApplication.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "Webzine.WebApplication.dll"]

42
Webzine.WebApplication/Program.cs
View File

@@ -8,6 +8,7 @@ using Webzine.Entity;
using Webzine.Entity.Fixtures;
using Webzine.Repository;
using Webzine.Repository.Contracts;
using Webzine.WebApplication.Configuration;
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.
@@ -32,19 +33,19 @@ try
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.
bool useDatabase = builder.Configuration.GetValue<bool>("UseDatabase");
bool isSQLite = builder.Configuration.GetValue<bool>("IsSQLite");
if (useDatabase)
var repositoryType = builder.Configuration.GetValue<RepositoryType>("Repository");
var seederType = builder.Configuration.GetValue<SeederType>("Seeder");
if (repositoryType == RepositoryType.Db)
{
if (isSQLite)
if (builder.Environment.IsProduction())
{
builder.Services.AddDbContext<WebzineDbContext>(options =>
options.UseSqlite(builder.Configuration.GetConnectionString("SqliteConnection")));
options.UseNpgsql(builder.Configuration.GetConnectionString("PostGreSQLConnection")));
}
else
{
builder.Services.AddDbContext<WebzineDbContext>(options =>
options.UseNpgsql(builder.Configuration.GetConnectionString("PostGreSQLConnection")));
options.UseSqlite(builder.Configuration.GetConnectionString("SqliteConnection")));
}
builder.Services.AddScoped<DbEntityRepository>();
@@ -68,30 +69,15 @@ try
var app = builder.Build();
if (useDatabase)
if (repositoryType == RepositoryType.Db)
{
if (isSQLite)
using (var scope = app.Services.CreateScope())
{
using (var scope = app.Services.CreateScope())
{
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())
{
// 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();
}
var db = scope.ServiceProvider.GetRequiredService<WebzineDbContext>();
db.Database.EnsureDeleted();
db.Database.EnsureCreated();
var repo = scope.ServiceProvider.GetRequiredService<DbEntityRepository>();
repo.SeedBaseDeDonnees();
}
}
else

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

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

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

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

6
Webzine.WebApplication/appsettings.json
View File

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