Closes #60

Modularize backend

backend/Dockerfile

@@ -5,6 +5,7 @@ WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
+#Todo: clean it up for multiproject build
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY src/api/api.csproj src/api/

backend/src/api/Controllers/TodoController.cs

@@ -1,4 +1,4 @@
-using api.Services;
+using core.Ports;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

backend/src/api/Program.cs

@@ -1,12 +1,13 @@
-using api.Data;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
-using Microsoft.EntityFrameworkCore;
 using Serilog;
-using api;
 using System.Security.Cryptography;
-using api.Services;
+using api;
+using infrastructure.Data;
+using infrastructure.Keycloak;
+using core.Ports;
 
 const string logFormat = "[{Timestamp:HH:mm:ss} {Level:u3}] {CorelationId} | {Message:lj}{NewLine}{Exception}";
 Log.Logger = new LoggerConfiguration().Enrich.WithCorrelationId()
@@ -19,7 +20,10 @@
     var builder = WebApplication.CreateBuilder(args);
     builder.Services.AddHttpContextAccessor();
     builder.Host.UseSerilog();
-    builder.Services.AddDbContext<ApplicationDbContext>(options => options.UseNpgsql(builder.Configuration.GetConnectionString("KSummarized")));
+    builder.Services.AddDbContext<ApplicationDbContext>(
+        options => options.UseNpgsql(builder.Configuration.GetConnectionString("KSummarized"),
+        x => x.MigrationsAssembly("infrastructure")
+    ));
     var keycloakJwtOptions = builder.Configuration.GetRequiredSection("KeycloakJwt").Get<KeycloakJwtOptions>()!;
 
     // Create RSA key for offline validation of Keycloak token

backend/src/api/api.csproj

@@ -11,10 +11,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
@@ -27,4 +26,9 @@
     <Folder Include="Migrations/" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\infrastructure\infrastructure.csproj" />
+    <ProjectReference Include="..\core\core.csproj" />
+  </ItemGroup>
+
 </Project>

backend/src/core/Ports/ITodoService.cs

@@ -0,0 +1,10 @@
+namespace core.Ports;
+
+public interface ITodoService
+{
+    Task<TodoList> CreateList(string user, string name);
+    IEnumerable<TodoList> GetLists(string userId);
+    TodoList? GetList(string userId, int id);
+    bool DeleteList(string userId, int id);
+    Task<bool> RenameList(string user, int id, string name);
+}

backend/src/core/TodoList.cs

@@ -0,0 +1,10 @@
+namespace core;
+
+public class TodoList
+{
+    public int Id { get; set; }
+    public required string Name { get; set; }
+    public required Guid Owner { get; set; }
+
+    public bool IsAuthorized(Guid person) => Owner.Equals(person);
+}

backend/src/core/core.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

backend/src/api/Data/ApplicationDbContext.cs → backend/src/infrastructure/Data/ApplicationDbContext.cs

@@ -1,7 +1,6 @@
-using api.Data.DAO;
 using Microsoft.EntityFrameworkCore;
 
-namespace api.Data;
+namespace infrastructure.Data;
 
 public class ApplicationDbContext : DbContext
 {

backend/src/api/Data/DAO/TodoListModel.cs → backend/src/infrastructure/Data/TodoListModel.cs

@@ -1,7 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace api.Data.DAO;
+namespace infrastructure.Data;
 
 [Table("todo_lists")]
 public class TodoListModel

backend/src/api/Services/Todo/TodoService.cs → backend/src/infrastructure/Data/TodoService.cs

@@ -1,9 +1,8 @@
-using api.Data;
-using api.Data.DAO;
-using api.Data.DTO;
 using Microsoft.EntityFrameworkCore;
+using core.Ports;
+using core;
 
-namespace api.Services;
+namespace infrastructure.Data;
 
 public class TodoService : ITodoService
 {
@@ -15,29 +14,29 @@ public TodoService(ApplicationDbContext context)
         _context = context;
     }
 
-    public IEnumerable<TodoListDTO> GetLists(string userId)
+    public IEnumerable<TodoList> GetLists(string userId)
     {
         return _context.TodoLists.AsNoTracking()
                                  .Where(list => list.Owner.Equals(Guid.Parse(userId)))
-                                 .Select(list => new TodoListDTO(list.Id, list.Name))
+                                 .Select(list => new TodoList { Id = list.Id, Name = list.Name, Owner = list.Owner })
                                  .AsEnumerable();
     }
 
-    public TodoListDTO? GetList(string userId, int id)
+    public TodoList? GetList(string userId, int id)
     {
         var list = _context.TodoLists.AsNoTracking()
                                  .SingleOrDefault(l => l.Owner.Equals(Guid.Parse(userId)) && l.Id == id);
         //TODO: Consider creating a mapper instead of this manual new
-        if (list is not null) { return new(list.Id, list.Name); }
+        if (list is not null) { return new() { Id = list.Id, Name = list.Name, Owner = list.Owner }; }
         return null;
     }
 
-    public async Task<TodoListModel> CreateList(string user, string name)
+    public async Task<TodoList> CreateList(string user, string name)
     {
         var newList = new TodoListModel() { Name = name, Owner = Guid.Parse(user) };
         _context.TodoLists.Add(newList);
         await _context.SaveChangesAsync();
-        return newList;
+        return new TodoList() { Id = newList.Id, Name = newList.Name, Owner = newList.Owner };
     }
 
     public bool DeleteList(string userId, int id)

backend/src/api/Data/KeycloakJwtOptions.cs → backend/src/infrastructure/Keycloack/KeycloakJwtOptions.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace api.Data;
+namespace infrastructure.Keycloak;
 public class KeycloakJwtOptions
 {
     public required string Issuer { get; init; }

backend/src/api/Migrations/20240330212015_TodoList.cs → backend/src/infrastructure/Migrations/20240330212015_TodoList.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
 
-namespace api.Migrations
+namespace infrastructure.Migrations
 {
     /// <inheritdoc />
     public partial class TodoList : Migration

backend/src/api/Migrations/ApplicationDbContextModelSnapshot.cs → backend/src/infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1,14 +1,14 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using api.Data;
+using infrastructure.Data;
 
 #nullable disable
 
-namespace api.Migrations
+namespace infrastructure.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot

backend/src/infrastructure/infrastructure.csproj

@@ -6,4 +6,17 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\core\core.csproj" />
+  </ItemGroup>
+
 </Project>

scripts/apply_migrations.ps1

@@ -11,9 +11,9 @@ get-content ../.env | foreach {
 Write-Host "Starting DB"
 docker compose up db -d 2>&1 > $null
 Write-Output "Generateing migration script"
-Set-Location ../backend/src/api
+Set-Location ../backend
 mkdir migration_scripts 2>&1 > $null
-dotnet ef migrations script --idempotent -o ./migration_scripts/migration.sql
+dotnet ef migrations script --idempotent -o ./migration_scripts/migration.sql -p ./src/infrastructure -s ./src/api
 
 Write-Output "Applying.."
 $passwd = "PGPASSWORD=" + $Env:POSTGRES_PASSWORD
@@ -24,7 +24,7 @@ docker run --network host -e $passwd -v ${src}:/migrations/ --rm postgres `
 
 Write-Output "Cleanup"
 Remove-Item -Recurse -Force migration_scripts
-Set-Location ../../../scripts
+Set-Location ../scripts
 Write-Output "Migrations had been applyed!"
 Write-Host "Stoping DB"
 docker stop ks-database 2>&1 > $null