stwaddle/budget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split into Budget.Core / Budget.Infrastructure / Budget.Api projects

Browse Source 
Budget.Core: entities, DTOs, enums, FrequencyCalculator (no EF/ASP.NET deps)
Budget.Infrastructure: AppDbContext, migrations, BudgetAuthorizationService
Budget.Api: controllers, middleware, Program.cs — references both projects

EF and Npgsql packages moved to Infrastructure; Api retains only JwtBearer,
HealthChecks, and EF.Design (needed for dotnet ef CLI). Dockerfile updated
to copy all three project directories before publishing. Migration namespaces
updated from Budget.Api.Data.* to Budget.Infrastructure.Data.* and model
type strings updated to Budget.Core.Models.* in the snapshot.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Spencer Twaddle
2026-05-02 16:30:31 -05:00
parent c3d1420c4c
commit 087fbdd176
37 changed files with 826 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Budget.Api/Budget.Api.csproj
+5 -2
View File
@@ -8,13 +8,16 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.7" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Budget.Core\Budget.Core.csproj" />
<ProjectReference Include="..\Budget.Infrastructure\Budget.Infrastructure.csproj" />
</ItemGroup>
</Project>
src/Budget.Api/Controllers/BudgetsController.cs
+6 -4
View File
@@ -1,11 +1,13 @@
using Budget.Api.Data;
using Budget.Api.DTOs;
using Budget.Api.Models;
using Budget.Api.Services;
using Budget.Core.DTOs;
using Budget.Core.Models;
using Budget.Infrastructure.Data;
using Budget.Infrastructure.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.RateLimiting;
using Microsoft.EntityFrameworkCore;
using BudgetEntity = Budget.Core.Models.Budget;
namespace Budget.Api.Controllers;
@@ -39,7 +41,7 @@ public class BudgetsController(AppDbContext db, BudgetAuthorizationService authz
public async Task<IActionResult> Create([FromBody] CreateBudgetRequest req)
{
if (TryGetUserId(out var userId) is { } err) return err;
var budget = new Models.Budget
var budget = new BudgetEntity
{
Id = Guid.NewGuid(),
Name = req.Name,
src/Budget.Api/Controllers/IncomesController.cs
+5 -3
View File
@@ -1,7 +1,9 @@
using Budget.Api.Data;
using Budget.Api.DTOs;
using Budget.Api.Models;
using Budget.Api.Services;
using Budget.Core.DTOs;
using Budget.Core.Models;
using Budget.Core.Services;
using Budget.Infrastructure.Data;
using Budget.Infrastructure.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.RateLimiting;
src/Budget.Api/Controllers/OutgosController.cs
+5 -3
View File
@@ -1,7 +1,9 @@
using Budget.Api.Data;
using Budget.Api.DTOs;
using Budget.Api.Models;
using Budget.Api.Services;
using Budget.Core.DTOs;
using Budget.Core.Models;
using Budget.Core.Services;
using Budget.Infrastructure.Data;
using Budget.Infrastructure.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.RateLimiting;
src/Budget.Api/Controllers/SharesController.cs
+4 -3
View File
@@ -1,7 +1,8 @@
using Budget.Api.Data;
using Budget.Api.DTOs;
using Budget.Api.Models;
using Budget.Api.Services;
using Budget.Core.DTOs;
using Budget.Core.Models;
using Budget.Infrastructure.Data;
using Budget.Infrastructure.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.RateLimiting;
src/Budget.Api/Controllers/SummaryController.cs
+5 -3
View File
@@ -1,7 +1,9 @@
using Budget.Api.Data;
using Budget.Api.DTOs;
using Budget.Api.Models;
using Budget.Api.Services;
using Budget.Core.DTOs;
using Budget.Core.Models;
using Budget.Core.Services;
using Budget.Infrastructure.Data;
using Budget.Infrastructure.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.RateLimiting;
src/Budget.Api/Program.cs
+2 -1
View File
@@ -1,6 +1,7 @@
using System.Threading.RateLimiting;
using Budget.Api.Data;
using Budget.Api.Services;
using Budget.Infrastructure.Data;
using Budget.Infrastructure.Services;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.HttpOverrides;
src/Budget.Api/Services/KnownUserMiddleware.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using Budget.Api.Data;
using Budget.Api.Models;
using Budget.Core.Models;
using Budget.Infrastructure.Data;
using Microsoft.EntityFrameworkCore;
namespace Budget.Api.Services;
src/Budget.Core/Budget.Core.csproj
+9
View File
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
src/Budget.Api/DTOs/BudgetDtos.cs → src/Budget.Core/DTOs/BudgetDtos.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace Budget.Api.DTOs;
namespace Budget.Core.DTOs;
public record BudgetDto(Guid Id, string Name, decimal EffectiveTaxRate, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt);
src/Budget.Api/DTOs/IncomeDtos.cs → src/Budget.Core/DTOs/IncomeDtos.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Budget.Api.Models;
using Budget.Core.Models;
namespace Budget.Api.DTOs;
namespace Budget.Core.DTOs;
public record IncomeDto(
Guid Id,
src/Budget.Api/DTOs/OutgoDtos.cs → src/Budget.Core/DTOs/OutgoDtos.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Budget.Api.Models;
using Budget.Core.Models;
namespace Budget.Api.DTOs;
namespace Budget.Core.DTOs;
public record OutgoDto(
Guid Id,
src/Budget.Api/DTOs/ShareDtos.cs → src/Budget.Core/DTOs/ShareDtos.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Budget.Api.Models;
using Budget.Core.Models;
namespace Budget.Api.DTOs;
namespace Budget.Core.DTOs;
public record ShareDto(Guid Id, string SharedWithEmail, SharePermission Permission, bool IsPending, DateTimeOffset CreatedAt);
src/Budget.Api/DTOs/SummaryDtos.cs → src/Budget.Core/DTOs/SummaryDtos.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.DTOs;
namespace Budget.Core.DTOs;
public record SummaryBreakdownItem(
string Type,
src/Budget.Api/Models/Budget.cs → src/Budget.Core/Models/Budget.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public class Budget
{
src/Budget.Api/Models/BudgetShare.cs → src/Budget.Core/Models/BudgetShare.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public class BudgetShare
{
src/Budget.Api/Models/Frequency.cs → src/Budget.Core/Models/Frequency.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public enum Frequency
{
src/Budget.Api/Models/Income.cs → src/Budget.Core/Models/Income.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public class Income
{
src/Budget.Api/Models/KnownUser.cs → src/Budget.Core/Models/KnownUser.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public class KnownUser
{
src/Budget.Api/Models/Outgo.cs → src/Budget.Core/Models/Outgo.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public class Outgo
{
src/Budget.Api/Models/OutgoType.cs → src/Budget.Core/Models/OutgoType.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public enum OutgoType
{
src/Budget.Api/Models/SharePermission.cs → src/Budget.Core/Models/SharePermission.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Budget.Api.Models;
namespace Budget.Core.Models;
public enum SharePermission
{
src/Budget.Api/Services/FrequencyCalculator.cs → src/Budget.Core/Services/FrequencyCalculator.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using Budget.Api.Models;
using Budget.Core.Models;
namespace Budget.Api.Services;
namespace Budget.Core.Services;
public static class FrequencyCalculator
{
src/Budget.Infrastructure/Budget.Infrastructure.csproj
+18
View File
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Budget.Core\Budget.Core.csproj" />
</ItemGroup>
</Project>
src/Budget.Api/Data/AppDbContext.cs → src/Budget.Infrastructure/Data/AppDbContext.cs
+4 -4
View File
@@ -1,11 +1,11 @@
using Budget.Api.Models;
using Budget.Core.Models;
using Microsoft.EntityFrameworkCore;
namespace Budget.Api.Data;
namespace Budget.Infrastructure.Data;
public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(options)
{
public DbSet<Models.Budget> Budgets => Set<Models.Budget>();
public DbSet<Budget.Core.Models.Budget> Budgets => Set<Budget.Core.Models.Budget>();
public DbSet<Income> Incomes => Set<Income>();
public DbSet<Outgo> Outgos => Set<Outgo>();
public DbSet<KnownUser> KnownUsers => Set<KnownUser>();
@@ -13,7 +13,7 @@ public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(op
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Models.Budget>(b =>
modelBuilder.Entity<Budget.Core.Models.Budget>(b =>
{
b.HasKey(x => x.Id);
b.Property(x => x.Name).IsRequired().HasMaxLength(200);
src/Budget.Api/Data/Migrations/20260425123657_InitialCreate.Designer.cs → src/Budget.Infrastructure/Data/Migrations/20260425123657_InitialCreate.Designer.cs
Generated
+15 -15
View File
@@ -1,6 +1,6 @@
// <auto-generated />
// <auto-generated />
using System;
using Budget.Api.Data;
using Budget.Infrastructure.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
@@ -9,7 +9,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Budget.Api.Data.Migrations
namespace Budget.Infrastructure.Data.Migrations
{
[DbContext(typeof(AppDbContext))]
[Migration("20260425123657_InitialCreate")]
@@ -25,7 +25,7 @@ namespace Budget.Api.Data.Migrations
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Budget.Api.Models.Budget", b =>
modelBuilder.Entity("Budget.Core.Models.Budget", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -56,7 +56,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("Budgets");
});
modelBuilder.Entity("Budget.Api.Models.BudgetShare", b =>
modelBuilder.Entity("Budget.Core.Models.BudgetShare", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -91,7 +91,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("BudgetShares");
});
modelBuilder.Entity("Budget.Api.Models.Income", b =>
modelBuilder.Entity("Budget.Core.Models.Income", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -122,7 +122,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("Incomes");
});
modelBuilder.Entity("Budget.Api.Models.KnownUser", b =>
modelBuilder.Entity("Budget.Core.Models.KnownUser", b =>
{
b.Property<string>("Id")
.HasMaxLength(200)
@@ -146,7 +146,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("KnownUsers");
});
modelBuilder.Entity("Budget.Api.Models.Outgo", b =>
modelBuilder.Entity("Budget.Core.Models.Outgo", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -192,9 +192,9 @@ namespace Budget.Api.Data.Migrations
b.ToTable("Outgos");
});
modelBuilder.Entity("Budget.Api.Models.BudgetShare", b =>
modelBuilder.Entity("Budget.Core.Models.BudgetShare", b =>
{
b.HasOne("Budget.Api.Models.Budget", "Budget")
b.HasOne("Budget.Core.Models.Budget", "Budget")
.WithMany("Shares")
.HasForeignKey("BudgetId")
.OnDelete(DeleteBehavior.Cascade)
@@ -203,9 +203,9 @@ namespace Budget.Api.Data.Migrations
b.Navigation("Budget");
});
modelBuilder.Entity("Budget.Api.Models.Income", b =>
modelBuilder.Entity("Budget.Core.Models.Income", b =>
{
b.HasOne("Budget.Api.Models.Budget", "Budget")
b.HasOne("Budget.Core.Models.Budget", "Budget")
.WithMany("Incomes")
.HasForeignKey("BudgetId")
.OnDelete(DeleteBehavior.Cascade)
@@ -214,9 +214,9 @@ namespace Budget.Api.Data.Migrations
b.Navigation("Budget");
});
modelBuilder.Entity("Budget.Api.Models.Outgo", b =>
modelBuilder.Entity("Budget.Core.Models.Outgo", b =>
{
b.HasOne("Budget.Api.Models.Budget", "Budget")
b.HasOne("Budget.Core.Models.Budget", "Budget")
.WithMany("Outgos")
.HasForeignKey("BudgetId")
.OnDelete(DeleteBehavior.Cascade)
@@ -225,7 +225,7 @@ namespace Budget.Api.Data.Migrations
b.Navigation("Budget");
});
modelBuilder.Entity("Budget.Api.Models.Budget", b =>
modelBuilder.Entity("Budget.Core.Models.Budget", b =>
{
b.Navigation("Incomes");
src/Budget.Api/Data/Migrations/20260425123657_InitialCreate.cs → src/Budget.Infrastructure/Data/Migrations/20260425123657_InitialCreate.cs
+2 -2
View File
@@ -1,9 +1,9 @@
using System;
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Budget.Api.Data.Migrations
namespace Budget.Infrastructure.Data.Migrations
{
/// <inheritdoc />
public partial class InitialCreate : Migration
src/Budget.Api/Data/Migrations/AppDbContextModelSnapshot.cs → src/Budget.Infrastructure/Data/Migrations/AppDbContextModelSnapshot.cs
+15 -15
View File
@@ -1,6 +1,6 @@
// <auto-generated />
// <auto-generated />
using System;
using Budget.Api.Data;
using Budget.Infrastructure.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -8,7 +8,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Budget.Api.Data.Migrations
namespace Budget.Infrastructure.Data.Migrations
{
[DbContext(typeof(AppDbContext))]
partial class AppDbContextModelSnapshot : ModelSnapshot
@@ -22,7 +22,7 @@ namespace Budget.Api.Data.Migrations
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Budget.Api.Models.Budget", b =>
modelBuilder.Entity("Budget.Core.Models.Budget", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -53,7 +53,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("Budgets");
});
modelBuilder.Entity("Budget.Api.Models.BudgetShare", b =>
modelBuilder.Entity("Budget.Core.Models.BudgetShare", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -88,7 +88,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("BudgetShares");
});
modelBuilder.Entity("Budget.Api.Models.Income", b =>
modelBuilder.Entity("Budget.Core.Models.Income", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -119,7 +119,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("Incomes");
});
modelBuilder.Entity("Budget.Api.Models.KnownUser", b =>
modelBuilder.Entity("Budget.Core.Models.KnownUser", b =>
{
b.Property<string>("Id")
.HasMaxLength(200)
@@ -143,7 +143,7 @@ namespace Budget.Api.Data.Migrations
b.ToTable("KnownUsers");
});
modelBuilder.Entity("Budget.Api.Models.Outgo", b =>
modelBuilder.Entity("Budget.Core.Models.Outgo", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
@@ -189,9 +189,9 @@ namespace Budget.Api.Data.Migrations
b.ToTable("Outgos");
});
modelBuilder.Entity("Budget.Api.Models.BudgetShare", b =>
modelBuilder.Entity("Budget.Core.Models.BudgetShare", b =>
{
b.HasOne("Budget.Api.Models.Budget", "Budget")
b.HasOne("Budget.Core.Models.Budget", "Budget")
.WithMany("Shares")
.HasForeignKey("BudgetId")
.OnDelete(DeleteBehavior.Cascade)
@@ -200,9 +200,9 @@ namespace Budget.Api.Data.Migrations
b.Navigation("Budget");
});
modelBuilder.Entity("Budget.Api.Models.Income", b =>
modelBuilder.Entity("Budget.Core.Models.Income", b =>
{
b.HasOne("Budget.Api.Models.Budget", "Budget")
b.HasOne("Budget.Core.Models.Budget", "Budget")
.WithMany("Incomes")
.HasForeignKey("BudgetId")
.OnDelete(DeleteBehavior.Cascade)
@@ -211,9 +211,9 @@ namespace Budget.Api.Data.Migrations
b.Navigation("Budget");
});
modelBuilder.Entity("Budget.Api.Models.Outgo", b =>
modelBuilder.Entity("Budget.Core.Models.Outgo", b =>
{
b.HasOne("Budget.Api.Models.Budget", "Budget")
b.HasOne("Budget.Core.Models.Budget", "Budget")
.WithMany("Outgos")
.HasForeignKey("BudgetId")
.OnDelete(DeleteBehavior.Cascade)
@@ -222,7 +222,7 @@ namespace Budget.Api.Data.Migrations
b.Navigation("Budget");
});
modelBuilder.Entity("Budget.Api.Models.Budget", b =>
modelBuilder.Entity("Budget.Core.Models.Budget", b =>
{
b.Navigation("Incomes");
src/Budget.Api/Services/BudgetAuthorizationService.cs → src/Budget.Infrastructure/Services/BudgetAuthorizationService.cs
+3 -3
View File
@@ -1,8 +1,8 @@
using Budget.Api.Data;
using Budget.Api.Models;
using Budget.Core.Models;
using Budget.Infrastructure.Data;
using Microsoft.EntityFrameworkCore;
namespace Budget.Api.Services;
namespace Budget.Infrastructure.Services;
public enum BudgetAccess { None, View, Edit, Owner }