From 02617e29ef8b9dc993f6fc0aefd34bec07905155 Mon Sep 17 00:00:00 2001 From: YuukanOO Date: Fri, 4 Dec 2020 11:59:39 +0100 Subject: [PATCH] add infrastructure project --- Apps/Website/.gitignore | 2 + Apps/Website/Program.cs | 30 +- Apps/Website/Startup.cs | 17 + Apps/Website/Website.csproj | 1 + Apps/Website/appsettings.json | 3 + Infrastructure/.gitignore | 442 ++++++++++++++++++ Infrastructure/EntityTypes/LinkEntityType.cs | 18 + Infrastructure/HNDbContext.cs | 31 ++ Infrastructure/Infrastructure.csproj | 19 + .../20201204103112_CreateLink.Designer.cs | 45 ++ .../Migrations/20201204103112_CreateLink.cs | 36 ++ .../Migrations/HNDbContextModelSnapshot.cs | 43 ++ README.md | 19 + 13 files changed, 688 insertions(+), 18 deletions(-) create mode 100644 Infrastructure/.gitignore create mode 100644 Infrastructure/EntityTypes/LinkEntityType.cs create mode 100644 Infrastructure/HNDbContext.cs create mode 100644 Infrastructure/Infrastructure.csproj create mode 100644 Infrastructure/Migrations/20201204103112_CreateLink.Designer.cs create mode 100644 Infrastructure/Migrations/20201204103112_CreateLink.cs create mode 100644 Infrastructure/Migrations/HNDbContextModelSnapshot.cs diff --git a/Apps/Website/.gitignore b/Apps/Website/.gitignore index 920d1cd..7e55d6b 100644 --- a/Apps/Website/.gitignore +++ b/Apps/Website/.gitignore @@ -440,3 +440,5 @@ $RECYCLE.BIN/ !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json + +hn.db \ No newline at end of file diff --git a/Apps/Website/Program.cs b/Apps/Website/Program.cs index 6cdfa86..767bdd9 100644 --- a/Apps/Website/Program.cs +++ b/Apps/Website/Program.cs @@ -1,26 +1,20 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; namespace Website { - public class Program + public class Program + { + public static void Main(string[] args) { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); + CreateHostBuilder(args).Build().Run(); } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } } diff --git a/Apps/Website/Startup.cs b/Apps/Website/Startup.cs index ba86b20..0764120 100644 --- a/Apps/Website/Startup.cs +++ b/Apps/Website/Startup.cs @@ -1,8 +1,10 @@ using System.Threading.Tasks; using HN.Domain; +using HN.Infrastructure; using MediatR; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -29,6 +31,7 @@ namespace Website // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { + services.AddDbContext(options => options.UseSqlite(Configuration.GetConnectionString("Default"))); services.AddSingleton(); services.AddControllersWithViews(); services.AddMediatR(typeof(HN.Application.AddLinkCommand)); @@ -37,6 +40,8 @@ namespace Website // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { + MigrateDatabase(app); + if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); @@ -61,5 +66,17 @@ namespace Website pattern: "{controller=Home}/{action=Index}/{id?}"); }); } + + /// + /// Lance les migrations. En production, il est plutôt conseillé de générer + /// les scripts avec `dotnet ef migrations script` et de les passer à la main. + /// + /// + private void MigrateDatabase(IApplicationBuilder app) + { + using var scope = app.ApplicationServices.CreateScope(); + using var ctx = scope.ServiceProvider.GetRequiredService(); + ctx.Database.Migrate(); + } } } diff --git a/Apps/Website/Website.csproj b/Apps/Website/Website.csproj index 4dede8b..54d5e78 100644 --- a/Apps/Website/Website.csproj +++ b/Apps/Website/Website.csproj @@ -11,6 +11,7 @@ + diff --git a/Apps/Website/appsettings.json b/Apps/Website/appsettings.json index d9d9a9b..3eb4436 100644 --- a/Apps/Website/appsettings.json +++ b/Apps/Website/appsettings.json @@ -6,5 +6,8 @@ "Microsoft.Hosting.Lifetime": "Information" } }, + "ConnectionStrings": { + "Default": "Data Source=./hn.db" + }, "AllowedHosts": "*" } diff --git a/Infrastructure/.gitignore b/Infrastructure/.gitignore new file mode 100644 index 0000000..920d1cd --- /dev/null +++ b/Infrastructure/.gitignore @@ -0,0 +1,442 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/Infrastructure/EntityTypes/LinkEntityType.cs b/Infrastructure/EntityTypes/LinkEntityType.cs new file mode 100644 index 0000000..ab26901 --- /dev/null +++ b/Infrastructure/EntityTypes/LinkEntityType.cs @@ -0,0 +1,18 @@ +using HN.Domain; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; + +namespace HN.Infrastructure.EntityTypes +{ + public sealed class LinkEntityType : IEntityTypeConfiguration + { + public void Configure(EntityTypeBuilder builder) + { + builder.ToTable("links"); + builder.HasKey(o => o.Id); + builder.Property(o => o.Url).IsRequired().HasMaxLength(500); + builder.Property(o => o.CreatedAt).IsRequired(); + builder.HasIndex(o => o.Url).IsUnique(); + } + } +} diff --git a/Infrastructure/HNDbContext.cs b/Infrastructure/HNDbContext.cs new file mode 100644 index 0000000..5414399 --- /dev/null +++ b/Infrastructure/HNDbContext.cs @@ -0,0 +1,31 @@ +using HN.Domain; +using Microsoft.EntityFrameworkCore; + +namespace HN.Infrastructure +{ + public sealed class HNDbContext : DbContext + { + public DbSet Links { get; set; } + + public HNDbContext() + { + + } + + public HNDbContext(DbContextOptions options) : base(options) + { + + } + + protected override void OnModelCreating(ModelBuilder modelBuilder) => modelBuilder.ApplyConfigurationsFromAssembly(this.GetType().Assembly); + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + // Si pas déjà configuré plus tôt dans la chaîne, comme c'est le cas dans l'appli Asp.Net Core + if (!optionsBuilder.IsConfigured) + { + optionsBuilder.UseSqlite("Data Source=:memory:"); + } + } + } +} diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj new file mode 100644 index 0000000..e7df2a7 --- /dev/null +++ b/Infrastructure/Infrastructure.csproj @@ -0,0 +1,19 @@ + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + net5.0 + + + diff --git a/Infrastructure/Migrations/20201204103112_CreateLink.Designer.cs b/Infrastructure/Migrations/20201204103112_CreateLink.Designer.cs new file mode 100644 index 0000000..6aa38d1 --- /dev/null +++ b/Infrastructure/Migrations/20201204103112_CreateLink.Designer.cs @@ -0,0 +1,45 @@ +// +using System; +using HN.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace Infrastructure.Migrations +{ + [DbContext(typeof(HNDbContext))] + [Migration("20201204103112_CreateLink")] + partial class CreateLink + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "5.0.0"); + + modelBuilder.Entity("HN.Domain.Link", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Url") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Url") + .IsUnique(); + + b.ToTable("links"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Infrastructure/Migrations/20201204103112_CreateLink.cs b/Infrastructure/Migrations/20201204103112_CreateLink.cs new file mode 100644 index 0000000..47a6753 --- /dev/null +++ b/Infrastructure/Migrations/20201204103112_CreateLink.cs @@ -0,0 +1,36 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Infrastructure.Migrations +{ + public partial class CreateLink : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "links", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + Url = table.Column(type: "TEXT", maxLength: 500, nullable: false), + CreatedAt = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_links", x => x.Id); + }); + + migrationBuilder.CreateIndex( + name: "IX_links_Url", + table: "links", + column: "Url", + unique: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "links"); + } + } +} diff --git a/Infrastructure/Migrations/HNDbContextModelSnapshot.cs b/Infrastructure/Migrations/HNDbContextModelSnapshot.cs new file mode 100644 index 0000000..c5f1f74 --- /dev/null +++ b/Infrastructure/Migrations/HNDbContextModelSnapshot.cs @@ -0,0 +1,43 @@ +// +using System; +using HN.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace Infrastructure.Migrations +{ + [DbContext(typeof(HNDbContext))] + partial class HNDbContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "5.0.0"); + + modelBuilder.Entity("HN.Domain.Link", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Url") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Url") + .IsUnique(); + + b.ToTable("links"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/README.md b/README.md index 7f6551e..b440db4 100644 --- a/README.md +++ b/README.md @@ -47,3 +47,22 @@ On peut aussi installer les outils de scaffolding avec `dotnet tool install -g d On ajoute les extensions MediatR pour pouvoir facilement enregistrer les services dans le conteneur IoC d'ASP.Net Core avec `dotnet add package MediatR.Extensions.Microsoft.DependencyInjection`. Pour la couche d'infrastructure, il nous faut implémenter notre `ILinkRepository` avec EF Core dans un nouveau projet `Infrastructure`. + +```console +$ dotnet new classlib -o Infrastructure +$ cd Infrastructure +$ dotnet new gitignore +$ dotnet add package Microsoft.EntityFrameworkCore.Sqlite +$ dotnet add package Microsoft.EntityFrameworkCore.Design +``` + +On installe les outils Entity framework `dotnet tool install --global dotnet-ef`. + +Pour plus tard, pour la génération de doc : + +project.csproj + + + true + bin\YourApi.XML +