Wip: languages

src/Expressio/Controllers/ExpressionsController.cs

@@ -9,30 +9,40 @@
 
 namespace Expressio.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("api/{lang}/[controller]")]
     [ApiController]
     public class ExpressionsController : ControllerBase
     {
-        private readonly ExpressionContext _context;
+        private readonly ExpressioContext _context;
 
-        public ExpressionsController(ExpressionContext context)
+        public ExpressionsController(ExpressioContext context)
         {
             context.Database.EnsureCreated();
             _context = context;
         }
 
         // GET: api/Expressions
         [HttpGet]
-        public async Task<ActionResult<IEnumerable<Expression>>> GetExpressions()
+        public async Task<ActionResult<IEnumerable<ExpressionDTO>>> GetExpressions(string lang)
         {
-            return await _context.Expressions.ToListAsync();
+            return await _context
+                .Expressions
+                .Include(e => e.Language)
+                .Select(e =>
+                    new ExpressionDTO() {
+                        Id = e.Id,
+                        Content = e.Content,
+                        Definitions = e.Definitions
+                    }
+                )
+                .ToListAsync();
         }
 
         // GET: api/Expressions/5
         [HttpGet("{id}")]
         public async Task<ActionResult<Expression>> GetExpression(long id)
         {
-            var Expression = await _context.Expressions.FindAsync(id);
+            var Expression = _context.Languages.First().Expressions.ToList().Find(e => e.Id == id);
 
             if (Expression == null)
             {
@@ -41,10 +51,5 @@ public async Task<ActionResult<Expression>> GetExpression(long id)
 
             return Expression;
         }
-
-        private bool ExpressionExists(long id)
-        {
-            return _context.Expressions.Any(e => e.Id == id);
-        }
     }
 }

src/Expressio/Controllers/MixedExpressionsController.cs

@@ -8,14 +8,14 @@ namespace Expressio.Controllers
     [ApiController]
     public class MixedExpressionsController : ControllerBase
     {
-        private readonly ExpressionContext _context;
+        private readonly ExpressioContext _context;
         private readonly Mixer _mixer;
 
-        public MixedExpressionsController(ExpressionContext context)
+        public MixedExpressionsController(ExpressioContext context)
         {
             context.Database.EnsureCreated();
             _context = context;
-            _mixer = new Mixer(_context.Expressions.ToList());
+            _mixer = new Mixer(_context.Languages.First().Expressions.ToList());
         }
 
         [HttpGet("random")]

src/Expressio/Models/ExpressioContext.cs

@@ -0,0 +1,34 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace Expressio.Models;
+
+public class ExpressioContext : DbContext
+{
+    public ExpressioContext(DbContextOptions<ExpressioContext> options)
+        : base(options)
+    {
+    }
+
+    public ExpressioContext()
+        : base()
+    {
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<Language>()
+            .HasMany(e => e.Expressions)
+            .WithOne(e => e.Language)
+            .HasForeignKey("LanguageId")
+            .IsRequired();
+        modelBuilder.Entity<Language>().HasData(
+            new Language(){ Id = 1, Code = "fr" }
+        );
+        modelBuilder.Entity<Expression>().HasData(
+            new FileLoader("Resources/expressions_fr.json").Load().Skip(3000)
+        );
+    }
+
+    public virtual DbSet<Language> Languages { get; set; }
+    public virtual DbSet<Expression> Expressions { get; set; }
+}

src/Expressio/Models/Expression.cs

@@ -1,3 +1,5 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using Humanizer;
 
 namespace Expressio.Models;
@@ -6,7 +8,9 @@ public class Expression
 {
     public long Id { get; set; }
     public required string Content { get; set; }
-    public string[]? Definitions { get; set; }
+    public List<string>? Definitions { get; set; }
+    public long LanguageId { get; set; }
+    public Language Language { get; set; }
 
     public IEnumerable<string> Words()
     {

src/Expressio/Models/ExpressionDTO.cs

@@ -0,0 +1,6 @@
+public class ExpressionDTO
+{
+    public long Id { get; set; }
+    public required string Content { get; set; }
+    public List<string>? Definitions { get; set; }
+}

src/Expressio/Models/FileLoader.cs

@@ -14,7 +14,7 @@ public FileLoader(string path)
         Path = path;
     }
 
-    public IEnumerable<Expression> Load()
+    public List<Expression> Load()
     {
         using (StreamReader r = new StreamReader(Path))
         {

src/Expressio/Models/Language.cs

@@ -0,0 +1,12 @@
+using Expressio.Controllers;
+using Microsoft.EntityFrameworkCore;
+
+namespace Expressio.Models;
+
+public class Language
+{
+    public long Id { get; set; }
+    public required string Code { get; set; }
+    public virtual ICollection<Expression> Expressions { get; set; }
+
+}

src/Expressio/Program.cs

@@ -4,7 +4,7 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllers();
-builder.Services.AddDbContext<ExpressionContext>(opt => opt.UseInMemoryDatabase("Expressio"));
+builder.Services.AddDbContext<ExpressioContext>(opt => opt.UseInMemoryDatabase("Expressio"));
 builder.Services.AddEndpointsApiExplorer();
 
 builder.Services.AddSwaggerGen();